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

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

index d9578af25768e8aa0e6e7b5d4a91101bb5ea1cd9..a2da01c97fc474c3e1b636e9ad46643d4076e500 100644 (file)

--- a/client/cmdhfmf.c

+++ b/client/cmdhfmf.c

@@ -18,6 +18,7 @@

#include "proxmark3.h"\r

#include "cmdmain.h"\r

#include "cmdhfmfhard.h"\r

+#include "parity.h"\r

#include "util.h"\r

#include "util_posix.h"\r

#include "usb_cmd.h"\r

@@ -25,6 +26,7 @@

#include "mifarehost.h"\r

#include "mifare.h"\r

#include "mfkey.h"\r

+#include "hardnested/hardnested_bf_core.h"\r

\r

#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up\r

\r

@@ -682,9 +684,9 @@ int CmdHF14AMfNested(const char *Cmd)

if (transferToEml) {\r

uint8_t sectortrailer;\r

if (trgBlockNo < 32*4) { // 4 block sector\r

- sectortrailer = (trgBlockNo & 0x03) + 3;\r

+ sectortrailer = trgBlockNo | 0x03;\r

} else { // 16 block sector\r

- sectortrailer = (trgBlockNo & 0x0f) + 15;\r

+ sectortrailer = trgBlockNo | 0x0f;\r

}\r

mfEmlGetMem(keyBlock, sectortrailer, 1);\r

\r

@@ -862,6 +864,13 @@ int CmdHF14AMfNestedHard(const char *Cmd)

PrintAndLog(" w: Acquire nonces and write them to binary file nonces.bin");\r

PrintAndLog(" s: Slower acquisition (required by some non standard cards)");\r

PrintAndLog(" r: Read nonces.bin and start attack");\r

+ PrintAndLog(" iX: set type of SIMD instructions. Without this flag programs autodetect it.");\r

+ PrintAndLog(" i5: AVX512");\r

+ PrintAndLog(" i2: AVX2");\r

+ PrintAndLog(" ia: AVX");\r

+ PrintAndLog(" is: SSE2");\r

+ PrintAndLog(" im: MMX");\r

+ PrintAndLog(" in: none (use CPU regular instruction set)");\r

PrintAndLog(" ");\r

PrintAndLog(" sample1: hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r

PrintAndLog(" sample2: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r

@@ -880,15 +889,20 @@ int CmdHF14AMfNestedHard(const char *Cmd)

int tests = 0;\r

\r

+ uint16_t iindx = 0;\r

if (ctmp == 'R' || ctmp == 'r') {\r

nonce_file_read = true;\r

+ iindx = 1;\r

if (!param_gethex(Cmd, 1, trgkey, 12)) {\r

know_target_key = true;\r

+ iindx = 2;\r

}\r

} else if (ctmp == 'T' || ctmp == 't') {\r

tests = param_get32ex(Cmd, 1, 100, 10);\r

+ iindx = 2;\r

if (!param_gethex(Cmd, 2, trgkey, 12)) {\r

know_target_key = true;\r

+ iindx = 3;\r

}\r

} else {\r

blockNo = param_get8(Cmd, 0);\r

@@ -922,19 +936,54 @@ int CmdHF14AMfNestedHard(const char *Cmd)

know_target_key = true;\r

i++;\r

}\r

+ iindx = i;\r

\r

while ((ctmp = param_getchar(Cmd, i))) {\r

if (ctmp == 's' || ctmp == 'S') {\r

slow = true;\r

} else if (ctmp == 'w' || ctmp == 'W') {\r

nonce_file_write = true;\r

+ } else if (param_getlength(Cmd, i) == 2 && ctmp == 'i') {\r

+ iindx = i;\r

} else {\r

- PrintAndLog("Possible options are w and/or s");\r

+ PrintAndLog("Possible options are w , s and/or iX");\r

return 1;\r

}\r

i++;\r

}\r

+ \r

+ SetSIMDInstr(SIMD_AUTO);\r

+ if (iindx > 0) {\r

+ while ((ctmp = param_getchar(Cmd, iindx))) {\r

+ if (param_getlength(Cmd, iindx) == 2 && ctmp == 'i') {\r

+ switch(param_getchar_indx(Cmd, 1, iindx)) {\r

+ case '5':\r

+ SetSIMDInstr(SIMD_AVX512);\r

+ break;\r

+ case '2':\r

+ SetSIMDInstr(SIMD_AVX2);\r

+ break;\r

+ case 'a':\r

+ SetSIMDInstr(SIMD_AVX);\r

+ break;\r

+ case 's':\r

+ SetSIMDInstr(SIMD_SSE2);\r

+ break;\r

+ case 'm':\r

+ SetSIMDInstr(SIMD_MMX);\r

+ break;\r

+ case 'n':\r

+ SetSIMDInstr(SIMD_NONE);\r

+ break;\r

+ default:\r

+ PrintAndLog("Unknown SIMD type. %c", param_getchar_indx(Cmd, 1, iindx));\r

+ return 1;\r

+ }\r

+ iindx++;\r

+ } \r

+ }\r

\r

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 ",\r

trgBlockNo,\r

@@ -987,6 +1036,7 @@ int CmdHF14AMfChk(const char *Cmd)

int i, res;\r

int keycnt = 0;\r

char ctmp = 0x00;\r

+ int clen = 0;\r

char ctmp3[3] = {0x00};\r

uint8_t blockNo = 0;\r

uint8_t SectorsCnt = 0;\r

@@ -1015,32 +1065,36 @@ int CmdHF14AMfChk(const char *Cmd)

blockNo = param_get8(Cmd, 0);\r

\r

ctmp = param_getchar(Cmd, 1);\r

- switch (ctmp) {\r

- case 'a': case 'A':\r

- keyType = 0;\r

- break;\r

- case 'b': case 'B':\r

- keyType = 1;\r

- break;\r

- case '?':\r

- keyType = 2;\r

- break;\r

- default:\r

- PrintAndLog("Key type must be A , B or ?");\r

- free(keyBlock);\r

- return 1;\r

- };\r

+ clen = param_getlength(Cmd, 1);\r

+ if (clen == 1) {\r

+ switch (ctmp) {\r

+ case 'a': case 'A':\r

+ keyType = 0;\r

+ break;\r

+ case 'b': case 'B':\r

+ keyType = 1;\r

+ break;\r

+ case '?':\r

+ keyType = 2;\r

+ break;\r

+ default:\r

+ PrintAndLog("Key type must be A , B or ?");\r

+ free(keyBlock);\r

+ return 1;\r

+ };\r

+ }\r

\r

// transfer to emulator & create dump file\r

ctmp = param_getchar(Cmd, 2);\r

- if (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r

- if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\r

+ clen = param_getlength(Cmd, 2);\r

+ if (clen == 1 && (ctmp == 't' || ctmp == 'T')) transferToEml = 1;\r

+ if (clen == 1 && (ctmp == 'd' || ctmp == 'D')) createDumpFile = 1;\r

\r

param3InUse = transferToEml | createDumpFile;\r

\r

timeout14a = 500; // fast by default\r

// double parameters - ts, ds\r

- int clen = param_getlength(Cmd, 2);\r

+ clen = param_getlength(Cmd, 2);\r

if (clen == 2 || clen == 3){\r

param_getstr(Cmd, 2, ctmp3, sizeof(ctmp3));\r

ctmp = ctmp3[1];\r

@@ -1089,7 +1143,7 @@ int CmdHF14AMfChk(const char *Cmd)

\r

if( buf[0]=='#' ) continue; //The line start with # is comment, skip\r

\r

- if (!isxdigit(buf[0])){\r

+ if (!isxdigit((unsigned char)buf[0])){\r

PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r

continue;\r

}\r

@@ -1632,10 +1686,7 @@ int CmdHF14AMfESet(const char *Cmd)

}\r

\r

// 1 - blocks count\r

- UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}};\r

- memcpy(c.d.asBytes, memBlock, 16);\r

- SendCommand(&c);\r

- return 0;\r

+ return mfEmlSetMem(memBlock, blockNo, 1);\r

}\r

\r

@@ -1854,7 +1905,7 @@ int CmdHF14AMfECFill(const char *Cmd)

default: numSectors = 16;\r

}\r

\r

- printf("--params: numSectors: %d, keyType:%d", numSectors, keyType);\r

+ printf("--params: numSectors: %d, keyType:%d\n", numSectors, keyType);\r

UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};\r

SendCommand(&c);\r

return 0;\r

@@ -2420,6 +2471,7 @@ int CmdHF14AMfSniff(const char *Cmd){

//var\r

int res = 0;\r

int len = 0;\r

+ int parlen = 0;\r

int blockLen = 0;\r

int pckNum = 0;\r

int num = 0;\r

@@ -2431,6 +2483,7 @@ int CmdHF14AMfSniff(const char *Cmd){

uint8_t *buf = NULL;\r

uint16_t bufsize = 0;\r

uint8_t *bufPtr = NULL;\r

+ uint8_t parity[16];\r

\r

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

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

@@ -2474,14 +2527,13 @@ int CmdHF14AMfSniff(const char *Cmd){

}\r

\r

UsbCommand resp;\r

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

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

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

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

len = resp.arg[2];\r

\r

if (res == 0) { // we are done\r

- free(buf);\r

- return 0;\r

+ break;\r

}\r

\r

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

@@ -2523,6 +2575,7 @@ int CmdHF14AMfSniff(const char *Cmd){

} else {\r

isTag = false;\r

}\r

+ parlen = (len - 1) / 8 + 1;\r

bufPtr += 2;\r

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

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

@@ -2541,15 +2594,22 @@ int CmdHF14AMfSniff(const char *Cmd){

if (wantDecrypt)\r

mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r

} else {\r

- PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r

+ oddparitybuf(bufPtr, len, parity);\r

+ PrintAndLog("%s(%d):%s [%s] c[%s]%c", \r

+ isTag ? "TAG":"RDR", \r

+ num, \r

+ sprint_hex(bufPtr, len), \r

+ printBitsPar(bufPtr + len, len), \r

+ printBitsPar(parity, len),\r

+ memcmp(bufPtr + len, parity, len / 8 + 1) ? '!' : ' ');\r

if (wantLogToFile)\r

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

if (wantDecrypt)\r

- mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r

+ mfTraceDecode(bufPtr, len, bufPtr[len], wantSaveToEmlFile);\r

num++;\r

}\r

bufPtr += len;\r

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

+ bufPtr += parlen; // ignore parity\r

}\r

pckNum = 0;\r

}\r

@@ -2557,6 +2617,9 @@ int CmdHF14AMfSniff(const char *Cmd){

} // while (true)\r

\r

free(buf);\r

+ \r

+ msleep(300); // wait for exiting arm side.\r

+ PrintAndLog("Done.");\r

return 0;\r

}\r

\r