- Deleted wipe functionality from `hf mf csetuid` (Merlok)
- Changed `hf mf nested` logic (Merlok)
- Added `hf mf nested` mode: autosearch keys for attack (from well known keys) (Merlok)
+- `hf mf nested` Check keys after they have found (Merlok)
+- `hf mf chk` Move main cycle to arm (Merlok)
### Fixed
- Added `hf mf cwipe` command. It wipes "magic Chinese" card. For 1a generation it uses card's "wipe" command. For gen1a and gen1b it uses a write command. (Merlok)
- Added to `hf mf nested` source key check before attack (Merlok)
- Added to `hf mf nested` after attack it checks all found keys on non-open sectors (Merlok)
+- `hf mf chk` Added setings to set iso14443a operations timeout. default timeout set to 500us (Merlok)
## [3.0.1][2017-06-08]
void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain);
void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain);
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
+void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain);
void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain);
void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
extern int iso14_apdu(uint8_t *cmd, uint16_t cmd_len, void *data);
extern int iso14443a_select_card(uint8_t *uid_ptr, iso14a_card_select_t *resp_data, uint32_t *cuid_ptr, bool anticollision, uint8_t num_cascades, bool no_rats);
extern void iso14a_set_trigger(bool enable);
+extern void iso14a_set_timeout(uint32_t timeout);
#endif /* __ISO14443A_H */
#include "parity.h"\r
#include "crc.h"\r
\r
-#define AUTHENTICATION_TIMEOUT 848 // card times out 1ms after wrong authentication (according to NXP documentation)\r
-#define PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication\r
-\r
-\r
// the block number for the ISO14443-4 PCB\r
static uint8_t pcb_blocknum = 0;\r
// Deselect card by sending a s-block. the crc is precalced for speed\r
// MIFARE check keys. key count up to 85.\r
//\r
//-----------------------------------------------------------------------------\r
-void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
+void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
{\r
uint8_t blockNo = arg0 & 0xff;\r
uint8_t keyType = (arg0 >> 8) & 0xff;\r
- bool clearTrace = arg1;\r
+ bool clearTrace = arg1 & 0x01;\r
+ bool multisectorCheck = arg1 & 0x02;\r
+ uint8_t set14aTimeout = (arg1 >> 8) & 0xff;\r
uint8_t keyCount = arg2;\r
- uint64_t ui64Key = 0;\r
-\r
- bool have_uid = false;\r
- uint8_t cascade_levels = 0;\r
- uint32_t timeout = 0;\r
- int i;\r
- byte_t isOK = 0;\r
- uint8_t uid[10];\r
- uint32_t cuid;\r
- struct Crypto1State mpcs = {0, 0};\r
- struct Crypto1State *pcs;\r
- pcs = &mpcs;\r
\r
// clear debug level\r
int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r
if (clearTrace) clear_trace();\r
set_tracing(true);\r
\r
- for (i = 0; i < keyCount; i++) {\r
-// if(mifare_classic_halt(pcs, cuid)) {\r
-// if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Halt error");\r
-// }\r
+ if (set14aTimeout){\r
+ iso14a_set_timeout(set14aTimeout * 10); // timeout: ms = x/106 35-minimum, 50-OK 106-recommended 500-safe\r
+ }\r
+ \r
+ if (multisectorCheck) {\r
+ TKeyIndex keyIndex = {{0}};\r
+ uint8_t sectorCnt = blockNo;\r
+ int res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, OLD_MF_DBGLEVEL, &keyIndex);\r
\r
- // Iceman: use piwi's faster nonce collecting part in hardnested.\r
- if (!have_uid) { // need a full select cycle to get the uid first\r
- iso14a_card_select_t card_info;\r
- if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {\r
- if (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card");\r
- --i; // try same key once again\r
- continue;\r
- }\r
- switch (card_info.uidlen) {\r
- case 4 : cascade_levels = 1; break;\r
- case 7 : cascade_levels = 2; break;\r
- case 10: cascade_levels = 3; break;\r
- default: break;\r
- }\r
- have_uid = true;\r
- } else { // no need for anticollision. We can directly select the card\r
- if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {\r
- if (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (UID)");\r
- --i; // try same key once again\r
- continue;\r
- }\r
+ LED_B_ON();\r
+ if (res >= 0) {\r
+ cmd_send(CMD_ACK, 1, 0, 0, keyIndex, 80);\r
+ } else {\r
+ cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r
}\r
-\r
- ui64Key = bytes_to_num(datain + i * 6, 6);\r
- if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
- uint8_t dummy_answer = 0;\r
- ReaderTransmit(&dummy_answer, 1, NULL);\r
- timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r
-\r
- // wait for the card to become ready again\r
- while(GetCountSspClk() < timeout);\r
- continue;\r
+ LED_B_OFF();\r
+ } else { \r
+ int res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, OLD_MF_DBGLEVEL);\r
+ \r
+ LED_B_ON();\r
+ if (res > 0) {\r
+ cmd_send(CMD_ACK, 1, 0, 0, datain + (res - 1) * 6, 6);\r
+ } else {\r
+ cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r
}\r
-\r
- isOK = 1;\r
- break;\r
+ LED_B_OFF();\r
}\r
\r
- LED_B_ON();\r
- cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r
- LED_B_OFF();\r
-\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
\r
}\r
return 1;\r
}\r
+\r
+//-----------------------------------------------------------------------------\r
+// MIFARE check keys\r
+//\r
+//-----------------------------------------------------------------------------\r
+// one key check\r
+int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel) {\r
+\r
+ struct Crypto1State mpcs = {0, 0};\r
+ struct Crypto1State *pcs;\r
+ pcs = &mpcs;\r
+\r
+ // Iceman: use piwi's faster nonce collecting part in hardnested.\r
+ if (*cascade_levels == 0) { // need a full select cycle to get the uid first\r
+ iso14a_card_select_t card_info;\r
+ if(!iso14443a_select_card(uid, &card_info, cuid, true, 0, true)) {\r
+ if (debugLevel >= 1) Dbprintf("ChkKeys: Can't select card");\r
+ return 1;\r
+ }\r
+ switch (card_info.uidlen) {\r
+ case 4 : *cascade_levels = 1; break;\r
+ case 7 : *cascade_levels = 2; break;\r
+ case 10: *cascade_levels = 3; break;\r
+ default: break;\r
+ }\r
+ } else { // no need for anticollision. We can directly select the card\r
+ if(!iso14443a_select_card(uid, NULL, NULL, false, *cascade_levels, true)) {\r
+ if (debugLevel >= 1) Dbprintf("ChkKeys: Can't select card (UID) lvl=%d", *cascade_levels);\r
+ return 1;\r
+ }\r
+ }\r
+ \r
+ if(mifare_classic_auth(pcs, *cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r
+// SpinDelayUs(AUTHENTICATION_TIMEOUT); // it not needs because mifare_classic_auth have timeout from iso14a_set_timeout()\r
+ return 2;\r
+ } else {\r
+/* // let it be here. it like halt command, but maybe it will work in some strange cases\r
+ uint8_t dummy_answer = 0;\r
+ ReaderTransmit(&dummy_answer, 1, NULL);\r
+ int timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT; \r
+ // wait for the card to become ready again\r
+ while(GetCountSspClk() < timeout) {};\r
+*/\r
+ // it needs after success authentication\r
+ mifare_classic_halt(pcs, *cuid);\r
+ }\r
+ \r
+ return 0;\r
+}\r
+\r
+// multi key check\r
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel) {\r
+ uint8_t uid[10];\r
+ uint32_t cuid = 0;\r
+ uint8_t cascade_levels = 0;\r
+ uint64_t ui64Key = 0;\r
+\r
+ int retryCount = 0;\r
+ for (uint8_t i = 0; i < keyCount; i++) {\r
+\r
+ // Allow button press / usb cmd to interrupt device\r
+ if (BUTTON_PRESS() && !usb_poll_validate_length()) { \r
+ Dbprintf("ChkKeys: Cancel operation. Exit...");\r
+ return -2;\r
+ }\r
+\r
+ ui64Key = bytes_to_num(keys + i * 6, 6);\r
+ int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, ui64Key, blockNo, keyType, debugLevel);\r
+ \r
+ // can't select\r
+ if (res == 1) {\r
+ retryCount++;\r
+ if (retryCount >= 5) {\r
+ Dbprintf("ChkKeys: block=%d key=%d. Can't select. Exit...", blockNo, keyType);\r
+ return -1;\r
+ }\r
+ --i; // try the same key once again\r
+\r
+ SpinDelay(20);\r
+// Dbprintf("ChkKeys: block=%d key=%d. Try the same key once again...", blockNo, keyType);\r
+ continue;\r
+ }\r
+ \r
+ // can't authenticate\r
+ if (res == 2) {\r
+ retryCount = 0;\r
+ continue; // can't auth. wrong key.\r
+ }\r
+\r
+ return i + 1;\r
+ }\r
+ \r
+ return 0;\r
+}\r
+\r
+// multisector multikey check\r
+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint8_t debugLevel, TKeyIndex *keyIndex) {\r
+ int res = 0;\r
+ \r
+// int clk = GetCountSspClk();\r
+\r
+ for(int sc = 0; sc < SectorCount; sc++){\r
+ WDT_HIT();\r
+\r
+ int keyAB = keyType;\r
+ do {\r
+ res = MifareChkBlockKeys(keys, keyCount, FirstBlockOfSector(sc), keyAB & 0x01, debugLevel);\r
+ if (res < 0){\r
+ return res;\r
+ }\r
+ if (res > 0){\r
+ (*keyIndex)[keyAB & 0x01][sc] = res;\r
+ }\r
+ } while(--keyAB > 0);\r
+ }\r
+ \r
+// Dbprintf("%d %d", GetCountSspClk() - clk, (GetCountSspClk() - clk)/(SectorCount*keyCount*(keyType==2?2:1)));\r
+ \r
+ return 0;\r
+}\r
+\r
+\r
#define __MIFAREUTIL_H\r
\r
#include "crapto1/crapto1.h"\r
+#include "usb_cdc.h"\r
\r
// mifare authentication\r
#define CRYPT_NONE 0\r
#define CRYPT_REQUEST 2\r
#define AUTH_FIRST 0 \r
#define AUTH_NESTED 2\r
+#define AUTHENTICATION_TIMEOUT 848 // card times out 1ms after wrong authentication (according to NXP documentation)\r
+#define PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication\r
\r
// mifare 4bit card answers\r
#define CARD_ACK 0x0A // 1010 - ACK\r
int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);\r
int emlCheckValBl(int blockNum);\r
\r
+// mifare check keys\r
+typedef uint8_t TKeyIndex[2][40];\r
+int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);\r
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);\r
+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint8_t debugLevel, TKeyIndex *keyIndex);\r
+\r
#endif\r
if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
- PrintAndLog(" %9d | %9d | %s | fdt (Frame Delay Time): %d",
+ PrintAndLog(" %10d | %10d | %s | fdt (Frame Delay Time): %d",
(EndOfTransmissionTimestamp - first_timestamp),
(next_timestamp - first_timestamp),
" ",
return 0;\r
}\r
\r
-\r
-typedef struct {\r
- uint64_t Key[2];\r
- int foundKey[2];\r
-} sector_t;\r
-\r
-\r
# define NESTED_KEY_COUNT 15\r
int CmdHF14AMfNested(const char *Cmd)\r
{\r
if (e_sector == NULL) return 1;\r
\r
//test current key and additional standard keys first\r
- memcpy(keyBlock, key, 6);\r
- num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));\r
- num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 2 * 6));\r
- num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));\r
- num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));\r
- num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r
- num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 6 * 6));\r
- num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 7 * 6));\r
- num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 8 * 6));\r
- num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 9 * 6));\r
- num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 10 * 6));\r
- num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 11 * 6));\r
- num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 12 * 6));\r
- num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 13 * 6));\r
- num_to_bytes(0x1a2b3c4d5e6f, 6, (uint8_t*)(keyBlock + 14 * 6));\r
+ for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){\r
+ num_to_bytes(MifareDefaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
+ }\r
\r
PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r
- for (i = 0; i < SectorsCnt; i++) {\r
- for (j = 0; j < 2; j++) {\r
- if (e_sector[i].foundKey[j]) continue;\r
-\r
- res = mfCheckKeys(FirstBlockOfSector(i), j, true, NESTED_KEY_COUNT, keyBlock, &key64); \r
-\r
- if (!res) {\r
- e_sector[i].Key[j] = key64;\r
- e_sector[i].foundKey[j] = 1;\r
- }\r
- }\r
- }\r
+ mfCheckKeysSec(SectorsCnt, 2, MF_CHKKEYS_DEFTIMEOUT, true, NESTED_KEY_COUNT, keyBlock, e_sector);\r
\r
// get known key from array\r
bool keyFound = false;\r
PrintAndLog("Found valid key:%012" PRIx64, key64);\r
e_sector[sectorNo].foundKey[trgKeyType] = 1;\r
e_sector[sectorNo].Key[trgKeyType] = key64;\r
+ \r
+ // try to check this key as a key to the other sectors\r
+ mfCheckKeysSec(SectorsCnt, 2, MF_CHKKEYS_DEFTIMEOUT, true, 1, keyBlock, e_sector);\r
}\r
}\r
}\r
PrintAndLog("\n\n-----------------------------------------------\nNested statistic:\nIterations count: %d", iterations);\r
PrintAndLog("Time in nested: %1.3f (%1.3f sec per key)", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0);\r
\r
- // check if we have unrecognized keys\r
- bool notFoundKeys = false;\r
- for (i = 0; i < SectorsCnt; i++) {\r
- for (j = 0; j < 2; j++) {\r
- if (!e_sector[i].foundKey[j]) {\r
- notFoundKeys = true;\r
- break;\r
- }\r
- }\r
- if (notFoundKeys) break;\r
- } \r
- \r
- if (notFoundKeys) {\r
- PrintAndLog("-----------------------------------------------\n");\r
- PrintAndLog("We have unrecognized keys. Trying to check if we have this keys on key buffer...");\r
-\r
- // fill keyBlock with known keys\r
- int cnt = 0;\r
- for (i = 0; i < SectorsCnt; i++) {\r
- for (j = 0; j < 2; j++) {\r
- if (e_sector[i].foundKey[j]) {\r
- // try to insert key to keyBlock \r
- if (cnt < NESTED_KEY_COUNT) {\r
-\r
- // search for dublicates\r
- bool dubl = false;\r
- for (int v = 0; v < NESTED_KEY_COUNT; v++) {\r
- if (e_sector[i].Key[j] == bytes_to_num((uint8_t*)(keyBlock + v * 6), 6)) {\r
- dubl = true;\r
- break;\r
- }\r
- }\r
- \r
- // insert\r
- if (!dubl) {\r
- num_to_bytes(e_sector[i].Key[j], 6, (uint8_t*)(keyBlock + cnt * 6));\r
- cnt++;\r
- }\r
- }\r
- }\r
- }\r
- }\r
-\r
- // try to auth with known keys to not recognized sectors keys\r
- PrintAndLog("Testing keys. Sector count=%d known keys count:%d", SectorsCnt, cnt);\r
- for (i = 0; i < SectorsCnt; i++) {\r
- for (j = 0; j < 2; j++) {\r
- if (e_sector[i].foundKey[j]) continue;\r
-\r
- res = mfCheckKeys(FirstBlockOfSector(i), j, true, cnt, keyBlock, &key64); \r
-\r
- if (!res) {\r
- e_sector[i].Key[j] = key64;\r
- e_sector[i].foundKey[j] = 1;\r
- }\r
- }\r
- } \r
- \r
- } // if (notFoundKeys)\r
- \r
// print result\r
PrintAndLog("|---|----------------|---|----------------|---|");\r
PrintAndLog("|sec|key A |res|key B |res|");\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] [<key (12 hex symbols)>] [<dic (*.dic)>]");\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
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("s - slow execute. timeout 1ms");\r
+ PrintAndLog("ss- very slow execute. timeout 5ms");\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
+ PrintAndLog(" hf mf chk *1 ? s");\r
+ PrintAndLog(" hf mf chk *1 ? dss");\r
return 0;\r
}\r
\r
int i, res;\r
int keycnt = 0;\r
char ctmp = 0x00;\r
+ char ctmp3[3] = {0x00};\r
uint8_t blockNo = 0;\r
- uint8_t SectorsCnt = 1;\r
+ uint8_t SectorsCnt = 0;\r
uint8_t keyType = 0;\r
uint64_t key64 = 0;\r
+ uint32_t timeout14a = 0; // timeout in us\r
+ bool param3InUse = false;\r
\r
int transferToEml = 0;\r
int createDumpFile = 0;\r
+ \r
+ sector_t *e_sector = NULL;\r
\r
keyBlock = calloc(stKeyBlock, 6);\r
if (keyBlock == NULL) return 1;\r
\r
- uint64_t defaultKeys[] =\r
- {\r
- 0xffffffffffff, // Default key (first key used by program if no user defined key)\r
- 0x000000000000, // Blank key\r
- 0xa0a1a2a3a4a5, // NFCForum MAD key\r
- 0xb0b1b2b3b4b5,\r
- 0xaabbccddeeff,\r
- 0x4d3a99c351dd,\r
- 0x1a982c7e459a,\r
- 0xd3f7d3f7d3f7,\r
- 0x714c5c886e97,\r
- 0x587ee5f9350f,\r
- 0xa0478cc39091,\r
- 0x533cb6c723f6,\r
- 0x8fd0a4f256e9\r
- };\r
- int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);\r
-\r
- for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r
- {\r
- num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
+ int defaultKeysSize = MifareDefaultKeysSize;\r
+ for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++){\r
+ num_to_bytes(MifareDefaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
}\r
\r
if (param_getchar(Cmd, 0)=='*') {\r
- blockNo = 3;\r
SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0));\r
}\r
else\r
ctmp = param_getchar(Cmd, 1);\r
switch (ctmp) {\r
case 'a': case 'A':\r
- keyType = !0;\r
+ keyType = 0;\r
break;\r
case 'b': case 'B':\r
- keyType = !1;\r
+ keyType = 1;\r
break;\r
case '?':\r
keyType = 2;\r
return 1;\r
};\r
\r
+ // transfer to emulator & create dump file\r
ctmp = param_getchar(Cmd, 2);\r
- if (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
- else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\r
+ if (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
+ if (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
+ if (clen == 2 || clen == 3){\r
+ param_getstr(Cmd, 2, ctmp3);\r
+ ctmp = ctmp3[1];\r
+ }\r
+ //parse\r
+ if (ctmp == 's' || ctmp == 'S') {\r
+ timeout14a = 1000; // slow\r
+ if (!param3InUse && clen == 2 && (ctmp3[1] == 's' || ctmp3[1] == 'S')) {\r
+ timeout14a = 5000; // very slow\r
+ }\r
+ if (param3InUse && clen == 3 && (ctmp3[2] == 's' || ctmp3[2] == 'S')) {\r
+ timeout14a = 5000; // very slow\r
+ }\r
+ param3InUse = true;\r
+ }\r
\r
- for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) {\r
+ for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {\r
if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r
if ( stKeyBlock - keycnt < 2) {\r
p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
}\r
}\r
\r
+ // fill with default keys\r
if (keycnt == 0) {\r
PrintAndLog("No key specified, trying default keys");\r
for (;keycnt < defaultKeysSize; keycnt++)\r
}\r
\r
// initialize storage for found keys\r
- bool validKey[2][40];\r
- uint8_t foundKey[2][40][6];\r
- for (uint16_t t = 0; t < 2; t++) {\r
+ e_sector = calloc(SectorsCnt, sizeof(sector_t));\r
+ if (e_sector == NULL) return 1;\r
+ for (uint8_t keyAB = 0; keyAB < 2; keyAB++) {\r
for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
- validKey[t][sectorNo] = false;\r
- for (uint16_t i = 0; i < 6; i++) {\r
- foundKey[t][sectorNo][i] = 0xff;\r
- }\r
+ e_sector[sectorNo].Key[keyAB] = 0xffffffffffff;\r
+ e_sector[sectorNo].foundKey[keyAB] = 0;\r
}\r
}\r
+ printf("\n");\r
+\r
+ bool foundAKey = false;\r
+ uint32_t max_keys = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt;\r
+ if (SectorsCnt) {\r
+ PrintAndLog("To cancel this operation press the button on the proxmark...");\r
+ printf("--");\r
+ for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
\r
- for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r
- int b=blockNo;\r
- for (int i = 0; i < SectorsCnt; ++i) {\r
- PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\r
- uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r
+ uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
+ res = mfCheckKeysSec(SectorsCnt, keyType, timeout14a * 1.06 / 100, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106\r
+\r
+ if (res != 1) {\r
+ if (!res) {\r
+ printf("o");\r
+ foundAKey = true;\r
+ } else {\r
+ printf(".");\r
+ }\r
+ } else {\r
+ printf("\n");\r
+ PrintAndLog("Command execute timeout");\r
+ }\r
+ }\r
+ } else {\r
+ int keyAB = keyType;\r
+ do {\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, true, size, &keyBlock[6*c], &key64);\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
+\r
if (res != 1) {\r
if (!res) {\r
- PrintAndLog("Found valid key:[%012" PRIx64 "]",key64);\r
- num_to_bytes(key64, 6, foundKey[t][i]);\r
- validKey[t][i] = true;\r
+ PrintAndLog("Found valid key:[%d:%c]%012" PRIx64, blockNo, (keyAB & 0x01)?'B':'A', key64);\r
+ foundAKey = true;\r
}\r
} else {\r
PrintAndLog("Command execute timeout");\r
}\r
}\r
- b<127?(b+=4):(b+=16);\r
- }\r
+ } while(--keyAB > 0);\r
}\r
-\r
+ \r
+ // print result\r
+ if (foundAKey) {\r
+ if (SectorsCnt) {\r
+ PrintAndLog("");\r
+ PrintAndLog("|---|----------------|---|----------------|---|");\r
+ PrintAndLog("|sec|key A |res|key B |res|");\r
+ PrintAndLog("|---|----------------|---|----------------|---|");\r
+ for (i = 0; i < SectorsCnt; i++) {\r
+ PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %d |", i,\r
+ e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r
+ }\r
+ PrintAndLog("|---|----------------|---|----------------|---|");\r
+ }\r
+ } else {\r
+ PrintAndLog("");\r
+ PrintAndLog("No valid keys found.");\r
+ } \r
+ \r
if (transferToEml) {\r
uint8_t block[16];\r
for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
- if (validKey[0][sectorNo] || validKey[1][sectorNo]) {\r
+ if (e_sector[sectorNo].foundKey[0] || e_sector[sectorNo].foundKey[1]) {\r
mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
for (uint16_t t = 0; t < 2; t++) {\r
- if (validKey[t][sectorNo]) {\r
- memcpy(block + t*10, foundKey[t][sectorNo], 6);\r
+ if (e_sector[sectorNo].foundKey[t]) {\r
+ num_to_bytes(e_sector[sectorNo].Key[t], 6, block + t * 10);\r
}\r
}\r
mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r
FILE *fkeys = fopen("dumpkeys.bin","wb");\r
if (fkeys == NULL) {\r
PrintAndLog("Could not create file dumpkeys.bin");\r
+ free(e_sector);\r
free(keyBlock);\r
return 1;\r
}\r
- for (uint16_t t = 0; t < 2; t++) {\r
- fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);\r
+ uint8_t mkey[6];\r
+ for (uint8_t t = 0; t < 2; t++) {\r
+ for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
+ num_to_bytes(e_sector[sectorNo].Key[t], 6, mkey);\r
+ fwrite(mkey, 1, 6, fkeys);\r
+ }\r
}\r
fclose(fkeys);\r
PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r
}\r
\r
+ free(e_sector);\r
free(keyBlock);\r
PrintAndLog("");\r
return 0;\r
#ifndef CMDHFMF_H__\r
#define CMDHFMF_H__\r
\r
+#include "mifaredefault.h"\r
+\r
extern int CmdHFMF(const char *Cmd);\r
extern int CmdHF14AMfDbg(const char* cmd);
* @param ms_timeout
* @return true if command was returned, otherwise false
*/
-bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
+bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning) {
UsbCommand resp;
}
}
msleep(10); // XXX ugh
- if (dm_seconds == 200) { // Two seconds elapsed
+ if (dm_seconds == 200 && show_warning) { // Two seconds elapsed
PrintAndLog("Waiting for a response from the proxmark...");
PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
}
return false;
}
+bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
+ return WaitForResponseTimeoutW(cmd, response, ms_timeout, true);
+}
bool WaitForResponse(uint32_t cmd, UsbCommand* response) {
- return WaitForResponseTimeout(cmd,response,-1);
+ return WaitForResponseTimeoutW(cmd, response, -1, true);
}
extern void UsbCommandReceived(UsbCommand *UC);
extern int CommandReceived(char *Cmd);
+extern bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeout, bool show_warning);
extern bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout);
extern bool WaitForResponse(uint32_t cmd, UsbCommand* response);
extern void clearCommandBuffer();
--- /dev/null
+//-----------------------------------------------------------------------------
+// Copyright (C) 2017 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Mifare default constants
+//-----------------------------------------------------------------------------
+
+#ifndef MIFAREDEFAULT_H__
+#define MIFAREDEFAULT_H__
+
+#include <inttypes.h>
+
+#define MifareDefaultKeysSize sizeof(MifareDefaultKeys) / sizeof(uint64_t)
+
+static const uint64_t MifareDefaultKeys[] =
+{
+ 0xffffffffffff, // Default key (first key used by program if no user defined key)
+ 0x000000000000, // Blank key
+ 0xa0a1a2a3a4a5, // NFCForum MAD key
+ 0xb0b1b2b3b4b5,
+ 0xaabbccddeeff,
+ 0x1a2b3c4d5e6f,
+ 0x123456789abc,
+ 0x010203040506,
+ 0x123456abcdef,
+ 0xabcdef123456,
+ 0x4d3a99c351dd,
+ 0x1a982c7e459a,
+ 0xd3f7d3f7d3f7,
+ 0x714c5c886e97,
+ 0x587ee5f9350f,
+ 0xa0478cc39091,
+ 0x533cb6c723f6,
+ 0x8fd0a4f256e9
+};
+
+#endif
\r
*key = -1;\r
\r
- UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};\r
+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType & 0xff) << 8)), clear_trace, keycnt}}; \r
memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
SendCommand(&c);\r
\r
UsbCommand resp;\r
- if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;\r
+ if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1; \r
if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
*key = bytes_to_num(resp.d.asBytes, 6);\r
return 0;\r
}\r
\r
+int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector){\r
+\r
+ uint8_t keyPtr = 0;\r
+\r
+ if (e_sector == NULL)\r
+ return -1;\r
+\r
+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((sectorCnt & 0xff) | ((keyType & 0xff) << 8)), (clear_trace | 0x02)|((timeout14a & 0xff) << 8), keycnt}}; \r
+ memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
+ SendCommand(&c);\r
+\r
+ UsbCommand resp;\r
+ if (!WaitForResponseTimeoutW(CMD_ACK, &resp, MAX(3000, 1000 + 13 * sectorCnt * keycnt * (keyType == 2 ? 2 : 1)), false)) return 1; // timeout: 13 ms / fail auth\r
+ if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
+ \r
+ bool foundAKey = false;\r
+ for(int sec = 0; sec < sectorCnt; sec++){\r
+ for(int keyAB = 0; keyAB < 2; keyAB++){\r
+ keyPtr = *(resp.d.asBytes + keyAB * 40 + sec);\r
+ if (keyPtr){\r
+ e_sector[sec].foundKey[keyAB] = true;\r
+ e_sector[sec].Key[keyAB] = bytes_to_num(keyBlock + (keyPtr - 1) * 6, 6);\r
+ foundAKey = true;\r
+ }\r
+ }\r
+ }\r
+ return foundAKey ? 0 : 3;\r
+}\r
+\r
// Compare 16 Bits out of cryptostate\r
int Compare16Bits(const void * a, const void * b) {\r
if ((*(uint64_t*)b & 0x00ff000000ff0000) == (*(uint64_t*)a & 0x00ff000000ff0000)) return 0;\r
-// Merlok, 2011\r
+// Merlok, 2011, 2017\r
// people from mifare@nethemba.com, 2010\r
//\r
// This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
#include <stdbool.h>\r
#include "data.h"\r
\r
+// defaults\r
+// timeout in units. (ms * 106)/10 or us*0.0106\r
+// 5 == 500us\r
+#define MF_CHKKEYS_DEFTIMEOUT 5\r
+\r
// mfCSetBlock work flags\r
#define CSETBLOCK_UID 0x01\r
#define CSETBLOCK_WUPC 0x02\r
#define CSETBLOCK_SINGLE_OPER 0x1F\r
#define CSETBLOCK_MAGIC_1B 0x40\r
\r
+typedef struct {\r
+ uint64_t Key[2];\r
+ int foundKey[2];\r
+} sector_t;\r
+\r
extern char logHexFileName[FILE_PATH_SIZE];\r
\r
extern int mfDarkside(uint64_t *key);\r
extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *ResultKeys, bool calibrate);\r
extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);\r
+extern int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector);\r
\r
extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
projects / proxmark3-svn / commitdiff