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

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c

index aa3b66dc64b960f2bf855b62257f904b26196a4e..16612cba3b86e7f07d0360085f0fa773c8dfb33f 100644 (file)

--- a/client/cmdhfmf.c

+++ b/client/cmdhfmf.c

@@ -17,15 +17,14 @@ int CmdHF14AMifare(const char *Cmd)

uint32_t uid = 0;\r

uint32_t nt = 0, nr = 0;\r

uint64_t par_list = 0, ks_list = 0, r_key = 0;\r

- uint8_t isOK = 0;\r

- uint8_t keyBlock[8] = {0};\r

+ int16_t isOK = 0;\r

\r

UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\r

\r

// message\r

printf("-------------------------------------------------------------------------\n");\r

printf("Executing command. Expected execution time: 25sec on average :-)\n");\r

- printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r

+ printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r

printf("-------------------------------------------------------------------------\n");\r

\r

@@ -47,15 +46,20 @@ start:

}\r

\r

UsbCommand resp;\r

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

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

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

+ isOK = resp.arg[0];\r

uid = (uint32_t)bytes_to_num(resp.d.asBytes + 0, 4);\r

nt = (uint32_t)bytes_to_num(resp.d.asBytes + 4, 4);\r

par_list = bytes_to_num(resp.d.asBytes + 8, 8);\r

ks_list = bytes_to_num(resp.d.asBytes + 16, 8);\r

nr = bytes_to_num(resp.d.asBytes + 24, 4);\r

printf("\n\n");\r

- if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");\r

+ switch (isOK) {\r

+ case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;\r

+ case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;\r

+ case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;\r

+ default: ;\r

+ }\r

break;\r

}\r

} \r

@@ -69,22 +73,13 @@ start:

if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r

isOK = 2;\r

PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt); \r

- } else {\r

- printf("------------------------------------------------------------------\n");\r

- PrintAndLog("Key found:%012"llx" \n", r_key);\r

-\r

- num_to_bytes(r_key, 6, keyBlock);\r

- isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);\r

- }\r

- \r

- if (!isOK) \r

- PrintAndLog("Found valid key:%012"llx, r_key);\r

- else\r

- {\r

- if (isOK != 2) PrintAndLog("Found invalid key. "); \r

PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r

c.arg[0] = false;\r

goto start;\r

+ } else {\r

+ isOK = 0;\r

+ printf("------------------------------------------------------------------\n");\r

+ PrintAndLog("Found valid key:%012"llx" \n", r_key);\r

}\r

\r

PrintAndLog("");\r

@@ -622,8 +617,14 @@ int CmdHF14AMfNested(const char *Cmd)

\r

if (cmdp == 'o') {\r

PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');\r

- if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true)) {\r

- PrintAndLog("Nested error.");\r

+ int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);\r

+ if (isOK) {\r

+ switch (isOK) {\r

+ case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r

+ case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r

+ case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r

+ default : PrintAndLog("Unknown Error.\n");\r

+ }\r

return 2;\r

}\r

key64 = bytes_to_num(keyBlock, 6);\r

@@ -678,7 +679,7 @@ int CmdHF14AMfNested(const char *Cmd)

for (j = 0; j < 2; j++) {\r

if (e_sector[i].foundKey[j]) continue;\r

\r

- res = mfCheckKeys(FirstBlockOfSector(i), j, 6, keyBlock, &key64);\r

+ res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64);\r

\r

if (!res) {\r

e_sector[i].Key[j] = key64;\r

@@ -696,11 +697,17 @@ int CmdHF14AMfNested(const char *Cmd)

for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r

if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r

PrintAndLog("-----------------------------------------------");\r

- if(mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate)) {\r

- PrintAndLog("Nested error.\n");\r

+ int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r

+ if(isOK) {\r

+ switch (isOK) {\r

+ case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r

+ case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r

+ case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r

+ default : PrintAndLog("Unknown Error.\n");\r

+ }\r

free(e_sector);\r

- return 2; }\r

- else {\r

+ return 2;\r

+ } else {\r

calibrate = false;\r

}\r

\r

@@ -956,7 +963,7 @@ int CmdHF14AMfChk(const char *Cmd)

uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r

for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r

uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r

- res = mfCheckKeys(b, t, size, &keyBlock[6*c], &key64);\r

+ res = mfCheckKeys(b, t, true, size, &keyBlock[6*c], &key64);\r

if (res != 1) {\r

if (!res) {\r

PrintAndLog("Found valid key:[%012"llx"]",key64);\r

@@ -1200,9 +1207,9 @@ int CmdHF14AMfELoad(const char *Cmd)

\r

len = param_getstr(Cmd,nameParamNo,filename);\r

\r

- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

- fnameptr += len-4;\r

+ fnameptr += len;\r

\r

sprintf(fnameptr, ".eml"); \r

\r

@@ -1299,19 +1306,22 @@ int CmdHF14AMfESave(const char *Cmd)

\r

len = param_getstr(Cmd,nameParamNo,filename);\r

\r

- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

// user supplied filename?\r

if (len < 1) {\r

// get filename (UID from memory)\r

if (mfEmlGetMem(buf, 0, 1)) {\r

PrintAndLog("Can\'t get UID from block: %d", 0);\r

- sprintf(filename, "dump.eml"); \r

+ len = sprintf(fnameptr, "dump");\r

+ fnameptr += len;\r

+ }\r

+ else {\r

+ for (j = 0; j < 7; j++, fnameptr += 2)\r

+ sprintf(fnameptr, "%02X", buf[j]);\r

}\r

- for (j = 0; j < 7; j++, fnameptr += 2)\r

- sprintf(fnameptr, "%02X", buf[j]); \r

} else {\r

- fnameptr += len-4;\r

+ fnameptr += len;\r

}\r

\r

// add file extension\r

@@ -1572,10 +1582,10 @@ int CmdHF14AMfCLoad(const char *Cmd)

return 0;\r

} else {\r

len = strlen(Cmd);\r

- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

memcpy(filename, Cmd, len);\r

- fnameptr += len-4;\r

+ fnameptr += len;\r

\r

sprintf(fnameptr, ".eml"); \r

\r

@@ -1741,16 +1751,19 @@ int CmdHF14AMfCSave(const char *Cmd) {

return 0;\r

} else {\r

len = strlen(Cmd);\r

- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;\r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

if (len < 1) {\r

// get filename\r

if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r

PrintAndLog("Cant get block: %d", 0);\r

- return 1;\r

+ len = sprintf(fnameptr, "dump");\r

+ fnameptr += len;\r

+ }\r

+ else {\r

+ for (j = 0; j < 7; j++, fnameptr += 2)\r

+ sprintf(fnameptr, "%02x", buf[j]); \r

}\r

- for (j = 0; j < 7; j++, fnameptr += 2)\r

- sprintf(fnameptr, "%02x", buf[j]); \r

} else {\r

memcpy(filename, Cmd, len);\r

fnameptr += len;\r