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

index 22e6efac643716b1536d9f95844733c91d6a3830..33790230fa7324ccae4529f0400fd1f3d26154fa 100644 (file)

--- a/client/cmdhfmf.c

+++ b/client/cmdhfmf.c

@@ -570,7 +570,7 @@ int CmdHF14AMfRestore(const char *Cmd)

// Nested\r

//----------------------------------------------\r

// Nested\r

//----------------------------------------------\r

-static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint8_t *timeout) {\r

+static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint16_t *timeout) {\r

char ctmp3[4] = {0};\r

int len = param_getlength(Cmd, indx);\r

if (len > 0 && len < 4){\r

char ctmp3[4] = {0};\r

int len = param_getlength(Cmd, indx);\r

if (len > 0 && len < 4){\r

@@ -582,20 +582,19 @@ static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, boo

// slow and very slow\r

if (ctmp3[0] == 's' || ctmp3[0] == 'S' || ctmp3[1] == 's' || ctmp3[1] == 'S') {\r

// slow and very slow\r

if (ctmp3[0] == 's' || ctmp3[0] == 'S' || ctmp3[1] == 's' || ctmp3[1] == 'S') {\r

- *timeout = 11; // slow\r

+ *timeout = MF_CHKKEYS_SLOWTIMEOUT; // slow\r

if (!paramS1 && (ctmp3[1] == 's' || ctmp3[1] == 'S')) {\r

- *timeout = 53; // very slow\r

+ *timeout = MF_CHKKEYS_VERYSLOWTIMEOUT; // very slow\r

}\r

if (paramS1 && (ctmp3[2] == 's' || ctmp3[2] == 'S')) {\r

}\r

if (paramS1 && (ctmp3[2] == 's' || ctmp3[2] == 'S')) {\r

- *timeout = 53; // very slow\r

+ *timeout = MF_CHKKEYS_VERYSLOWTIMEOUT; // very slow\r

}\r

-int CmdHF14AMfNested(const char *Cmd)\r

-{\r

+int CmdHF14AMfNested(const char *Cmd) {\r

int i, j, res, iterations;\r

sector_t *e_sector = NULL;\r

uint8_t blockNo = 0;\r

int i, j, res, iterations;\r

sector_t *e_sector = NULL;\r

uint8_t blockNo = 0;\r

@@ -606,8 +605,8 @@ int CmdHF14AMfNested(const char *Cmd)

uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

uint8_t keyBlock[MifareDefaultKeysSize * 6];\r

uint64_t key64 = 0;\r

uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

uint8_t keyBlock[MifareDefaultKeysSize * 6];\r

uint64_t key64 = 0;\r

- // timeout in units. (ms * 106)/10 or us*0.0106\r

- uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r

+ // timeout in units. (ms * 106) or us*0.106\r

+ uint16_t timeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r

bool autosearchKey = false;\r

@@ -654,10 +653,10 @@ int CmdHF14AMfNested(const char *Cmd)

if (param_getchar(Cmd, 1) == '*') {\r

autosearchKey = true;\r

if (param_getchar(Cmd, 1) == '*') {\r

autosearchKey = true;\r

- parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r

+ parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &timeout14a);\r

PrintAndLog("--nested. sectors:%2d, block no:*, eml:%c, dmp=%c checktimeout=%d us",\r

- SectorsCnt, transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r

+ SectorsCnt, transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\r

} else {\r

blockNo = param_get8(Cmd, 1);\r

} else {\r

blockNo = param_get8(Cmd, 1);\r

@@ -676,7 +675,7 @@ int CmdHF14AMfNested(const char *Cmd)

}\r

// check if we can authenticate to sector\r

}\r

// check if we can authenticate to sector\r

- res = mfCheckKeys(blockNo, keyType, true, 1, key, &key64);\r

+ res = mfCheckKeys(blockNo, keyType, timeout14a, true, 1, key, &key64);\r

if (res) {\r

PrintAndLog("Can't authenticate to block:%3d key type:%c key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r

return 3;\r

if (res) {\r

PrintAndLog("Can't authenticate to block:%3d key type:%c key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r

return 3;\r

@@ -694,19 +693,19 @@ int CmdHF14AMfNested(const char *Cmd)

if (ctmp != 'A' && ctmp != 'a')\r

trgKeyType = 1;\r

if (ctmp != 'A' && ctmp != 'a')\r

trgKeyType = 1;\r

- parseParamTDS(Cmd, 6, &transferToEml, &createDumpFile, &btimeout14a);\r

+ parseParamTDS(Cmd, 6, &transferToEml, &createDumpFile, &timeout14a);\r

} else {\r

- parseParamTDS(Cmd, 4, &transferToEml, &createDumpFile, &btimeout14a);\r

+ parseParamTDS(Cmd, 4, &transferToEml, &createDumpFile, &timeout14a);\r

}\r

PrintAndLog("--nested. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r

}\r

PrintAndLog("--nested. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r

- SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r

+ SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\r

}\r

// one-sector nested\r

if (cmdp == 'o') { // ------------------------------------ one sector working\r

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

}\r

// one-sector nested\r

if (cmdp == 'o') { // ------------------------------------ one sector working\r

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

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

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

if (isOK < 0) {\r

switch (isOK) {\r

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

if (isOK < 0) {\r

switch (isOK) {\r

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

@@ -754,7 +753,7 @@ int CmdHF14AMfNested(const char *Cmd)

}\r

PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r

}\r

PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r

- mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);\r

+ mfCheckKeysSec(SectorsCnt, 2, timeout14a, true, true, true, MifareDefaultKeysSize, keyBlock, e_sector);\r

// get known key from array\r

bool keyFound = false;\r

// get known key from array\r

bool keyFound = false;\r

@@ -791,7 +790,7 @@ int CmdHF14AMfNested(const char *Cmd)

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

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

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

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

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

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

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

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

if(isOK < 0) {\r

switch (isOK) {\r

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

if(isOK < 0) {\r

switch (isOK) {\r

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

@@ -814,7 +813,7 @@ int CmdHF14AMfNested(const char *Cmd)

e_sector[sectorNo].Key[trgKeyType] = key64;\r

// try to check this key as a key to the other sectors\r

e_sector[sectorNo].Key[trgKeyType] = key64;\r

// try to check this key as a key to the other sectors\r

- mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, 1, keyBlock, e_sector);\r

+ mfCheckKeysSec(SectorsCnt, 2, timeout14a, true, true, true, 1, keyBlock, e_sector);\r

}\r

@@ -1049,8 +1048,8 @@ int CmdHF14AMfNestedHard(const char *Cmd)

}\r

-int CmdHF14AMfChk(const char *Cmd)\r

-{\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|d|s|ss] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r

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

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

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

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

@@ -1081,7 +1080,7 @@ int CmdHF14AMfChk(const char *Cmd)

uint8_t keyType = 0;\r

uint64_t key64 = 0;\r

// timeout in units. (ms * 106)/10 or us*0.0106\r

uint8_t keyType = 0;\r

uint64_t key64 = 0;\r

// timeout in units. (ms * 106)/10 or us*0.0106\r

- uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r

+ uint16_t timeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r

bool param3InUse = false;\r

bool transferToEml = 0;\r

bool createDumpFile = 0;\r

bool param3InUse = false;\r

bool transferToEml = 0;\r

bool createDumpFile = 0;\r

@@ -1134,7 +1133,7 @@ int CmdHF14AMfChk(const char *Cmd)

};\r

}\r

};\r

}\r

- parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);\r

+ parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &timeout14a);\r

if (singleBlock & createDumpFile) {\r

PrintAndLog (" block key check (<block no>) and write to dump file (d) combination is not supported ");\r

if (singleBlock & createDumpFile) {\r

PrintAndLog (" block key check (<block no>) and write to dump file (d) combination is not supported ");\r

@@ -1142,10 +1141,10 @@ int CmdHF14AMfChk(const char *Cmd)

return 1;\r

}\r

return 1;\r

}\r

- param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);\r

+ param3InUse = transferToEml | createDumpFile | (timeout14a != MF_CHKKEYS_DEFTIMEOUT);\r

PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",\r

- SectorsCnt, blockNo, keyType==0?'A':keyType==1?'B':'?', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);\r

+ SectorsCnt, blockNo, keyType==0?'A':keyType==1?'B':'?', transferToEml?'y':'n', createDumpFile?'y':'n', ((uint32_t)timeout14a * 1000) / 106);\r

for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {\r

if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r

for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {\r

if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r

@@ -1251,7 +1250,9 @@ int CmdHF14AMfChk(const char *Cmd)

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

uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\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 = mfCheckKeysSec(SectorsCnt, keyType, btimeout14a, clearTraceLog, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106\r

+ bool init = (c == 0);\r

+ bool drop_field = (c + size == keycnt);\r

+ res = mfCheckKeysSec(SectorsCnt, keyType, timeout14a, clearTraceLog, init, drop_field, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106\r

clearTraceLog = false;\r

if (res != 1) {\r

clearTraceLog = false;\r

if (res != 1) {\r

@@ -1269,27 +1270,23 @@ int CmdHF14AMfChk(const char *Cmd)

} else {\r

int keyAB = keyType;\r

do {\r

} else {\r

int keyAB = keyType;\r

do {\r

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

-\r

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

- res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);\r

- clearTraceLog = false;\r

+ res = mfCheckKeys(blockNo, keyAB & 0x01, timeout14a, true, keycnt, keyBlock, &key64);\r

+ clearTraceLog = false;\r

- if (res != 1) {\r

- if (!res) {\r

- // Use the common format below\r

- // PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r

- foundAKey = true;\r

+ if (res != 1) {\r

+ if (!res) {\r

+ // Use the common format below\r

+ // PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r

+ foundAKey = true;\r

- // Store the Single Key for display list\r

- // For a single block check, SectorsCnt = Sector that contains the block\r

- e_sector[SectorsCnt-1].foundKey[(keyAB & 0x01)] = true; // flag key found\r

- e_sector[SectorsCnt-1].Key[(keyAB & 0x01)] = key64; // Save key data\r

+ // Store the Single Key for display list\r

+ // For a single block check, SectorsCnt = Sector that contains the block\r

+ e_sector[SectorsCnt-1].foundKey[(keyAB & 0x01)] = true; // flag key found\r

+ e_sector[SectorsCnt-1].Key[(keyAB & 0x01)] = key64; // Save key data\r

- }\r

- } else {\r

- PrintAndLog("Command execute timeout");\r

}\r

+ } else {\r

+ PrintAndLog("Command execute timeout");\r

}\r

} while(--keyAB > 0);\r

}\r

} while(--keyAB > 0);\r

}\r

@@ -2675,7 +2672,7 @@ int CmdHF14AMfSniff(const char *Cmd){

}\r

UsbCommand resp;\r

}\r

UsbCommand resp;\r

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

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

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

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

len = resp.arg[2];\r

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

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

len = resp.arg[2];\r