X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/84bdbc19174eaf54db337ef0470e35cf45dc8e9d..be67483e63430608982f1c92e02b59d7b4dc65b3:/client/cmdhfmf.c diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index e6568f59..4ebef19c 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -226,7 +226,7 @@ start: c.arg[0] = false; goto start; } else { - PrintAndLog("Found valid key: %012"llx" \n", r_key); + PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key); goto END; } } @@ -246,10 +246,10 @@ start: uint64_t key64 = 0; int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64); if ( res > 0 ) { - PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. [%d] Restarting darkside attack", r_key, res); + PrintAndLog("Candidate Key found (%012" PRIx64 ") - Test authentication failed. [%d] Restarting darkside attack", r_key, res); goto start; } - PrintAndLog("Found valid key: %012"llx" \n", r_key); + PrintAndLog("Found valid key: %012" PRIx64 " \n", r_key); } END: t1 = clock() - t1; @@ -313,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 "); @@ -342,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; @@ -472,10 +470,9 @@ 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; @@ -523,6 +520,7 @@ int CmdHF14AMfDump(const char *Cmd) { rights[sectorNo][3] = 0x01; } } + } PrintAndLog("|-----------------------------------------|"); PrintAndLog("|----- Dumping all blocks to file... -----|"); @@ -532,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); @@ -549,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; } } @@ -599,7 +603,6 @@ int CmdHF14AMfDump(const char *Cmd) { uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1); fwrite(carddata, 1, 16*numblocks, fout); fclose(fout); - fout = NULL; PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks); } @@ -645,20 +648,18 @@ 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); - fkeys = NULL; return 2; } } 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); - fkeys = NULL; return 2; } } @@ -676,7 +677,7 @@ 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; @@ -715,13 +716,12 @@ int CmdHF14AMfRestore(const char *Cmd) { } fclose(fdump); - fdump = NULL; return 0; } 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; @@ -791,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); @@ -823,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 @@ -1083,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; @@ -1207,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)); } @@ -1230,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; @@ -1362,13 +1362,13 @@ int CmdHF14AMfChk(const char *Cmd) { return 0; } -sector *k_sector = NULL; +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)); + k_sector = calloc(k_sectorsCount, sizeof(sector_t)); if (k_sector == NULL) return; @@ -1400,7 +1400,7 @@ void readerAttack(nonces_t data, bool setEmulatorMem, bool verbose) { uint8_t sector = data.sector; uint8_t keytype = data.keytype; - PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012"llx"]" + PrintAndLog("Reader is trying authenticate with: Key %s, sector %02d: [%012" PRIx64 "]" , keytype ? "B" : "A" , sector , key @@ -1586,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); @@ -1707,7 +1707,7 @@ int CmdHF14AMfKeyBrute(const char *Cmd) { time(&start); if (mfKeyBrute( blockNo, keytype, key, &foundkey)) - PrintAndLog("Found valid key: %012"llx" \n", foundkey); + PrintAndLog("Found valid key: %012" PRIx64 " \n", foundkey); else PrintAndLog("Key not found"); @@ -1720,12 +1720,12 @@ int CmdHF14AMfKeyBrute(const char *Cmd) { return 0; } -void printKeyTable( uint8_t sectorscnt, sector *e_sector ){ +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] ); @@ -1774,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') { @@ -2056,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("|---|----------------|----------------|");