X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6b6aafabcfc96bbf3af083efa659553b5d4a6a45..8cf533fd98d846c8ffe76f085fa75501e17a6de2:/client/cmdhfmf.c diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 3fde208f..90ebc27b 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -19,6 +19,7 @@ #include "cmdmain.h" #include "cmdhfmfhard.h" #include "util.h" +#include "util_posix.h" #include "usb_cmd.h" #include "ui.h" #include "mifarehost.h" @@ -27,7 +28,6 @@ #define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up - static int CmdHelp(const char *Cmd); int CmdHF14AMifare(const char *Cmd) @@ -44,7 +44,7 @@ int CmdHF14AMifare(const char *Cmd) case -5 : PrintAndLog("Aborted via keyboard."); return 1; default : PrintAndLog("Found valid key:%012" PRIx64 "\n", key); } - + PrintAndLog(""); return 0; } @@ -56,14 +56,14 @@ int CmdHF14AMfWrBl(const char *Cmd) uint8_t keyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - + char cmdp = 0x00; if (strlen(Cmd)<3) { PrintAndLog("Usage: hf mf wrbl "); PrintAndLog(" sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F"); return 0; - } + } blockNo = param_get8(Cmd, 0); cmdp = param_getchar(Cmd, 1); @@ -82,7 +82,7 @@ int CmdHF14AMfWrBl(const char *Cmd) } PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6)); PrintAndLog("--data: %s", sprint_hex(bldata, 16)); - + UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); memcpy(c.d.asBytes + 10, bldata, 16); @@ -104,7 +104,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; @@ -112,8 +112,8 @@ int CmdHF14AMfRdBl(const char *Cmd) PrintAndLog("Usage: hf mf rdbl "); PrintAndLog(" sample: hf mf rdbl 0 A FFFFFFFFFFFF "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); cmdp = param_getchar(Cmd, 1); if (cmdp == 0x00) { @@ -126,7 +126,7 @@ int CmdHF14AMfRdBl(const char *Cmd) return 1; } PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6)); - + UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); SendCommand(&c); @@ -161,8 +161,8 @@ int CmdHF14AMfRdSc(const char *Cmd) PrintAndLog("Usage: hf mf rdsc "); PrintAndLog(" sample: hf mf rdsc 0 A FFFFFFFFFFFF "); return 0; - } - + } + sectorNo = param_get8(Cmd, 0); if (sectorNo > 39) { PrintAndLog("Sector number must be less than 40"); @@ -179,7 +179,7 @@ int CmdHF14AMfRdSc(const char *Cmd) return 1; } PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6)); - + UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); SendCommand(&c); @@ -225,28 +225,28 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo) int CmdHF14AMfDump(const char *Cmd) { uint8_t sectorNo, blockNo; - + uint8_t keyA[40][6]; uint8_t keyB[40][6]; uint8_t rights[40][4]; uint8_t carddata[256][16]; uint8_t numSectors = 16; - + FILE *fin; FILE *fout; - + UsbCommand resp; char cmdp = param_getchar(Cmd, 0); switch (cmdp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } - + } + if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: hf mf dump [card memory]"); PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); @@ -255,12 +255,12 @@ int CmdHF14AMfDump(const char *Cmd) PrintAndLog(" hf mf dump 4"); return 0; } - + if ((fin = fopen("dumpkeys.bin","rb")) == NULL) { PrintAndLog("Could not find file dumpkeys.bin"); return 1; } - + // Read keys A from file for (sectorNo=0; sectorNo 1 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: hf mf restore [card memory]"); @@ -436,7 +436,7 @@ int CmdHF14AMfRestore(const char *Cmd) PrintAndLog("Could not find file dumpkeys.bin"); return 1; } - + for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { size_t bytes_read = fread(keyA[sectorNo], 1, 6, fkeys); if (bytes_read != 6) { @@ -460,21 +460,21 @@ int CmdHF14AMfRestore(const char *Cmd) if ((fdump = fopen("dumpdata.bin","rb")) == NULL) { PrintAndLog("Could not find file dumpdata.bin"); return 1; - } + } PrintAndLog("Restoring dumpdata.bin to card"); for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) { UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); - + size_t bytes_read = fread(bldata, 1, 16, fdump); if (bytes_read != 16) { PrintAndLog("File reading error (dumpdata.bin)."); fclose(fdump); return 2; } - + if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer bldata[0] = (keyA[sectorNo][0]); bldata[1] = (keyA[sectorNo][1]); @@ -488,10 +488,10 @@ int CmdHF14AMfRestore(const char *Cmd) bldata[13] = (keyB[sectorNo][3]); bldata[14] = (keyB[sectorNo][4]); bldata[15] = (keyB[sectorNo][5]); - } - + } + PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16)); - + memcpy(c.d.asBytes + 10, bldata, 16); SendCommand(&c); @@ -504,7 +504,7 @@ int CmdHF14AMfRestore(const char *Cmd) } } } - + fclose(fdump); return 0; } @@ -529,12 +529,12 @@ int CmdHF14AMfNested(const char *Cmd) uint8_t keyBlock[14*6]; uint64_t key64 = 0; bool transferToEml = false; - + bool createDumpFile = false; FILE *fkeys; uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; - + char cmdp, ctmp; if (strlen(Cmd)<3) { @@ -551,25 +551,25 @@ int CmdHF14AMfNested(const char *Cmd) PrintAndLog(" sample3: hf mf nested 1 0 A FFFFFFFFFFFF d "); PrintAndLog(" sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A"); return 0; - } - + } + cmdp = param_getchar(Cmd, 0); blockNo = param_get8(Cmd, 1); ctmp = param_getchar(Cmd, 2); - + if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { PrintAndLog("Key type must be A or B"); return 1; } - - if (ctmp != 'A' && ctmp != 'a') + + if (ctmp != 'A' && ctmp != 'a') keyType = 1; - + if (param_gethex(Cmd, 3, key, 12)) { PrintAndLog("Key must include 12 HEX symbols"); return 1; } - + if (cmdp == 'o' || cmdp == 'O') { cmdp = 'o'; trgBlockNo = param_get8(Cmd, 4); @@ -578,10 +578,10 @@ int CmdHF14AMfNested(const char *Cmd) PrintAndLog("Target key type must be A or B"); return 1; } - if (ctmp != 'A' && ctmp != 'a') + if (ctmp != 'A' && ctmp != 'a') trgKeyType = 1; } else { - + switch (cmdp) { case '0': SectorsCnt = 05; break; case '1': SectorsCnt = 16; break; @@ -594,11 +594,11 @@ int CmdHF14AMfNested(const char *Cmd) ctmp = param_getchar(Cmd, 4); if (ctmp == 't' || ctmp == 'T') transferToEml = true; else if (ctmp == 'd' || ctmp == 'D') createDumpFile = true; - + ctmp = param_getchar(Cmd, 6); transferToEml |= (ctmp == 't' || ctmp == 'T'); transferToEml |= (ctmp == 'd' || ctmp == 'D'); - + if (cmdp == 'o') { PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A'); int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true); @@ -624,12 +624,12 @@ int CmdHF14AMfNested(const char *Cmd) sectortrailer = (trgBlockNo & 0x0f) + 15; } mfEmlGetMem(keyBlock, sectortrailer, 1); - + if (!trgKeyType) num_to_bytes(key64, 6, keyBlock); else num_to_bytes(key64, 6, &keyBlock[10]); - mfEmlSetMem(keyBlock, sectortrailer, 1); + mfEmlSetMem(keyBlock, sectortrailer, 1); } } else { PrintAndLog("No valid key found"); @@ -641,7 +641,7 @@ int CmdHF14AMfNested(const char *Cmd) e_sector = calloc(SectorsCnt, sizeof(sector_t)); if (e_sector == NULL) return 1; - + //test current key and additional standard keys first memcpy(keyBlock, key, 6); num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6)); @@ -662,23 +662,23 @@ int CmdHF14AMfNested(const char *Cmd) for (i = 0; i < SectorsCnt; i++) { for (j = 0; j < 2; j++) { if (e_sector[i].foundKey[j]) continue; - + res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64); - + if (!res) { e_sector[i].Key[j] = key64; e_sector[i].foundKey[j] = 1; } } } - + // nested sectors iterations = 0; PrintAndLog("nested..."); bool calibrate = true; for (i = 0; i < NESTED_SECTOR_RETRY; i++) { for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) { - for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { + for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { if (e_sector[sectorNo].foundKey[trgKeyType]) continue; PrintAndLog("-----------------------------------------------"); int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate); @@ -694,7 +694,7 @@ int CmdHF14AMfNested(const char *Cmd) } else { calibrate = false; } - + iterations++; key64 = bytes_to_num(keyBlock, 6); @@ -708,7 +708,7 @@ int CmdHF14AMfNested(const char *Cmd) } printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0); - + PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations); //print them PrintAndLog("|---|----------------|---|----------------|---|"); @@ -719,7 +719,7 @@ int CmdHF14AMfNested(const char *Cmd) e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]); } PrintAndLog("|---|----------------|---|----------------|---|"); - + // transfer them to the emulator if (transferToEml) { for (i = 0; i < SectorsCnt; i++) { @@ -729,12 +729,12 @@ int CmdHF14AMfNested(const char *Cmd) if (e_sector[i].foundKey[1]) num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]); mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1); - } + } } - + // Create dump file if (createDumpFile) { - if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { + if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { PrintAndLog("Could not create file dumpkeys.bin"); free(e_sector); return 1; @@ -760,7 +760,7 @@ int CmdHF14AMfNested(const char *Cmd) } fclose(fkeys); } - + free(e_sector); } return 0; @@ -775,7 +775,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) uint8_t trgKeyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0}; - + char ctmp; ctmp = param_getchar(Cmd, 0); @@ -798,15 +798,15 @@ int CmdHF14AMfNestedHard(const char *Cmd) PrintAndLog("Add the known target key to check if it is present in the remaining key space:"); PrintAndLog(" sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF"); return 0; - } - + } + bool know_target_key = false; bool nonce_file_read = false; bool nonce_file_write = false; bool slow = false; int tests = 0; - - + + if (ctmp == 'R' || ctmp == 'r') { nonce_file_read = true; if (!param_gethex(Cmd, 1, trgkey, 12)) { @@ -824,15 +824,15 @@ int CmdHF14AMfNestedHard(const char *Cmd) PrintAndLog("Key type must be A or B"); return 1; } - if (ctmp != 'A' && ctmp != 'a') { + if (ctmp != 'A' && ctmp != 'a') { keyType = 1; } - + if (param_gethex(Cmd, 2, key, 12)) { PrintAndLog("Key must include 12 HEX symbols"); return 1; } - + trgBlockNo = param_get8(Cmd, 3); ctmp = param_getchar(Cmd, 4); if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { @@ -863,8 +863,8 @@ int CmdHF14AMfNestedHard(const char *Cmd) } } - PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", - trgBlockNo, + PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", + trgBlockNo, trgKeyType?'B':'A', trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5], know_target_key?"":" (not set)", @@ -899,14 +899,14 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog(" hf mf chk *1 ? t"); PrintAndLog(" hf mf chk *1 ? d"); return 0; - } + } FILE * f; char filename[FILE_PATH_SIZE]={0}; char buf[13]; uint8_t *keyBlock = NULL, *p; - uint8_t stKeyBlock = 20; - + uint16_t stKeyBlock = 20; + int i, res; int keycnt = 0; char ctmp = 0x00; @@ -914,7 +914,7 @@ int CmdHF14AMfChk(const char *Cmd) uint8_t SectorsCnt = 1; uint8_t keyType = 0; uint64_t key64 = 0; - + int transferToEml = 0; int createDumpFile = 0; @@ -943,7 +943,7 @@ int CmdHF14AMfChk(const char *Cmd) { num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6)); } - + if (param_getchar(Cmd, 0)=='*') { blockNo = 3; switch(param_getchar(Cmd+1, 0)) { @@ -956,9 +956,9 @@ int CmdHF14AMfChk(const char *Cmd) } else blockNo = param_get8(Cmd, 0); - + ctmp = param_getchar(Cmd, 1); - switch (ctmp) { + switch (ctmp) { case 'a': case 'A': keyType = !0; break; @@ -973,11 +973,11 @@ int CmdHF14AMfChk(const char *Cmd) free(keyBlock); return 1; }; - + ctmp = param_getchar(Cmd, 2); if (ctmp == 't' || ctmp == 'T') transferToEml = 1; else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1; - + for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) { if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) { if ( stKeyBlock - keycnt < 2) { @@ -1000,21 +1000,21 @@ int CmdHF14AMfChk(const char *Cmd) free(keyBlock); return 2; } - + if ( (f = fopen( filename , "r")) ) { while( fgets(buf, sizeof(buf), f) ){ if (strlen(buf) < 12 || buf[11] == '\n') continue; - + while (fgetc(f) != '\n' && !feof(f)) ; //goto next line - + if( buf[0]=='#' ) continue; //The line start with # is comment, skip if (!isxdigit(buf[0])){ PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf); continue; } - + buf[12] = 0; if ( stKeyBlock - keycnt < 2) { @@ -1038,11 +1038,11 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog("File: %s: not found or locked.", filename); free(keyBlock); return 1; - + } } } - + if (keycnt == 0) { PrintAndLog("No key specified, trying default keys"); for (;keycnt < defaultKeysSize; keycnt++) @@ -1050,7 +1050,7 @@ int CmdHF14AMfChk(const char *Cmd) (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2], (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6); } - + // initialize storage for found keys bool validKey[2][40]; uint8_t foundKey[2][40][6]; @@ -1062,7 +1062,7 @@ int CmdHF14AMfChk(const char *Cmd) } } } - + for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) { int b=blockNo; for (int i = 0; i < SectorsCnt; ++i) { @@ -1076,12 +1076,12 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog("Found valid key:[%012" PRIx64 "]",key64); num_to_bytes(key64, 6, foundKey[t][i]); validKey[t][i] = true; - } + } } else { PrintAndLog("Command execute timeout"); } } - b<127?(b+=4):(b+=16); + b<127?(b+=4):(b+=16); } } @@ -1103,7 +1103,7 @@ int CmdHF14AMfChk(const char *Cmd) if (createDumpFile) { FILE *fkeys = fopen("dumpkeys.bin","wb"); - if (fkeys == NULL) { + if (fkeys == NULL) { PrintAndLog("Could not create file dumpkeys.bin"); free(keyBlock); return 1; @@ -1204,11 +1204,11 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack PrintAndLog("block data must include 32 HEX symbols"); return; } - + UsbCommand c = {CMD_MIFARE_EML_MEMSET, {(stSector[i]*4+3), 1, 0}}; memcpy(c.d.asBytes, memBlock, 16); clearCommandBuffer(); - SendCommand(&c); + SendCommand(&c); } } } @@ -1240,7 +1240,7 @@ int usage_hf14_mf1ksim(void) { PrintAndLog(" hf mf sim u 112233445566778899AA"); PrintAndLog(" hf mf sim f uids.txt"); PrintAndLog(" hf mf sim u 0a0a0a0a e"); - + return 0; } @@ -1343,9 +1343,9 @@ int CmdHF14AMf1kSim(const char *Cmd) { memset(buf, 0, sizeof(buf)); memset(uid, 0, sizeof(uid)); - if (fgets(buf, sizeof(buf), f) == NULL) { + if (fgets(buf, sizeof(buf), f) == NULL) { if (count > 0) break; - + PrintAndLog("File reading error."); fclose(f); return 2; @@ -1357,7 +1357,7 @@ int CmdHF14AMf1kSim(const char *Cmd) { case 20: flags |= FLAG_10B_UID_IN_DATA; break; //not complete case 14: flags |= FLAG_7B_UID_IN_DATA; break; case 8: flags |= FLAG_4B_UID_IN_DATA; break; - default: + default: PrintAndLog("uid in file wrong length at %d (length: %d) [%s]",count, uidlen, buf); fclose(f); return 2; @@ -1366,10 +1366,10 @@ int CmdHF14AMf1kSim(const char *Cmd) { for (uint8_t i = 0; i < uidlen; i += 2) { sscanf(&buf[i], "%02x", (unsigned int *)&uid[i / 2]); } - + PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) - press button to abort", flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4): - flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): + flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A" , exitAfterNReads, flags, flags); @@ -1399,7 +1399,7 @@ int CmdHF14AMf1kSim(const char *Cmd) { PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) ", flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4): - flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): + flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A" , exitAfterNReads, flags, flags); @@ -1443,7 +1443,7 @@ int CmdHF14AMfDbg(const char *Cmd) PrintAndLog(" 4 - print even debug messages in timing critical functions"); PrintAndLog(" Note: this option therefore may cause malfunction itself"); return 0; - } + } UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}}; SendCommand(&c); @@ -1460,8 +1460,8 @@ int CmdHF14AMfEGet(const char *Cmd) PrintAndLog("Usage: hf mf eget "); PrintAndLog(" sample: hf mf eget 0 "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); PrintAndLog(" "); @@ -1480,7 +1480,7 @@ int CmdHF14AMfEClear(const char *Cmd) PrintAndLog("Usage: hf mf eclr"); PrintAndLog("It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n"); return 0; - } + } UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}}; SendCommand(&c); @@ -1499,15 +1499,15 @@ int CmdHF14AMfESet(const char *Cmd) PrintAndLog("Usage: hf mf eset "); PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); - + if (param_gethex(Cmd, 1, memBlock, 32)) { PrintAndLog("block data must include 32 HEX symbols"); return 1; } - + // 1 - blocks count UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}}; memcpy(c.d.asBytes, memBlock, 16); @@ -1525,9 +1525,9 @@ int CmdHF14AMfELoad(const char *Cmd) uint8_t buf8[64] = {0x00}; int i, len, blockNum, numBlocks; int nameParamNo = 1; - + char ctmp = param_getchar(Cmd, 0); - + if ( ctmp == 'h' || ctmp == 0x00) { PrintAndLog("It loads emul dump from the file `filename.eml`"); PrintAndLog("Usage: hf mf eload [card memory] "); @@ -1536,11 +1536,11 @@ int CmdHF14AMfELoad(const char *Cmd) PrintAndLog(" sample: hf mf eload filename"); PrintAndLog(" hf mf eload 4 filename"); return 0; - } + } switch (ctmp) { case '0' : numBlocks = 5*4; break; - case '1' : + case '1' : case '\0': numBlocks = 16*4; break; case '2' : numBlocks = 32*4; break; case '4' : numBlocks = 256; break; @@ -1551,33 +1551,33 @@ int CmdHF14AMfELoad(const char *Cmd) } len = param_getstr(Cmd,nameParamNo,filename); - + if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; fnameptr += len; - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "r"); if (f == NULL) { PrintAndLog("File %s not found or locked", filename); return 1; } - + blockNum = 0; while(!feof(f)){ memset(buf, 0, sizeof(buf)); - + if (fgets(buf, sizeof(buf), f) == NULL) { - + if (blockNum >= numBlocks) break; - + PrintAndLog("File reading error."); fclose(f); return 2; } - + if (strlen(buf) < 32){ if(strlen(buf) && feof(f)) break; @@ -1585,11 +1585,11 @@ int CmdHF14AMfELoad(const char *Cmd) fclose(f); return 2; } - + for (i = 0; i < 32; i += 2) { sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]); } - + if (mfEmlSetMem(buf8, blockNum, 1)) { PrintAndLog("Cant set emul block: %3d", blockNum); fclose(f); @@ -1597,12 +1597,12 @@ int CmdHF14AMfELoad(const char *Cmd) } printf("."); blockNum++; - + if (blockNum >= numBlocks) break; } fclose(f); printf("\n"); - + if ((blockNum != numBlocks)) { PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks); return 4; @@ -1620,12 +1620,12 @@ int CmdHF14AMfESave(const char *Cmd) uint8_t buf[64]; int i, j, len, numBlocks; int nameParamNo = 1; - + memset(filename, 0, sizeof(filename)); memset(buf, 0, sizeof(buf)); char ctmp = param_getchar(Cmd, 0); - + if ( ctmp == 'h' || ctmp == 'H') { PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`"); PrintAndLog(" Usage: hf mf esave [card memory] [file name w/o `.eml`]"); @@ -1635,11 +1635,11 @@ int CmdHF14AMfESave(const char *Cmd) PrintAndLog(" hf mf esave 4"); PrintAndLog(" hf mf esave 4 filename"); return 0; - } + } switch (ctmp) { case '0' : numBlocks = 5*4; break; - case '1' : + case '1' : case '\0': numBlocks = 16*4; break; case '2' : numBlocks = 32*4; break; case '4' : numBlocks = 256; break; @@ -1650,9 +1650,9 @@ int CmdHF14AMfESave(const char *Cmd) } len = param_getstr(Cmd,nameParamNo,filename); - + if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - + // user supplied filename? if (len < 1) { // get filename (UID from memory) @@ -1670,8 +1670,8 @@ int CmdHF14AMfESave(const char *Cmd) } // add file extension - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "w+"); @@ -1679,7 +1679,7 @@ int CmdHF14AMfESave(const char *Cmd) PrintAndLog("Can't open file %s ", filename); return 1; } - + // put hex for (i = 0; i < numBlocks; i++) { if (mfEmlGetMem(buf, i, 1)) { @@ -1687,13 +1687,13 @@ int CmdHF14AMfESave(const char *Cmd) break; } for (j = 0; j < 16; j++) - fprintf(f, "%02X", buf[j]); + fprintf(f, "%02X", buf[j]); fprintf(f,"\n"); } fclose(f); - + PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename); - + return 0; } @@ -1702,7 +1702,7 @@ int CmdHF14AMfECFill(const char *Cmd) { uint8_t keyType = 0; uint8_t numSectors = 16; - + if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf ecfill [card memory]"); PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); @@ -1712,7 +1712,7 @@ int CmdHF14AMfECFill(const char *Cmd) PrintAndLog("Read card and transfer its data to emulator memory."); PrintAndLog("Keys must be laid in the emulator memory. \n"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { @@ -1724,12 +1724,12 @@ int CmdHF14AMfECFill(const char *Cmd) ctmp = param_getchar(Cmd, 1); switch (ctmp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } + } printf("--params: numSectors: %d, keyType:%d", numSectors, keyType); UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}}; @@ -1737,14 +1737,13 @@ int CmdHF14AMfECFill(const char *Cmd) return 0; } - int CmdHF14AMfEKeyPrn(const char *Cmd) { int i; uint8_t numSectors; uint8_t data[16]; uint64_t keyA, keyB; - + if (param_getchar(Cmd, 0) == 'h') { PrintAndLog("It prints the keys loaded in the emulator memory"); PrintAndLog("Usage: hf mf ekeyprn [card memory]"); @@ -1752,19 +1751,19 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) PrintAndLog(""); PrintAndLog(" sample: hf mf ekeyprn 1"); return 0; - } + } char cmdp = param_getchar(Cmd, 0); - + switch (cmdp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } - + } + PrintAndLog("|---|----------------|----------------|"); PrintAndLog("|sec|key A |key B |"); PrintAndLog("|---|----------------|----------------|"); @@ -1778,11 +1777,10 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) PrintAndLog("|%03d| %012" PRIx64 " | %012" PRIx64 " |", i, keyA, keyB); } PrintAndLog("|---|----------------|----------------|"); - + return 0; } - int CmdHF14AMfCSetUID(const char *Cmd) { uint8_t wipeCard = 0; @@ -1846,7 +1844,7 @@ int CmdHF14AMfCSetUID(const char *Cmd) PrintAndLog("Can't set UID. error=%d", res); return 1; } - + PrintAndLog("old UID:%s", sprint_hex(oldUid, 4)); PrintAndLog("new UID:%s", sprint_hex(uid, 4)); return 0; @@ -1857,7 +1855,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd) uint8_t memBlock[16] = {0x00}; uint8_t blockNo = 0; bool wipeCard = false; - int res; + int res, gen = 0; if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf csetblk [w]"); @@ -1865,7 +1863,9 @@ int CmdHF14AMfCSetBlk(const char *Cmd) PrintAndLog("Set block data for magic Chinese card (only works with such cards)"); PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line"); return 0; - } + } + + gen = mfCIdentify(); blockNo = param_get8(Cmd, 0); @@ -1878,7 +1878,14 @@ int CmdHF14AMfCSetBlk(const char *Cmd) wipeCard = (ctmp == 'w' || ctmp == 'W'); PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16)); - res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER); + if (gen == 2) { + /* generation 1b magic card */ + res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER); + } + if (res) { PrintAndLog("Can't write block. error=%d", res); return 1; @@ -1892,33 +1899,44 @@ int CmdHF14AMfCLoad(const char *Cmd) FILE * f; char filename[FILE_PATH_SIZE] = {0x00}; char * fnameptr = filename; - char buf[64] = {0x00}; - uint8_t buf8[64] = {0x00}; + char buf[256] = {0x00}; + uint8_t buf8[256] = {0x00}; uint8_t fillFromEmulator = 0; - int i, len, blockNum, flags=0; - + int i, len, blockNum, flags = 0, gen = 0, numblock = 64; + if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) { PrintAndLog("It loads magic Chinese card from the file `filename.eml`"); - PrintAndLog("or from emulator memory (option `e`)"); - PrintAndLog("Usage: hf mf cload "); - PrintAndLog(" or: hf mf cload e "); - PrintAndLog(" sample: hf mf cload filename"); + PrintAndLog("or from emulator memory (option `e`). 4K card: (option `4`)"); + PrintAndLog("Usage: hf mf cload [file name w/o `.eml`][e][4]"); + PrintAndLog(" or: hf mf cload e [4]"); + PrintAndLog("Sample: hf mf cload filename"); + PrintAndLog(" hf mf cload filname 4"); + PrintAndLog(" hf mf cload e"); + PrintAndLog(" hf mf cload e 4"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1; - + ctmp = param_getchar(Cmd, 1); + if (ctmp == '4') numblock = 256; + + gen = mfCIdentify(); + PrintAndLog("Loading magic mifare %dK", numblock == 256 ? 4:1); + if (fillFromEmulator) { - for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) { + for (blockNum = 0; blockNum < numblock; blockNum += 1) { if (mfEmlGetMem(buf8, blockNum, 1)) { PrintAndLog("Cant get block: %d", blockNum); return 2; } if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence if (blockNum == 1) flags = 0; // just write - if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field. + if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field. + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) { PrintAndLog("Cant set magic card block: %d", blockNum); return 3; @@ -1926,26 +1944,28 @@ int CmdHF14AMfCLoad(const char *Cmd) } return 0; } else { - len = strlen(Cmd); + param_getstr(Cmd, 0, filename); + + len = strlen(filename); if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - memcpy(filename, Cmd, len); + //memcpy(filename, Cmd, len); fnameptr += len; - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "r"); if (f == NULL) { PrintAndLog("File not found or locked."); return 1; } - + blockNum = 0; while(!feof(f)){ - + memset(buf, 0, sizeof(buf)); - + if (fgets(buf, sizeof(buf), f) == NULL) { fclose(f); PrintAndLog("File reading error."); @@ -1964,21 +1984,25 @@ int CmdHF14AMfCLoad(const char *Cmd) if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence if (blockNum == 1) flags = 0; // just write - if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field. + if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field. + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) { PrintAndLog("Can't set magic card block: %d", blockNum); fclose(f); return 3; } blockNum++; - - if (blockNum >= 16 * 4) break; // magic card type - mifare 1K + + if (blockNum >= numblock) break; // magic card type - mifare 1K 64 blocks, mifare 4k 256 blocks } fclose(f); - - if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){ - PrintAndLog("File content error. There must be 64 blocks"); + + //if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){ + if (blockNum != numblock){ + PrintAndLog("File content error. There must be %d blocks", numblock); return 4; } PrintAndLog("Loaded from file: %s", filename); @@ -1990,7 +2014,7 @@ int CmdHF14AMfCLoad(const char *Cmd) int CmdHF14AMfCGetBlk(const char *Cmd) { uint8_t memBlock[16]; uint8_t blockNo = 0; - int res; + int res, gen = 0; memset(memBlock, 0x00, sizeof(memBlock)); if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { @@ -1998,55 +2022,77 @@ int CmdHF14AMfCGetBlk(const char *Cmd) { PrintAndLog("sample: hf mf cgetblk 1"); PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n"); return 0; - } + } + + gen = mfCIdentify(); blockNo = param_get8(Cmd, 0); PrintAndLog("--block number:%2d ", blockNo); - res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER); + if (gen == 2) { + /* generation 1b magic card */ + res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER); + } if (res) { PrintAndLog("Can't read block. error=%d", res); return 1; } - + PrintAndLog("block data:%s", sprint_hex(memBlock, 16)); return 0; } - int CmdHF14AMfCGetSc(const char *Cmd) { uint8_t memBlock[16] = {0x00}; uint8_t sectorNo = 0; - int i, res, flags; + int i, res, flags, gen = 0, baseblock = 0, sect_size = 4; if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf cgetsc "); PrintAndLog("sample: hf mf cgetsc 0"); PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n"); return 0; - } + } sectorNo = param_get8(Cmd, 0); - if (sectorNo > 15) { - PrintAndLog("Sector number must be in [0..15] as in MIFARE classic."); + + if (sectorNo > 39) { + PrintAndLog("Sector number must be in [0..15] in MIFARE classic 1k and [0..39] in MIFARE classic 4k."); return 1; } PrintAndLog("--sector number:%d ", sectorNo); + gen = mfCIdentify(); + flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 4; i++) { + if (sectorNo < 32 ) { + baseblock = sectorNo * 4; + } else { + baseblock = 128 + 16 * (sectorNo - 32); + + } + if (sectorNo > 31) sect_size = 16; + + for (i = 0; i < sect_size; i++) { if (i == 1) flags = 0; - if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + if (i == sect_size - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags); + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + + res = mfCGetBlock(baseblock + i, memBlock, flags); if (res) { - PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res); + PrintAndLog("Can't read block. %d error=%d", baseblock + i, res); return 1; } - - PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16)); + + PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16)); } return 0; } @@ -2058,37 +2104,50 @@ int CmdHF14AMfCSave(const char *Cmd) { char filename[FILE_PATH_SIZE] = {0x00}; char * fnameptr = filename; uint8_t fillFromEmulator = 0; - uint8_t buf[64] = {0x00}; - int i, j, len, flags; - + uint8_t buf[256] = {0x00}; + int i, j, len, flags, gen = 0, numblock = 64; + // memset(filename, 0, sizeof(filename)); // memset(buf, 0, sizeof(buf)); if (param_getchar(Cmd, 0) == 'h') { PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`"); - PrintAndLog("or into emulator memory (option `e`)"); - PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e]"); - PrintAndLog(" sample: hf mf esave "); - PrintAndLog(" hf mf esave filename"); - PrintAndLog(" hf mf esave e \n"); + PrintAndLog("or into emulator memory (option `e`). 4K card: (option `4`)"); + PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e][4]"); + PrintAndLog("Sample: hf mf esave "); + PrintAndLog(" hf mf esave filename"); + PrintAndLog(" hf mf esave e"); + PrintAndLog(" hf mf esave 4"); + PrintAndLog(" hf mf esave filename 4"); + PrintAndLog(" hf mf esave e 4"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1; + if (ctmp == '4') numblock = 256; + ctmp = param_getchar(Cmd, 1); + if (ctmp == '4') numblock = 256; + + gen = mfCIdentify(); + PrintAndLog("Saving magic mifare %dK", numblock == 256 ? 4:1); if (fillFromEmulator) { // put into emulator flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 16 * 4; i++) { + for (i = 0; i < numblock; i++) { if (i == 1) flags = 0; - if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - + if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + if (mfCGetBlock(i, buf, flags)) { PrintAndLog("Cant get block: %d", i); break; } - + if (mfEmlSetMem(buf, i, 1)) { PrintAndLog("Cant set emul block: %d", i); return 3; @@ -2096,27 +2155,35 @@ int CmdHF14AMfCSave(const char *Cmd) { } return 0; } else { - len = strlen(Cmd); + param_getstr(Cmd, 0, filename); + + len = strlen(filename); if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - - if (len < 1) { + + ctmp = param_getchar(Cmd, 0); + if (len < 1 || (ctmp == '4')) { // get filename - if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) { + + flags = CSETBLOCK_SINGLE_OPER; + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + if (mfCGetBlock(0, buf, flags)) { PrintAndLog("Cant get block: %d", 0); len = sprintf(fnameptr, "dump"); fnameptr += len; } else { for (j = 0; j < 7; j++, fnameptr += 2) - sprintf(fnameptr, "%02x", buf[j]); + sprintf(fnameptr, "%02x", buf[j]); } } else { - memcpy(filename, Cmd, len); + //memcpy(filename, Cmd, len); fnameptr += len; } - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "w+"); @@ -2127,22 +2194,25 @@ int CmdHF14AMfCSave(const char *Cmd) { // put hex flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 16 * 4; i++) { + for (i = 0; i < numblock; i++) { if (i == 1) flags = 0; - if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - + if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCGetBlock(i, buf, flags)) { PrintAndLog("Cant get block: %d", i); break; } for (j = 0; j < 16; j++) - fprintf(f, "%02x", buf[j]); + fprintf(f, "%02x", buf[j]); fprintf(f,"\n"); } fclose(f); - + PrintAndLog("Saved to file: %s", filename); - + return 0; } } @@ -2155,7 +2225,7 @@ int CmdHF14AMfSniff(const char *Cmd){ //bool wantSaveToEml = 0; TODO bool wantSaveToEmlFile = 0; - //var + //var int res = 0; int len = 0; int blockLen = 0; @@ -2169,7 +2239,7 @@ int CmdHF14AMfSniff(const char *Cmd){ uint8_t *buf = NULL; uint16_t bufsize = 0; uint8_t *bufPtr = NULL; - + char ctmp = param_getchar(Cmd, 0); if ( ctmp == 'h' || ctmp == 'H' ) { PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file."); @@ -2181,8 +2251,8 @@ int CmdHF14AMfSniff(const char *Cmd){ PrintAndLog("Usage: hf mf sniff [l][d][e][f]"); PrintAndLog(" sample: hf mf sniff l d e"); return 0; - } - + } + for (int i = 0; i < 4; i++) { ctmp = param_getchar(Cmd, i); if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true; @@ -2190,7 +2260,7 @@ int CmdHF14AMfSniff(const char *Cmd){ //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true; } - + printf("-------------------------------------------------------------------------\n"); printf("Executing command. \n"); printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n"); @@ -2210,7 +2280,7 @@ int CmdHF14AMfSniff(const char *Cmd){ printf("\naborted via keyboard!\n"); break; } - + UsbCommand resp; if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) { res = resp.arg[0] & 0xff; @@ -2267,24 +2337,24 @@ int CmdHF14AMfSniff(const char *Cmd){ memcpy(atqa, bufPtr + 2 + 7, 2); uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4; sak = bufPtr[11]; - PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", + PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", sprint_hex(uid + (7 - uid_len), uid_len), - atqa[1], - atqa[0], + atqa[1], + atqa[0], sak); if (wantLogToFile || wantDecrypt) { FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len); AddLogCurrentDT(logHexFileName); - } - if (wantDecrypt) + } + if (wantDecrypt) mfTraceInit(uid, atqa, sak, wantSaveToEmlFile); } else { PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len)); - if (wantLogToFile) + if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len); - if (wantDecrypt) + if (wantDecrypt) mfTraceDecode(bufPtr, len, wantSaveToEmlFile); - num++; + num++; } bufPtr += len; bufPtr += ((len-1)/8+1); // ignore parity