git.zerfleddert.de Git - proxmark3-svn/blobdiff

index 28f7b07820a2929a6252f502bd4ba288e7d9eab8..f225359d7d8801cfb4e053f0d47bce73e1f831e1 100644 (file)

--- a/client/cmdhfmf.c

+++ b/client/cmdhfmf.c

@@ -778,12 +778,14 @@ int CmdHF14AMfNested(const char *Cmd)

int CmdHF14AMfChk(const char *Cmd)\r

{\r

if (strlen(Cmd)<3) {\r

int CmdHF14AMfChk(const char *Cmd)\r

{\r

if (strlen(Cmd)<3) {\r

- PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r

+ PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r

PrintAndLog(" * - all sectors");\r

PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r

PrintAndLog("d - write keys to binary file\n");\r

PrintAndLog(" * - all sectors");\r

PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r

PrintAndLog("d - write keys to binary file\n");\r

+ PrintAndLog("t - write keys to emulator memory");\r

PrintAndLog(" sample: hf mf chk 0 A 1234567890ab keys.dic");\r

PrintAndLog(" hf mf chk *1 ? t");\r

PrintAndLog(" sample: hf mf chk 0 A 1234567890ab keys.dic");\r

PrintAndLog(" hf mf chk *1 ? t");\r

+ PrintAndLog(" hf mf chk *1 ? d");\r

return 0;\r

} \r

return 0;\r

} \r

@@ -1010,12 +1012,16 @@ int CmdHF14AMf1kSim(const char *Cmd)

uint8_t exitAfterNReads = 0;\r

uint8_t flags = 0;\r

uint8_t exitAfterNReads = 0;\r

uint8_t flags = 0;\r

- if (param_getchar(Cmd, 0) == 'h') {\r

+ uint8_t cmdp = param_getchar(Cmd, 0);\r

+ \r

+ if (cmdp == 'h' || cmdp == 'H') {\r

PrintAndLog("Usage: hf mf sim u <uid (8 hex symbols)> n <numreads> i x");\r

+ PrintAndLog(" h this help");\r

PrintAndLog(" u (Optional) UID. If not specified, the UID from emulator memory will be used");\r

PrintAndLog(" n (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r

PrintAndLog(" i (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r

PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r

PrintAndLog(" u (Optional) UID. If not specified, the UID from emulator memory will be used");\r

PrintAndLog(" n (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r

PrintAndLog(" i (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r

PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r

+ PrintAndLog("");\r

PrintAndLog(" sample: hf mf sim u 0a0a0a0a ");\r

return 0;\r

}\r

PrintAndLog(" sample: hf mf sim u 0a0a0a0a ");\r

return 0;\r

}\r

@@ -1445,7 +1451,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)

char ctmp = param_getchar(Cmd, 1);\r

if (ctmp == 'w' || ctmp == 'W') wipeCard = 1;\r

char ctmp = param_getchar(Cmd, 1);\r

if (ctmp == 'w' || ctmp == 'W') wipeCard = 1;\r

- PrintAndLog("--wipe card:%02x uid:%s", wipeCard, sprint_hex(uid, 4));\r

+ PrintAndLog("--wipe card:%s uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));\r

res = mfCSetUID(uid, oldUid, wipeCard);\r

if (res) {\r

res = mfCSetUID(uid, oldUid, wipeCard);\r

if (res) {\r

@@ -1488,7 +1494,6 @@ int CmdHF14AMfCSetBlk(const char *Cmd)

return 1;\r

}\r

return 1;\r

}\r

- PrintAndLog("UID:%s", sprint_hex(uid, 4));\r

return 0;\r

}\r

return 0;\r

}\r

@@ -1503,11 +1508,8 @@ int CmdHF14AMfCLoad(const char *Cmd)

uint8_t fillFromEmulator = 0;\r

int i, len, blockNum, flags;\r

uint8_t fillFromEmulator = 0;\r

int i, len, blockNum, flags;\r

- // memset(filename, 0, sizeof(filename));\r

- // memset(buf, 0, sizeof(buf));\r

-\r

if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r

- PrintAndLog("It loads magic Chinese card (only works with!!!) from the file `filename.eml`");\r

+ PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r

PrintAndLog("or from emulator memory (option `e`)");\r

PrintAndLog("Usage: hf mf cload <file name w/o `.eml`>");\r

PrintAndLog(" or: hf mf cload e ");\r

PrintAndLog("or from emulator memory (option `e`)");\r

PrintAndLog("Usage: hf mf cload <file name w/o `.eml`>");\r

PrintAndLog(" or: hf mf cload e ");\r

@@ -1554,7 +1556,9 @@ int CmdHF14AMfCLoad(const char *Cmd)

blockNum = 0;\r

flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

while(!feof(f)){\r

blockNum = 0;\r

flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

while(!feof(f)){\r

+ \r

memset(buf, 0, sizeof(buf));\r

+ \r

if (fgets(buf, sizeof(buf), f) == NULL) {\r

PrintAndLog("File reading error.");\r

return 2;\r

if (fgets(buf, sizeof(buf), f) == NULL) {\r

PrintAndLog("File reading error.");\r

return 2;\r

@@ -1589,6 +1593,7 @@ int CmdHF14AMfCLoad(const char *Cmd)

PrintAndLog("Loaded from file: %s", filename);\r

return 0;\r

}\r

PrintAndLog("Loaded from file: %s", filename);\r

return 0;\r

}\r

+ return 0;\r

}\r

int CmdHF14AMfCGetBlk(const char *Cmd) {\r

}\r

int CmdHF14AMfCGetBlk(const char *Cmd) {\r

@@ -1760,17 +1765,19 @@ int CmdHF14AMfSniff(const char *Cmd){

int res = 0;\r

int len = 0;\r

int blockLen = 0;\r

int res = 0;\r

int len = 0;\r

int blockLen = 0;\r

- int num = 0;\r

int pckNum = 0;\r

- uint8_t uid[7] = {0x00};\r

+ int num = 0;\r

+ uint8_t uid[7];\r

uint8_t uid_len;\r

uint8_t atqa[2] = {0x00};\r

uint8_t sak;\r

bool isTag;\r

uint8_t uid_len;\r

uint8_t atqa[2] = {0x00};\r

uint8_t sak;\r

bool isTag;\r

- uint8_t buf[3000] = {0x00};\r

- uint8_t * bufPtr = buf;\r

+ uint8_t *buf = NULL;\r

+ uint16_t bufsize = 0;\r

+ uint8_t *bufPtr = NULL;\r

- if (param_getchar(Cmd, 0) == 'h') {\r

+ char ctmp = param_getchar(Cmd, 0);\r

+ if ( ctmp == 'h' || ctmp == 'H' ) {\r

PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r

PrintAndLog("You can specify:");\r

PrintAndLog(" l - save encrypted sequence to logfile `uid.log`");\r

PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r

PrintAndLog("You can specify:");\r

PrintAndLog(" l - save encrypted sequence to logfile `uid.log`");\r

@@ -1783,7 +1790,7 @@ int CmdHF14AMfSniff(const char *Cmd){

} \r

for (int i = 0; i < 4; i++) {\r

} \r

for (int i = 0; i < 4; i++) {\r

- char ctmp = param_getchar(Cmd, i);\r

+ ctmp = param_getchar(Cmd, i);\r

if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r

if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r

//if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r

if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r

if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r

//if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r

@@ -1810,32 +1817,47 @@ int CmdHF14AMfSniff(const char *Cmd){

break;\r

}\r

break;\r

}\r

- UsbCommand resp;\r

- if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r

res = resp.arg[0] & 0xff;\r

- len = resp.arg[1];\r

- num = resp.arg[2];\r

- \r

- if (res == 0) return 0;\r

- if (res == 1) {\r

- if (num ==0) {\r

+ uint16_t traceLen = resp.arg[1];\r

+ len = resp.arg[2];\r

+\r

+ if (res == 0) return 0; // we are done\r

+\r

+ if (res == 1) { // there is (more) data to be transferred\r

+ if (pckNum == 0) { // first packet, (re)allocate necessary buffer\r

+ if (traceLen > bufsize) {\r

+ uint8_t *p;\r

+ if (buf == NULL) { // not yet allocated\r

+ p = malloc(traceLen);\r

+ } else { // need more memory\r

+ p = realloc(buf, traceLen);\r

+ }\r

+ if (p == NULL) {\r

+ PrintAndLog("Cannot allocate memory for trace");\r

+ free(buf);\r

+ return 2;\r

+ }\r

+ buf = p;\r

+ }\r

bufPtr = buf;\r

- memset(buf, 0x00, 3000);\r

+ bufsize = traceLen;\r

+ memset(buf, 0x00, traceLen);\r

}\r

memcpy(bufPtr, resp.d.asBytes, len);\r

bufPtr += len;\r

pckNum++;\r

}\r

memcpy(bufPtr, resp.d.asBytes, len);\r

bufPtr += len;\r

pckNum++;\r

}\r

- if (res == 2) {\r

+\r

+ if (res == 2) { // received all data, start displaying\r

blockLen = bufPtr - buf;\r

bufPtr = buf;\r

printf(">\n");\r

PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r

blockLen = bufPtr - buf;\r

bufPtr = buf;\r

printf(">\n");\r

PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r

- num = 0;\r

while (bufPtr - buf < blockLen) {\r

- bufPtr += 6;\r

+ bufPtr += 6; // skip (void) timing information\r

len = *((uint16_t *)bufPtr);\r

-\r

if(len & 0x8000) {\r

isTag = true;\r

len &= 0x7fff;\r

if(len & 0x8000) {\r

isTag = true;\r

len &= 0x7fff;\r

@@ -1844,12 +1866,10 @@ int CmdHF14AMfSniff(const char *Cmd){

}\r

bufPtr += 2;\r

if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[12] == 0xff) && (bufPtr[13] == 0xff)) {\r

}\r

bufPtr += 2;\r

if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[12] == 0xff) && (bufPtr[13] == 0xff)) {\r

- \r

memcpy(uid, bufPtr + 2, 7);\r

memcpy(atqa, bufPtr + 2 + 7, 2);\r

uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4;\r

sak = bufPtr[11];\r

memcpy(uid, bufPtr + 2, 7);\r

memcpy(atqa, bufPtr + 2 + 7, 2);\r

uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4;\r

sak = bufPtr[11];\r

- \r

PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", \r

sprint_hex(uid + (7 - uid_len), uid_len),\r

atqa[1], \r

PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", \r

sprint_hex(uid + (7 - uid_len), uid_len),\r

atqa[1], \r

@@ -1867,18 +1887,21 @@ int CmdHF14AMfSniff(const char *Cmd){

AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r

if (wantDecrypt) \r

mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r

AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r

if (wantDecrypt) \r

mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r

+ num++; \r

}\r

bufPtr += len;\r

bufPtr += ((len-1)/8+1); // ignore parity\r

}\r

bufPtr += len;\r

bufPtr += ((len-1)/8+1); // ignore parity\r

- num++;\r

}\r

+ pckNum = 0;\r

}\r

} // resp not NULL\r

} // while (true)\r

}\r

} // resp not NULL\r

} // while (true)\r

- \r

+\r

+ free(buf);\r

return 0;\r

}\r

return 0;\r

}\r

+\r

static command_t CommandTable[] =\r

{\r

{"help", CmdHelp, 1, "This help"},\r

static command_t CommandTable[] =\r

{\r

{"help", CmdHelp, 1, "This help"},\r