github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

bug: keytable printing

Browse source
This commit is contained in:
iceman1001 2020-01-12 18:15:25 +01:00
commit d78b308470
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhfmf.c
View file

@ -1296,6 +1296,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
// transfer key to the emulator // transfer key to the emulator
if (transferToEml) { if (transferToEml) {
uint8_t sectortrailer; uint8_t sectortrailer;
if (trgBlockNo < 32 * 4) { // 4 block sector if (trgBlockNo < 32 * 4) { // 4 block sector
sectortrailer = trgBlockNo | 0x03; sectortrailer = trgBlockNo | 0x03;
} else { // 16 block sector } else { // 16 block sector
@ -1307,6 +1308,7 @@ static int CmdHF14AMfNested(const char *Cmd) {
num_to_bytes(key64, 6, keyBlock); num_to_bytes(key64, 6, keyBlock);
else else
num_to_bytes(key64, 6, &keyBlock[10]); num_to_bytes(key64, 6, &keyBlock[10]);
mfEmlSetMem(keyBlock, sectortrailer, 1); mfEmlSetMem(keyBlock, sectortrailer, 1);
PrintAndLogEx(SUCCESS, "Key transferred to emulator memory."); PrintAndLogEx(SUCCESS, "Key transferred to emulator memory.");
} }
@ -3322,7 +3324,7 @@ void printKeyTableEx(uint8_t sectorscnt, sector_t *e_sector, uint8_t start_secto
PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|"); PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
PrintAndLogEx(NORMAL, "|sec| key A |res| key B |res|"); PrintAndLogEx(NORMAL, "|sec| key A |res| key B |res|");
PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|"); PrintAndLogEx(NORMAL, "|---|----------------|---|----------------|---|");
for (uint8_t i = 0; i < sectorscnt; ++i) { for (uint8_t i = 0; i < sectorscnt; i++) {
snprintf(strA, sizeof(strA), "------------"); snprintf(strA, sizeof(strA), "------------");
snprintf(strB, sizeof(strB), "------------"); snprintf(strB, sizeof(strB), "------------");
@ -3340,8 +3342,14 @@ void printKeyTableEx(uint8_t sectorscnt, sector_t *e_sector, uint8_t start_secto
, strB, e_sector[i].foundKey[1] , strB, e_sector[i].foundKey[1]
); );
} else { } else {
// keep track if we use start_sector or i...
uint8_t s = start_sector;
if (start_sector == 0)
s = i;
PrintAndLogEx(NORMAL, "|%03d| %s | " _YELLOW_("%d")"| %s | " _YELLOW_("%d")"|" PrintAndLogEx(NORMAL, "|%03d| %s | " _YELLOW_("%d")"| %s | " _YELLOW_("%d")"|"
, start_sector , s
, strA, e_sector[i].foundKey[0] , strA, e_sector[i].foundKey[0]
, strB, e_sector[i].foundKey[1] , strB, e_sector[i].foundKey[1]
); );