github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CHG: uniformed output for failed key retrivals. Now denoted with -------

Browse source
This commit is contained in:
iceman1001 2017-12-06 23:56:07 +01:00
commit e1a01dd2ff
1 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

42
client/cmdhfmf.c
View file

@ -942,7 +942,7 @@ int CmdHF14AMfNested(const char *Cmd) {
} }
uint64_t t2 = msclock() - t1; uint64_t t2 = msclock() - t1;
PrintAndLog("Time to check 6 known keys: %.0f seconds\n", (float)t2/1000.0 ); PrintAndLog("Time to check %d known keys: %.0f seconds\n", MIFARE_DEFAULTKEYS_SIZE, (float)t2/1000.0 );
PrintAndLog("enter nested..."); PrintAndLog("enter nested...");
// nested sectors // nested sectors
@ -2036,6 +2036,8 @@ int CmdHF14AMfKeyBrute(const char *Cmd) {
void printKeyTable_fast( uint8_t sectorscnt, icesector_t *e_sector, uint64_t bar, uint64_t foo ){ void printKeyTable_fast( uint8_t sectorscnt, icesector_t *e_sector, uint64_t bar, uint64_t foo ){
char strA[12+1] = {0};
char strB[12+1] = {0};
uint8_t arr[80]; uint8_t arr[80];
for (uint8_t i = 0; i < 64; ++i) { for (uint8_t i = 0; i < 64; ++i) {
arr[i] = (foo >> i) & 0x1; arr[i] = (foo >> i) & 0x1;
@ -2048,25 +2050,47 @@ void printKeyTable_fast( uint8_t sectorscnt, icesector_t *e_sector, uint64_t bar
PrintAndLog("|sec|key A |res|key B |res|"); PrintAndLog("|sec|key A |res|key B |res|");
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|---|----------------|---|----------------|---|");
for (uint8_t i = 0; i < sectorscnt; ++i) { for (uint8_t i = 0; i < sectorscnt; ++i) {
PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %d |"
snprintf(strA, sizeof(strA), "------------");
snprintf(strB, sizeof(strB), "------------");
if ( arr[i*2] )
snprintf(strA, sizeof(strA), "%012" PRIx64, bytes_to_num(e_sector[i].keyA, 6));
if ( arr[(i*2)+1] )
snprintf(strB, sizeof(strB), "%012" PRIx64, bytes_to_num(e_sector[i].keyB, 6));
PrintAndLog("|%03d| %s | %d | %s | %d |"
, i , i
, bytes_to_num(e_sector[i].keyA, 6) , strA, arr[i*2]
, arr[i*2] , strB, arr[(i*2)+1]
, bytes_to_num(e_sector[i].keyB, 6)
, arr[(i*2)+1]
); );
} }
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|---|----------------|---|----------------|---|");
} }
void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){ void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){
char strA[12+1] = {0};
char strB[12+1] = {0};
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|---|----------------|---|----------------|---|");
PrintAndLog("|sec|key A |res|key B |res|"); PrintAndLog("|sec|key A |res|key B |res|");
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|---|----------------|---|----------------|---|");
for (uint8_t i = 0; i < sectorscnt; ++i) { for (uint8_t i = 0; i < sectorscnt; ++i) {
PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %d |", i,
e_sector[i].Key[0], e_sector[i].foundKey[0], snprintf(strA, sizeof(strA), "------------");
e_sector[i].Key[1], e_sector[i].foundKey[1] snprintf(strB, sizeof(strB), "------------");
if ( e_sector[i].foundKey[0] )
snprintf(strA, sizeof(strA), "%012" PRIx64, e_sector[i].Key[0]);
if ( e_sector[i].foundKey[1] )
snprintf(strB, sizeof(strB), "%012" PRIx64, e_sector[i].Key[1]);
PrintAndLog("|%03d| %s | %d | %s | %d |"
, i
, strA, e_sector[i].foundKey[0]
, strB, e_sector[i].foundKey[1]
); );
} }
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|---|----------------|---|----------------|---|");