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

fix appearance

Browse source
This commit is contained in:
Oleg Moiseenko 2018-02-10 20:41:56 +02:00
commit 28ee794f59
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cmdhf.c
View file

@ -434,10 +434,12 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
} }
if (DecodeMifareData(frame, data_len, isResponse, mfData, &mfDataLen)) { if (DecodeMifareData(frame, data_len, isResponse, mfData, &mfDataLen)) {
PrintAndLog(" | | |%-64s | %s| %s", annotateIso14443a(explanation, sizeof(explanation), mfData, mfDataLen);
PrintAndLog(" | * | dec |%-64s | %-4s| %s",
sprint_hex(mfData, mfDataLen), sprint_hex(mfData, mfDataLen),
"", "",
(false) ? explanation : ""); (true) ? explanation : "");
}; };
if (is_last_record(tracepos, trace, traceLen)) return traceLen; if (is_last_record(tracepos, trace, traceLen)) return traceLen;

6
client/cmdhflist.c
View file

@ -268,15 +268,15 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *m
crypto1_get_lfsr(revstate, &lfsr); crypto1_get_lfsr(revstate, &lfsr);
crypto1_destroy(revstate); crypto1_destroy(revstate);
// LastKey = lfsr; // LastKey = lfsr;
printf("uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc); PrintAndLog(" | * | key | probable key:%x%x Prng:%s ks2:%08x ks3:%08x | |",
printf("AUTH: probable key:%x%x Prng:%s ks2:%08x ks3:%08x\n",
(unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF), (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF),
validate_prng_nonce(AuthData.nt) ? "WEAK": "HARDEND", validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD",
ks2, ks2,
ks3); ks3);
AuthData.first_auth = false; AuthData.first_auth = false;
} else { } else {
printf("uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
} }