mirror of
https://github.com/Proxmark/proxmark3.git
synced 2024-09-21 15:26:35 +08:00
small fix hf list mf
This commit is contained in:
parent
902c470d38
commit
6dec58aa44
|
@ -393,7 +393,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
|
||||||
AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
|
AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
|
||||||
|
|
||||||
mfLastKey = GetCrypto1ProbableKey(&AuthData);
|
mfLastKey = GetCrypto1ProbableKey(&AuthData);
|
||||||
PrintAndLog(" | * | key | probable key:%010"PRIx64" Prng:%s ks2:%08x ks3:%08x | |",
|
PrintAndLog(" | * | key | probable key:%012"PRIx64" Prng:%s ks2:%08x ks3:%08x | |",
|
||||||
mfLastKey,
|
mfLastKey,
|
||||||
validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD",
|
validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD",
|
||||||
AuthData.ks2,
|
AuthData.ks2,
|
||||||
|
@ -411,7 +411,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
|
||||||
// check last used key
|
// check last used key
|
||||||
if (mfLastKey) {
|
if (mfLastKey) {
|
||||||
if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize, parity)) {
|
if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize, parity)) {
|
||||||
PrintAndLog(" | * | key | last used key:%010"PRIx64" ks2:%08x ks3:%08x | |",
|
PrintAndLog(" | * | key | last used key:%012"PRIx64" ks2:%08x ks3:%08x | |",
|
||||||
mfLastKey,
|
mfLastKey,
|
||||||
AuthData.ks2,
|
AuthData.ks2,
|
||||||
AuthData.ks3);
|
AuthData.ks3);
|
||||||
|
@ -424,7 +424,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
|
||||||
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, parity)) {
|
if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize, parity)) {
|
||||||
PrintAndLog(" | * | key | default key:%010"PRIx64" ks2:%08x ks3:%08x | |",
|
PrintAndLog(" | * | key | default key:%012"PRIx64" ks2:%08x ks3:%08x | |",
|
||||||
MifareDefaultKeys[defaultKeyCounter],
|
MifareDefaultKeys[defaultKeyCounter],
|
||||||
AuthData.ks2,
|
AuthData.ks2,
|
||||||
AuthData.ks3);
|
AuthData.ks3);
|
||||||
|
|
Loading…
Reference in a new issue