\r
struct Crypto1State *traceCrypto1 = NULL;\r
struct Crypto1State *revstate = NULL;\r
-\r
uint64_t key = 0;\r
uint32_t ks2 = 0;\r
uint32_t ks3 = 0;\r
\r
-uint32_t uid = 0; // serial number\r
+uint32_t cuid = 0; // serial number\r
uint32_t nt =0; // tag challenge\r
uint32_t nr_enc =0; // encrypted reader challenge\r
uint32_t ar_enc =0; // encrypted reader response\r
return ((blockN & 0x03) == 0x03);\r
}\r
\r
-int loadTraceCard(uint8_t *tuid) {\r
+int loadTraceCard(uint8_t *tuid, uint8_t uidlen) {\r
FILE * f;\r
char buf[64] = {0x00};\r
uint8_t buf8[64] = {0x00};\r
saveTraceCard();\r
\r
memset(traceCard, 0x00, 4096);\r
- memcpy(traceCard, tuid + 3, 4);\r
+ memcpy(traceCard, tuid, uidlen);\r
\r
- FillFileNameByUID(traceFileName, tuid, ".eml", 7);\r
+ FillFileNameByUID(traceFileName, tuid, ".eml", uidlen);\r
\r
f = fopen(traceFileName, "r");\r
if (!f) return 1;\r
\r
memset(buf, 0, sizeof(buf));\r
if (fgets(buf, sizeof(buf), f) == NULL) {\r
- PrintAndLog("File reading error.");\r
+ PrintAndLog("No trace file found or reading error.");\r
fclose(f);\r
return 2;\r
}\r
return 2;\r
}\r
for (i = 0; i < 32; i += 2)\r
- sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
+ sscanf(&buf[i], "%02X", (unsigned int *)&buf8[i / 2]);\r
\r
memcpy(traceCard + blockNum * 16, buf8, 16);\r
\r
blockNum++;\r
}\r
fclose(f);\r
-\r
return 0;\r
}\r
\r
int saveTraceCard(void) {\r
- FILE * f;\r
\r
if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r
\r
+ FILE * f;\r
f = fopen(traceFileName, "w+");\r
if ( !f ) return 1;\r
\r
for (int i = 0; i < 64; i++) { // blocks\r
for (int j = 0; j < 16; j++) // bytes\r
- fprintf(f, "%02x", *(traceCard + i * 16 + j)); \r
+ fprintf(f, "%02X", *(traceCard + i * 16 + j)); \r
fprintf(f,"\n");\r
}\r
+ fflush(f);\r
fclose(f);\r
return 0;\r
}\r
\r
-int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {\r
+int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {\r
\r
if (traceCrypto1) \r
crypto1_destroy(traceCrypto1);\r
traceCrypto1 = NULL;\r
\r
if (wantSaveToEmlFile) \r
- loadTraceCard(tuid);\r
+ loadTraceCard(tuid, uidlen);\r
\r
traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];\r
traceCard[5] = sak;\r
memcpy(&traceCard[6], atqa, 2);\r
traceCurBlock = 0;\r
- uid = bytes_to_num(tuid + 3, 4);\r
- \r
+ cuid = bytes_to_num(tuid+(uidlen-4), 4);\r
traceState = TRACE_IDLE;\r
-\r
return 0;\r
}\r
\r
}\r
\r
int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {\r
- \r
- uint8_t data[64];\r
- memset(data, 0x00, sizeof(data));\r
- \r
+\r
if (traceState == TRACE_ERROR) return 1;\r
- \r
+\r
if (len > 64) {\r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
\r
+ uint8_t data[64];\r
+ memset(data, 0x00, sizeof(data));\r
+ \r
memcpy(data, data_src, len);\r
+ \r
if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {\r
mf_crypto1_decrypt(traceCrypto1, data, len, 0);\r
- PrintAndLog("dec> %s", sprint_hex(data, len));\r
- AddLogHex(logHexFileName, "dec> ", data, len); \r
+ PrintAndLog("DEC| %s", sprint_hex(data, len));\r
+ AddLogHex(logHexFileName, "DEC| ", data, len); \r
}\r
\r
switch (traceState) {\r
case TRACE_IDLE: \r
// check packet crc16!\r
if ((len >= 4) && (!CheckCrc14443(CRC_14443_A, data, len))) {\r
- PrintAndLog("dec> CRC ERROR!!!");\r
- AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!"); \r
+ PrintAndLog("DEC| CRC ERROR!!!");\r
+ AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!"); \r
traceState = TRACE_ERROR; // do not decrypt the next commands\r
return 1;\r
}\r
traceState = TRACE_ERROR; // do not decrypt the next commands\r
return 0;\r
}\r
- \r
return 0;\r
- break;\r
- \r
case TRACE_READ_DATA: \r
if (len == 18) {\r
traceState = TRACE_IDLE;\r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
- break;\r
-\r
+ break;\r
case TRACE_WRITE_OK: \r
if ((len == 1) && (data[0] == 0x0a)) {\r
traceState = TRACE_WRITE_DATA;\r
-\r
return 0;\r
} else {\r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
- break;\r
-\r
+ break;\r
case TRACE_WRITE_DATA: \r
if (len == 18) {\r
traceState = TRACE_IDLE;\r
-\r
memcpy(traceCard + traceCurBlock * 16, data, 16);\r
if (wantSaveToEmlFile) saveTraceCard();\r
return 0;\r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
- break;\r
-\r
+ break;\r
case TRACE_AUTH1: \r
if (len == 4) {\r
traceState = TRACE_AUTH2;\r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
- break;\r
-\r
+ break;\r
case TRACE_AUTH2: \r
if (len == 8) {\r
traceState = TRACE_AUTH_OK;\r
-\r
nr_enc = bytes_to_num(data, 4);\r
ar_enc = bytes_to_num(data + 4, 4);\r
return 0;\r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
- break;\r
-\r
+ break;\r
case TRACE_AUTH_OK: \r
- if (len ==4) {\r
+ if (len == 4) {\r
traceState = TRACE_IDLE;\r
-\r
at_enc = bytes_to_num(data, 4);\r
\r
// decode key here)\r
lfsr_rollback_word(revstate, 0, 0);\r
lfsr_rollback_word(revstate, 0, 0);\r
lfsr_rollback_word(revstate, nr_enc, 1);\r
- lfsr_rollback_word(revstate, uid ^ nt, 0);\r
-\r
+ lfsr_rollback_word(revstate, cuid ^ nt, 0);\r
crypto1_get_lfsr(revstate, &key);\r
- printf("Key: %012"llx"\n",key);\r
- AddLogUint64(logHexFileName, "key: ", key); \r
+ PrintAndLog("Found Key: [%012"llx"]", key);\r
+ \r
+ //if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) )\r
+ AddLogUint64(logHexFileName, "Found Key: ", key); \r
\r
int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;\r
if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);\r
\r
- if (traceCurKey) {\r
+ if (traceCurKey)\r
num_to_bytes(key, 6, traceCard + blockShift + 10);\r
- } else {\r
+ else\r
num_to_bytes(key, 6, traceCard + blockShift);\r
- }\r
- if (wantSaveToEmlFile) saveTraceCard();\r
+ \r
+ if (wantSaveToEmlFile)\r
+ saveTraceCard();\r
\r
- if (traceCrypto1) {\r
+ if (traceCrypto1)\r
crypto1_destroy(traceCrypto1);\r
- }\r
\r
// set cryptosystem state\r
traceCrypto1 = lfsr_recovery64(ks2, ks3);\r
\r
-// nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt;\r
-\r
- /* traceCrypto1 = crypto1_create(key); // key in lfsr\r
- crypto1_word(traceCrypto1, nt ^ uid, 0);\r
- crypto1_word(traceCrypto1, ar, 1);\r
- crypto1_word(traceCrypto1, 0, 0);\r
- crypto1_word(traceCrypto1, 0, 0);*/\r
- \r
return 0;\r
} else {\r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
- break;\r
-\r
+ break;\r
default: \r
traceState = TRACE_ERROR;\r
return 1;\r
}\r
-\r
return 0;\r
}\r
\r
int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){\r
- /*\r
- uint32_t nt; // tag challenge\r
- uint32_t nr_enc; // encrypted reader challenge\r
- uint32_t ar_enc; // encrypted reader response\r
- uint32_t at_enc; // encrypted tag response\r
- */\r
+ PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data, len) );\r
struct Crypto1State *pcs = NULL;\r
- \r
ks2 = ar_enc ^ prng_successor(nt, 64);\r
ks3 = at_enc ^ prng_successor(nt, 96);\r
- \r
- PrintAndLog("Decrypting data with:");\r
- PrintAndLog(" nt: %08x",nt);\r
- PrintAndLog(" ar_enc: %08x",ar_enc);\r
- PrintAndLog(" at_enc: %08x",at_enc);\r
- PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data,len) );\r
-\r
pcs = lfsr_recovery64(ks2, ks3);\r
mf_crypto1_decrypt(pcs, data, len, FALSE);\r
- PrintAndLog("Decrypted data: [%s]", sprint_hex(data,len) );\r
+ PrintAndLog("Decrypted data: [%s]", sprint_hex(data, len) );\r
crypto1_destroy(pcs);\r
return 0;\r
}\r
projects / proxmark3-svn / blobdiff