X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9c624f67b3c3041d171abf75d954ba9fa0ae57a4..b9534ca070fcb38d37b572810365bbb4b8ffbc8b:/client/cmdhfmf.c diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 20bb5929..793863b0 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -470,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; @@ -521,6 +520,7 @@ int CmdHF14AMfDump(const char *Cmd) { rights[sectorNo][3] = 0x01; } } + } PrintAndLog("|-----------------------------------------|"); PrintAndLog("|----- Dumping all blocks to file... -----|"); @@ -530,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); @@ -547,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; } } @@ -597,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); } @@ -643,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; } } @@ -674,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; @@ -713,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; @@ -789,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); @@ -821,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 @@ -1081,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; @@ -1228,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; @@ -1360,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; @@ -1584,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); @@ -1718,7 +1720,7 @@ 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("|---|----------------|---|----------------|---|");