}\r
} \r
printf("\n");\r
+ // error\r
+ if (isOK != 1) return 1;\r
\r
- // par == 0, and -4\r
- if (isOK == -4 && par_list == 0) {\r
+ if (par_list == 0 && ks_list != 0) {\r
// this special attack when parities is zero, uses checkkeys. Which now with block/keytype option also needs. \r
// but it uses 0|1 instead of 0x60|0x61...\r
if (nonce2key_ex(blockNo, keytype - 0x60 , uid, nt, nr, ks_list, &r_key) ){\r
- PrintAndLog("Key not found (lfsr_common_prefix list is null)."); \r
- PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r
+ PrintAndLog("Trying again with a different reader nonce...");\r
c.arg[0] = false;\r
goto start;\r
} else {\r
goto END;\r
}\r
}\r
- \r
- // error\r
- if (isOK != 1) return 1;\r
- \r
+\r
// execute original function from util nonce2key\r
if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r
isOK = 2;\r
uint64_t key64 = 0;\r
int res = mfCheckKeys(blockNo, keytype - 0x60 , false, 1, keyblock, &key64);\r
if ( res > 0 ) {\r
- PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. Starting over darkside attack", r_key); \r
+ PrintAndLog("Candidate Key found (%012"llx") - Test authentication failed. [%d] Restarting darkside attack", r_key, res); \r
goto start;\r
}\r
PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
slow ? "Yes" : "No",\r
tests);\r
\r
- int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests);\r
+ uint64_t foundkey = 0;\r
+ int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key ? trgkey : NULL, nonce_file_read, nonce_file_write, slow, tests, &foundkey);\r
\r
if (isOK) {\r
switch (isOK) {\r
#define ATTACK_KEY_COUNT 8\r
sector *k_sector = NULL;\r
uint8_t k_sectorsCount = 16;\r
-void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths) {\r
+void readerAttack(nonces_t data[], bool setEmulatorMem, bool verbose) {\r
\r
// initialize storage for found keys\r
if (k_sector == NULL)\r
\r
printf("enter reader attack\n");\r
for (uint8_t i = 0; i < ATTACK_KEY_COUNT; ++i) {\r
- if (data[i].ar2 > 0) {\r
+ \r
+ // if no-collected data \r
+ if (data[i].ar2 == 0) continue;\r
\r
- // We can probably skip this, mfkey32v2 is more reliable.\r
+ // We can probably skip this, mfkey32v2 is more reliable.\r
#ifdef HFMF_TRYMFK32\r
- if (tryMfk32(data[i], &key)) {\r
- PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
- , (data[i].keytype) ? "B" : "A"\r
- , data[i].sector\r
- , key\r
- );\r
-\r
- k_sector[i].Key[data[i].keytype] = key;\r
- k_sector[i].foundKey[data[i].keytype] = TRUE;\r
- \r
- //set emulator memory for keys\r
- if (setEmulatorMem) {\r
- uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
- num_to_bytes( k_sector[i].Key[0], 6, memBlock);\r
- num_to_bytes( k_sector[i].Key[1], 6, memBlock+10);\r
- PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
- , ((data[i].sector)*4) + 3\r
- , sprint_hex( memBlock, sizeof(memBlock))\r
- );\r
- mfEmlSetMem( memBlock, ((data[i].sector)*4) + 3, 1);\r
- }\r
- continue;\r
+ if (tryMfk32(data[i], &key, verbose)) {\r
+ PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
+ , (data[i].keytype) ? "B" : "A"\r
+ , data[i].sector\r
+ , key\r
+ );\r
+\r
+ k_sector[i].Key[data[i].keytype] = key;\r
+ k_sector[i].foundKey[data[i].keytype] = TRUE;\r
+ \r
+ //set emulator memory for keys\r
+ if (setEmulatorMem) {\r
+ uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
+ num_to_bytes( k_sector[i].Key[0], 6, memBlock);\r
+ num_to_bytes( k_sector[i].Key[1], 6, memBlock+10);\r
+ PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
+ , ((data[i].sector)*4) + 3\r
+ , sprint_hex( memBlock, sizeof(memBlock))\r
+ );\r
+ mfEmlSetMem( memBlock, ((data[i].sector)*4) + 3, 1);\r
}\r
+ continue;\r
+ }\r
#endif\r
- //moebius attack \r
- if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, showMaths)) {\r
- uint8_t sectorNum = data[i+ATTACK_KEY_COUNT].sector;\r
- uint8_t keyType = data[i+ATTACK_KEY_COUNT].keytype;\r
-\r
- PrintAndLog("M-Found Key%s for sector %02d: [%012"llx"]"\r
- , keyType ? "B" : "A"\r
- , sectorNum\r
- , key\r
- );\r
-\r
- k_sector[sectorNum].Key[keyType] = key;\r
- k_sector[sectorNum].foundKey[keyType] = TRUE;\r
-\r
- //set emulator memory for keys\r
- if (setEmulatorMem) {\r
- uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
- num_to_bytes( k_sector[sectorNum].Key[0], 6, memBlock);\r
- num_to_bytes( k_sector[sectorNum].Key[1], 6, memBlock+10);\r
- PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
- , (sectorNum*4) + 3\r
- , sprint_hex( memBlock, sizeof(memBlock))\r
- );\r
- mfEmlSetMem( memBlock, (sectorNum*4) + 3, 1);\r
- }\r
- continue;\r
+ \r
+ //moebius attack \r
+ if (tryMfk32_moebius(data[i+ATTACK_KEY_COUNT], &key, verbose)) {\r
+ uint8_t sectorNum = data[i+ATTACK_KEY_COUNT].sector;\r
+ uint8_t keyType = data[i+ATTACK_KEY_COUNT].keytype;\r
+\r
+ PrintAndLog("Found Key%s for sector %02d: [%012"llx"]"\r
+ , keyType ? "B" : "A"\r
+ , sectorNum\r
+ , key\r
+ );\r
+\r
+ k_sector[sectorNum].Key[keyType] = key;\r
+ k_sector[sectorNum].foundKey[keyType] = TRUE;\r
+\r
+ //set emulator memory for keys\r
+ if (setEmulatorMem) {\r
+ uint8_t memBlock[16] = {0,0,0,0,0,0, 0xff, 0x0F, 0x80, 0x69, 0,0,0,0,0,0};\r
+ num_to_bytes( k_sector[sectorNum].Key[0], 6, memBlock);\r
+ num_to_bytes( k_sector[sectorNum].Key[1], 6, memBlock+10);\r
+ //iceman, guessing this will not work so well for 4K tags.\r
+ PrintAndLog("Setting Emulator Memory Block %02d: [%s]"\r
+ , (sectorNum*4) + 3\r
+ , sprint_hex( memBlock, sizeof(memBlock))\r
+ );\r
+ mfEmlSetMem( memBlock, (sectorNum*4) + 3, 1);\r
}\r
-\r
+ continue;\r
}\r
}\r
}\r
bool errors = false;\r
\r
// If set to true, we should show our workings when doing NR_AR_ATTACK.\r
- bool showMaths = false;\r
+ bool verbose = false;\r
\r
while(param_getchar(Cmd, cmdp) != 0x00) {\r
switch(param_getchar(Cmd, cmdp)) {\r
break;\r
case 'v':\r
case 'V':\r
- showMaths = true;\r
+ verbose = true;\r
cmdp++;\r
break;\r
case 'x':\r
if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
\r
memcpy( data, resp.d.asBytes, sizeof(data) ); \r
- readerAttack(data, setEmulatorMem, showMaths);\r
+ readerAttack(data, setEmulatorMem, verbose);\r
}\r
\r
if (k_sector != NULL) {\r
projects / proxmark3-svn / blobdiff