github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

check parity works

Browse source
This commit is contained in:
merlokk 2018-02-13 12:33:15 +02:00
parent 2d7bdee30b
commit 597fca4ff1
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/cmdhflist.c
View file

@ -431,29 +431,32 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize,
crypto1_destroy(pcs);
if(!CheckCrc14443(CRC_14443_A, buf, cmdsize))
return false;
if (!CheckCrypto1Parity(cmd, cmdsize, buf, parity))
return false;
if(!CheckCrc14443(CRC_14443_A, buf, cmdsize))
return false;
AuthData.ks2 = AuthData.ar_enc ^ ar;
AuthData.ks3 = AuthData.at_enc ^ at;
return true;
}
bool CheckCrypto1Parity(uint8_t *cmd, uint8_t cmdsize, uint8_t *cmd_enc, uint8_t *parity_enc) {
bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc) {
uint8_t parity[16];
oddparitybuf(cmd, cmdsize, parity);
printf("parity check. size=%d\n", cmdsize);
printf("cmd =%s\n", sprint_hex(cmd, cmdsize));
printf("cmd_enc=%s\n", sprint_hex(cmd_enc, cmdsize));
printf("parity=%s\n", printBitsPar(parity_enc, cmdsize));
printf("parity =%s\n", printBitsPar(parity, cmdsize));
printf("parity_enc=%s\n", printBitsPar(parity_enc, cmdsize));
// (oddparity8(ntx >> 8 & 0xff) ^ (ntx & 0x01) ^ ((ad->nt_enc_par >> 5) & 0x01) ^ (ad->nt_enc & 0x01)) ||
// (oddparity8(ntx >> 24 & 0xff) ^ (ntx >> 16 & 0x01) ^ ((ad->nt_enc_par >> 7) & 0x01) ^ (ad->nt_enc >> 16 & 0x01))
for (int i = 0; i < cmdsize - 1; i++) {
bool b = oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (6 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01);
printf("i=%d b=%d\n", i, b);
bool b = oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (7 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01);
if (b)
return false;
printf("!!! i=%d \n", i);
}
return true;

2
client/cmdhflist.h
View file

@ -37,6 +37,6 @@ extern void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize
extern bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen);
extern bool NTParityChk(TAuthData *ad, uint32_t ntx);
extern bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity);
extern bool CheckCrypto1Parity(uint8_t *cmd, uint8_t cmdsize, uint8_t *cmd_enc, uint8_t *parity_enc);
extern bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc);
#endif // CMDHFLIST