X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cd777a0545066d87b1e0f838cdee0604941919d7..905c55de2bbe642412b47ed4e92344096c817fac:/client/cmdhfmf.c diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 67d2ab67..4ebef19c 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -9,32 +9,35 @@ //----------------------------------------------------------------------------- #include "cmdhfmf.h" -#include "cmdhfmfhard.h" -#include "nonce2key/nonce2key.h" static int CmdHelp(const char *Cmd); int usage_hf14_mifare(void){ - PrintAndLog("Usage: hf mf mifare [h] "); + PrintAndLog("Usage: hf mf mifare [h] "); PrintAndLog("options:"); - PrintAndLog(" h this help"); - PrintAndLog(" (Optional) target other key A than block 0."); + PrintAndLog(" h this help"); + PrintAndLog(" (Optional) target other block"); + PrintAndLog(" (optional) target key type"); PrintAndLog("samples:"); PrintAndLog(" hf mf mifare"); PrintAndLog(" hf mf mifare 16"); + PrintAndLog(" hf mf mifare 16 B"); return 0; } int usage_hf14_mf1ksim(void){ - PrintAndLog("Usage: hf mf sim [h] u n i x"); + PrintAndLog("Usage: hf mf sim [h] u n [i] [x] [e] [v]"); PrintAndLog("options:"); PrintAndLog(" h this help"); PrintAndLog(" u (Optional) UID 4,7 or 10bytes. If not specified, the UID 4b from emulator memory will be used"); PrintAndLog(" n (Optional) Automatically exit simulation after blocks have been read by reader. 0 = infinite"); PrintAndLog(" i (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted"); - PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)"); + PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a reader"); + PrintAndLog(" e (Optional) Fill simulator keys from found keys"); + PrintAndLog(" v (Optional) Verbose"); PrintAndLog("samples:"); PrintAndLog(" hf mf sim u 0a0a0a0a"); PrintAndLog(" hf mf sim u 11223344556677"); PrintAndLog(" hf mf sim u 112233445566778899AA"); + PrintAndLog(" hf mf sim u 11223344 i x"); return 0; } int usage_hf14_dbg(void){ @@ -111,15 +114,33 @@ int usage_hf14_chk(void){ PrintAndLog("Usage: hf mf chk |<*card memory> [t|d] [] []"); PrintAndLog("options:"); PrintAndLog(" h this help"); - PrintAndLog(" * all sectors"); - PrintAndLog(" card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, - 1K"); + PrintAndLog(" * all sectors based on card memory, other values then below defaults to 1k"); + PrintAndLog(" 0 - MINI(320 bytes)"); + PrintAndLog(" 1 - 1K"); + PrintAndLog(" 2 - 2K"); + PrintAndLog(" 4 - 4K"); PrintAndLog(" d write keys to binary file"); PrintAndLog(" t write keys to emulator memory\n"); PrintAndLog(" "); PrintAndLog("samples:"); - PrintAndLog(" hf mf chk 0 A 1234567890ab keys.dic"); - PrintAndLog(" hf mf chk *1 ? t"); - PrintAndLog(" hf mf chk *1 ? d"); + PrintAndLog(" hf mf chk 0 A 1234567890ab keys.dic -- target block 0, Key A"); + PrintAndLog(" hf mf chk *1 ? t -- target all blocks, all keys, 1K, write to emul"); + PrintAndLog(" hf mf chk *1 ? d -- target all blocks, all keys, 1K, write to file"); + return 0; +} +int usage_hf14_keybrute(void){ + PrintAndLog("J_Run's 2nd phase of multiple sector nested authentication key recovery"); + PrintAndLog("You have a known 4 last bytes of a key recovered with mf_nonce_brute tool."); + PrintAndLog("First 2 bytes of key will be bruteforced"); + PrintAndLog(""); + PrintAndLog("Usage: hf mf keybrute [h] "); + PrintAndLog("options:"); + PrintAndLog(" h this help"); + PrintAndLog(" target block number"); + PrintAndLog(" target key type"); + PrintAndLog(" candidate key from mf_nonce_brute tool"); + PrintAndLog("samples:"); + PrintAndLog(" hf mf keybrute 1 A 000011223344"); return 0; } @@ -129,13 +150,18 @@ int CmdHF14AMifare(const char *Cmd) { uint64_t par_list = 0, ks_list = 0, r_key = 0; int16_t isOK = 0; int tmpchar; - uint8_t blockNo = 0; + uint8_t blockNo = 0, keytype = MIFARE_AUTH_KEYA; char cmdp = param_getchar(Cmd, 0); if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_mifare(); - blockNo = param_get8(Cmd, 0); - UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, 0}}; + blockNo = param_get8(Cmd, 0); + + cmdp = param_getchar(Cmd, 1); + if (cmdp == 'B' || cmdp == 'b') + keytype = MIFARE_AUTH_KEYB; + + UsbCommand c = {CMD_READER_MIFARE, {true, blockNo, keytype}}; // message printf("-------------------------------------------------------------------------\n"); @@ -189,18 +215,22 @@ start: } } printf("\n"); + // error + if (isOK != 1) return 1; - // par == 0 - if (isOK == -1 && par_list == 0) { - if (!nonce2key_ex(uid, nt, nr, ks_list, &r_key) ){ - PrintAndLog("Found valid key: %012"llx" \n", r_key); + if (par_list == 0 && ks_list != 0) { + // this special attack when parities is zero, uses checkkeys. Which now with block/keytype option also needs. + // but it uses 0|1 instead of 0x60|0x61... + if (nonce2key_ex(blockNo, keytype - 0x60 , uid, nt, nr, ks_list, &r_key) ){ + PrintAndLog("Trying again with a different reader nonce..."); + c.arg[0] = false; + goto start; + } else { + PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key); goto END; } } - - // error - if (isOK != 1) return 1; - + // execute original function from util nonce2key if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) { isOK = 2; @@ -209,7 +239,17 @@ start: c.arg[0] = false; goto start; } else { - PrintAndLog("Found valid key: %012"llx" \n", r_key); + + // nonce2key found a candidate key. Lets verify it. + uint8_t keyblock[] = {0,0,0,0,0,0}; + num_to_bytes(r_key, 6, keyblock); + uint64_t key64 = 0; + int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64); + if ( res > 0 ) { + PrintAndLog("Candidate Key found (%012" PRIx64 ") - Test authentication failed. [%d] Restarting darkside attack", r_key, res); + goto start; + } + PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key); } END: t1 = clock() - t1; @@ -273,9 +313,7 @@ int CmdHF14AMfRdBl(const char *Cmd) { uint8_t blockNo = 0; uint8_t keyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; - - char cmdp = 0x00; - + char cmdp = 0x00; if (strlen(Cmd)<3) { PrintAndLog("Usage: hf mf rdbl "); @@ -302,7 +340,7 @@ int CmdHF14AMfRdBl(const char *Cmd) { SendCommand(&c); UsbCommand resp; - if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) { + if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { uint8_t isOK = resp.arg[0] & 0xff; uint8_t *data = resp.d.asBytes; @@ -432,7 +470,7 @@ int CmdHF14AMfDump(const char *Cmd) { size_t bytes_read; for (sectorNo=0; sectorNo>3) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>5); // C1C2C3 for data area 1 rights[sectorNo][2] = ((data[7] & 0x40)>>4) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>6); // C1C2C3 for data area 2 rights[sectorNo][3] = ((data[7] & 0x80)>>5) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>7); // C1C2C3 for sector trailer - } else { + break; + } else if (tries == 2) { // on last try set defaults PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo); rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00; rights[sectorNo][3] = 0x01; @@ -480,6 +520,7 @@ int CmdHF14AMfDump(const char *Cmd) { rights[sectorNo][3] = 0x01; } } + } PrintAndLog("|-----------------------------------------|"); PrintAndLog("|----- Dumping all blocks to file... -----|"); @@ -489,7 +530,7 @@ int CmdHF14AMfDump(const char *Cmd) { for (sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) { for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) { bool received = false; - + for (tries = 0; tries < 3; tries++) { if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A. UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}}; memcpy(c.d.asBytes, keyA[sectorNo], 6); @@ -506,12 +547,18 @@ int CmdHF14AMfDump(const char *Cmd) { } else if (rights[sectorNo][data_area] == 0x07) { // no key would work isOK = false; PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo); + tries = 2; } else { // key A would work UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}}; memcpy(c.d.asBytes, keyA[sectorNo], 6); clearCommandBuffer(); SendCommand(&c); received = WaitForResponseTimeout(CMD_ACK,&resp,1500); + } + } + if (received) { + isOK = resp.arg[0] & 0xff; + if (isOK) break; } } @@ -601,7 +648,7 @@ int CmdHF14AMfRestore(const char *Cmd) { size_t bytes_read; for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { bytes_read = fread( keyA[sectorNo], 1, 6, fkeys ); - if ( bytes_read == 0) { + if ( bytes_read != 6) { PrintAndLog("File reading error (dumpkeys.bin)."); fclose(fkeys); return 2; @@ -610,7 +657,7 @@ int CmdHF14AMfRestore(const char *Cmd) { for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { bytes_read = fread( keyB[sectorNo], 1, 6, fkeys ); - if ( bytes_read == 0) { + if ( bytes_read != 6) { PrintAndLog("File reading error (dumpkeys.bin)."); fclose(fkeys); return 2; @@ -630,9 +677,10 @@ int CmdHF14AMfRestore(const char *Cmd) { UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); bytes_read = fread(bldata, 1, 16, fdump); - if ( bytes_read == 0) { + if ( bytes_read != 16) { PrintAndLog("File reading error (dumpdata.bin)."); fclose(fdump); + fdump = NULL; return 2; } @@ -673,7 +721,7 @@ int CmdHF14AMfRestore(const char *Cmd) { int CmdHF14AMfNested(const char *Cmd) { int i, j, res, iterations; - sector *e_sector = NULL; + sector_t *e_sector = NULL; uint8_t blockNo = 0; uint8_t keyType = 0; uint8_t trgBlockNo = 0; @@ -743,7 +791,7 @@ int CmdHF14AMfNested(const char *Cmd) { switch (isOK) { case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break; case -2 : PrintAndLog("Button pressed. Aborted.\n"); break; - case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (its random number generator is not predictable).\n"); break; + case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random number generator is not predictable).\n"); break; case -4 : PrintAndLog("No valid key found"); break; case -5 : key64 = bytes_to_num(keyBlock, 6); @@ -775,7 +823,7 @@ int CmdHF14AMfNested(const char *Cmd) { time_t start, end; time(&start); - e_sector = calloc(SectorsCnt, sizeof(sector)); + e_sector = calloc(SectorsCnt, sizeof(sector_t)); if (e_sector == NULL) return 1; //test current key and additional standard keys first @@ -1005,12 +1053,13 @@ int CmdHF14AMfNestedHard(const char *Cmd) { trgBlockNo, trgKeyType?'B':'A', trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5], - know_target_key?"":" (not set)", - nonce_file_write?"write":nonce_file_read?"read":"none", - slow?"Yes":"No", + know_target_key ? "" : " (not set)", + nonce_file_write ? "write": nonce_file_read ? "read" : "none", + slow ? "Yes" : "No", tests); - int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests); + uint64_t foundkey = 0; + int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey); if (isOK) { switch (isOK) { @@ -1034,7 +1083,7 @@ int CmdHF14AMfChk(const char *Cmd) { uint8_t *keyBlock = NULL, *p; uint8_t stKeyBlock = 20; - sector *e_sector = NULL; + sector_t *e_sector = NULL; int i, res; int keycnt = 0; @@ -1158,7 +1207,7 @@ int CmdHF14AMfChk(const char *Cmd) { } memset(keyBlock + 6 * keycnt, 0, 6); num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt); - PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6)); + PrintAndLog("check key[%2d] %012" PRIx64, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6)); keycnt++; memset(buf, 0, sizeof(buf)); } @@ -1181,7 +1230,7 @@ int CmdHF14AMfChk(const char *Cmd) { } // initialize storage for found keys - e_sector = calloc(SectorsCnt, sizeof(sector)); + e_sector = calloc(SectorsCnt, sizeof(sector_t)); if (e_sector == NULL) { free(keyBlock); return 1; @@ -1214,7 +1263,8 @@ int CmdHF14AMfChk(const char *Cmd) { if (e_sector[i].foundKey[trgKeyType]) continue; for (uint32_t c = 0; c < keycnt; c += max_keys) { - + printf("."); + fflush(stdout); uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c; res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64); @@ -1223,8 +1273,6 @@ int CmdHF14AMfChk(const char *Cmd) { e_sector[i].foundKey[trgKeyType] = TRUE; break; } - printf("."); - fflush(stdout); } b < 127 ? ( b +=4 ) : ( b += 16 ); } @@ -1314,44 +1362,130 @@ int CmdHF14AMfChk(const char *Cmd) { return 0; } +sector_t *k_sector = NULL; +uint8_t k_sectorsCount = 16; +static void emptySectorTable(){ + + // initialize storage for found keys + if (k_sector == NULL) + k_sector = calloc(k_sectorsCount, sizeof(sector_t)); + if (k_sector == NULL) + return; + + // empty e_sector + for(int i = 0; i < k_sectorsCount; ++i){ + k_sector[i].Key[0] = 0xffffffffffff; + k_sector[i].Key[1] = 0xffffffffffff; + k_sector[i].foundKey[0] = FALSE; + k_sector[i].foundKey[1] = FALSE; + } +} +void showSectorTable(){ + if (k_sector != NULL) { + printKeyTable(k_sectorsCount, k_sector); + free(k_sector); + k_sector = NULL; + } +} +void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) { + + uint64_t key = 0; + bool success = FALSE; + + if (k_sector == NULL) + emptySectorTable(); + + success = tryMfk32_moebius(data, &key, verbose); + if (success) { + uint8_t sector = data.sector; + uint8_t keytype = data.keytype; + + PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]" + , keytype ? "B" : "A" + , sector + , key + ); + + k_sector[sector].Key[keytype] = key; + k_sector[sector].foundKey[keytype] = TRUE; + + //set emulator memory for keys + if (setEmulatorMem) { + uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0}; + num_to_bytes( k_sector[sector].Key[0], 6, memBlock); + num_to_bytes( k_sector[sector].Key[1], 6, memBlock+10); + //iceman, guessing this will not work so well for 4K tags. + PrintAndLog("Setting Emulator Memory Block %02d: [%s]" + , (sector*4) + 3 + , sprint_hex( memBlock, sizeof(memBlock)) + ); + mfEmlSetMem( memBlock, (sector*4) + 3, 1); + } + } +} + int CmdHF14AMf1kSim(const char *Cmd) { + uint8_t uid[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; uint8_t exitAfterNReads = 0; uint8_t flags = (FLAG_UID_IN_EMUL | FLAG_4B_UID_IN_DATA); int uidlen = 0; - uint8_t pnr = 0; - uint8_t cmdp = param_getchar(Cmd, 0); - - if (cmdp == 'h' || cmdp == 'H') return usage_hf14_mf1ksim(); - - cmdp = param_getchar(Cmd, pnr); - if (cmdp == 'u' || cmdp == 'U') { - param_gethex_ex(Cmd, pnr+1, uid, &uidlen); - switch(uidlen){ - case 20: flags = FLAG_10B_UID_IN_DATA; break; - case 14: flags = FLAG_7B_UID_IN_DATA; break; - case 8: flags = FLAG_4B_UID_IN_DATA; break; - default: return usage_hf14_mf1ksim(); + uint8_t cmdp = 0; + bool errors = FALSE; + bool verbose = FALSE; + bool setEmulatorMem = FALSE; + nonces_t data[1]; + + while(param_getchar(Cmd, cmdp) != 0x00) { + switch(param_getchar(Cmd, cmdp)) { + case 'e': + case 'E': + setEmulatorMem = TRUE; + cmdp++; + break; + case 'h': + case 'H': + return usage_hf14_mf1ksim(); + case 'i': + case 'I': + flags |= FLAG_INTERACTIVE; + cmdp++; + break; + case 'n': + case 'N': + exitAfterNReads = param_get8(Cmd, cmdp+1); + cmdp += 2; + break; + case 'u': + case 'U': + param_gethex_ex(Cmd, cmdp+1, uid, &uidlen); + switch(uidlen) { + case 20: flags = FLAG_10B_UID_IN_DATA; break; + case 14: flags = FLAG_7B_UID_IN_DATA; break; + case 8: flags = FLAG_4B_UID_IN_DATA; break; + default: return usage_hf14_mf1ksim(); + } + cmdp += 2; + break; + case 'v': + case 'V': + verbose = TRUE; + cmdp++; + break; + case 'x': + case 'X': + flags |= FLAG_NR_AR_ATTACK; + cmdp++; + break; + default: + PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); + errors = TRUE; + break; } - pnr +=2; - } - - cmdp = param_getchar(Cmd, pnr); - if (cmdp == 'n' || cmdp == 'N') { - exitAfterNReads = param_get8(Cmd, pnr+1); - pnr += 2; - } - - cmdp = param_getchar(Cmd, pnr); - if (cmdp == 'i' || cmdp == 'I' ) { - flags |= FLAG_INTERACTIVE; - pnr++; - } - - cmdp = param_getchar(Cmd, pnr); - if (cmdp == 'x' || cmdp == 'X') { - flags |= FLAG_NR_AR_ATTACK; + if(errors) break; } + //Validations + if(errors) return usage_hf14_mf1ksim(); PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) " , (uidlen == 0 ) ? "N/A" : sprint_hex(uid, uidlen>>1) @@ -1363,27 +1497,20 @@ int CmdHF14AMf1kSim(const char *Cmd) { memcpy(c.d.asBytes, uid, sizeof(uid)); clearCommandBuffer(); SendCommand(&c); + UsbCommand resp; - if(flags & FLAG_INTERACTIVE) { - uint8_t data[32]; - uint64_t key; - UsbCommand resp; + if(flags & FLAG_INTERACTIVE) { PrintAndLog("Press pm3-button or send another cmd to abort simulation"); + while( !ukbhit() ){ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue; - if ( !(flags & FLAG_NR_AR_ATTACK) ) break; if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break; - memset(data, 0x00, sizeof(data)); - int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1]; - - memcpy(data, resp.d.asBytes, len); - key = 0; - bool found = tryMfk32(data, &key); - found ^= tryMfk32_moebius(data, &key); - if ( found ) break; + memcpy(data, resp.d.asBytes, sizeof(data)); + readerAttack(data[0], setEmulatorMem, verbose); } + showSectorTable(); } return 0; } @@ -1459,7 +1586,7 @@ int CmdHF14AMfSniff(const char *Cmd){ if (res == 1) { // there is (more) data to be transferred if (pckNum == 0) { // first packet, (re)allocate necessary buffer - if (traceLen > bufsize) { + if (traceLen > bufsize || buf == NULL) { uint8_t *p; if (buf == NULL) // not yet allocated p = malloc(traceLen); @@ -1546,7 +1673,7 @@ int CmdHF14AMfSniff(const char *Cmd){ int CmdHF14AMfDbg(const char *Cmd) { char ctmp = param_getchar(Cmd, 0); - if (strlen(Cmd) < 1 || ctmp == 'h'|| ctmp == 'H') return usage_hf14_dbg(); + if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_hf14_dbg(); uint8_t dbgMode = param_get8ex(Cmd, 0, 0, 10); if (dbgMode > 4) return usage_hf14_dbg(); @@ -1556,12 +1683,49 @@ int CmdHF14AMfDbg(const char *Cmd) { return 0; } -void printKeyTable( uint8_t sectorscnt, sector *e_sector ){ +int CmdHF14AMfKeyBrute(const char *Cmd) { + + uint8_t blockNo = 0, keytype = 0; + uint8_t key[6] = {0, 0, 0, 0, 0, 0}; + uint64_t foundkey = 0; + + char cmdp = param_getchar(Cmd, 0); + if ( cmdp == 'H' || cmdp == 'h') return usage_hf14_keybrute(); + + // block number + blockNo = param_get8(Cmd, 0); + + // keytype + cmdp = param_getchar(Cmd, 1); + if (cmdp == 'B' || cmdp == 'b') keytype = 1; + + // key + if (param_gethex(Cmd, 2, key, 12)) return usage_hf14_keybrute(); + + clock_t t1 = clock(); + time_t start, end; + time(&start); + + if (mfKeyBrute( blockNo, keytype, key, &foundkey)) + PrintAndLog("Found valid key: %012" PRIx64 " \n", foundkey); + else + PrintAndLog("Key not found"); + + t1 = clock() - t1; + time(&end); + unsigned long elapsed_time = difftime(end, start); + if ( t1 > 0 ) + PrintAndLog("\nTime in keybrute: %.0f ticks %u seconds\n", (float)t1, elapsed_time); + + return 0; +} + +void printKeyTable( uint8_t sectorscnt, sector_t *e_sector ){ PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|sec|key A |res|key B |res|"); PrintAndLog("|---|----------------|---|----------------|---|"); for (uint8_t i = 0; i < sectorscnt; ++i) { - PrintAndLog("|%03d| %012"llx" | %d | %012"llx" | %d |", i, + PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %d |", i, e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1] ); @@ -1570,7 +1734,6 @@ void printKeyTable( uint8_t sectorscnt, sector *e_sector ){ } // EMULATOR COMMANDS - int CmdHF14AMfEGet(const char *Cmd) { uint8_t blockNo = 0; @@ -1584,7 +1747,7 @@ int CmdHF14AMfEGet(const char *Cmd) blockNo = param_get8(Cmd, 0); - PrintAndLog(" "); + PrintAndLog(""); if (!mfEmlGetMem(data, blockNo, 1)) { PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16)); } else { @@ -1611,7 +1774,6 @@ int CmdHF14AMfESet(const char *Cmd) { uint8_t memBlock[16]; uint8_t blockNo = 0; - memset(memBlock, 0x00, sizeof(memBlock)); if (strlen(Cmd) < 3 || param_getchar(Cmd, 0) == 'h') { @@ -1893,7 +2055,7 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) } keyA = bytes_to_num(data, 6); keyB = bytes_to_num(data + 10, 6); - PrintAndLog("|%03d| %012"llx" | %012"llx" |", i, keyA, keyB); + PrintAndLog("|%03d| %012" PRIx64 " | %012" PRIx64 " |", i, keyA, keyB); } PrintAndLog("|---|----------------|----------------|"); @@ -2297,10 +2459,11 @@ static command_t CommandTable[] = { {"dump", CmdHF14AMfDump, 0, "Dump MIFARE classic tag to binary file"}, {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"}, {"wrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"}, - {"chk", CmdHF14AMfChk, 0, "Test block keys"}, - {"mifare", CmdHF14AMifare, 0, "Read parity error messages."}, - {"nested", CmdHF14AMfNested, 0, "Test nested authentication"}, + {"chk", CmdHF14AMfChk, 0, "Check keys"}, + {"mifare", CmdHF14AMifare, 0, "Darkside attack. read parity error messages."}, + {"nested", CmdHF14AMfNested, 0, "Nested attack. Test nested authentication"}, {"hardnested", CmdHF14AMfNestedHard, 0, "Nested attack for hardened Mifare cards"}, + {"keybrute", CmdHF14AMfKeyBrute, 0, "J_Run's 2nd phase of multiple sector nested authentication key recovery"}, {"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"}, {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE card"}, {"eclr", CmdHF14AMfEClear, 0, "Clear simulator memory block"},