github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 12:59:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added cipherstream recovery

Browse source
This commit is contained in:
Oleg Moiseenko 2018-02-11 00:44:24 +02:00
commit 856da9a1c0
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/cmdhflist.c
View file

@ -295,6 +295,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
// check last used key // check last used key
if (mfLastKey) { if (mfLastKey) {
if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize)) { if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize)) {
traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
}; };
} }
@ -302,7 +303,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
if (!traceCrypto1) { if (!traceCrypto1) {
for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){ for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){
if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize)) { if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize)) {
traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
break; break;
}; };
} }
@ -409,5 +410,11 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize)
crypto1_destroy(pcs); crypto1_destroy(pcs);
return CheckCrc14443(CRC_14443_A, buf, cmdsize); if(CheckCrc14443(CRC_14443_A, buf, cmdsize)) {
AuthData.ks2 = AuthData.ar_enc ^ ar;
AuthData.ks3 = AuthData.at_enc ^ at;
return true;
} else {
return false;
}
} }