#include "mifarehost.h"\r
#include "proxmark3.h"\r
//#include "radixsort.h"\r
+#include <time.h>\r
\r
// MIFARE\r
int compar_int(const void * a, const void * b) {\r
//return (*(uint64_t*)b - *(uint64_t*)a);\r
\r
// better:\r
- /*if (*(uint64_t*)b < *(uint64_t*)a) return -1;\r
if (*(uint64_t*)b > *(uint64_t*)a) return 1;\r
+ if (*(uint64_t*)b < *(uint64_t*)a) return -1; \r
return 0;\r
-*/\r
- return (*(uint64_t*)b > *(uint64_t*)a) - (*(uint64_t*)b < *(uint64_t*)a);\r
+\r
+ //return (*(uint64_t*)b > *(uint64_t*)a) - (*(uint64_t*)b < *(uint64_t*)a);\r
}\r
\r
// Compare 16 Bits out of cryptostate\r
int Compare16Bits(const void * a, const void * b) {\r
-\r
-/*\r
- if ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000)) return -1;\r
if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1; \r
+ if ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000)) return -1;\r
return 0;\r
-*/\r
- return \r
+\r
+/* return \r
((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000))\r
-\r
((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000))\r
;\r
+*/\r
}\r
\r
typedef \r
{\r
struct Crypto1State *p1;\r
StateList_t *statelist = arg;\r
-\r
statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid); \r
\r
for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++);\r
statelist->len = p1 - statelist->head.slhead;\r
statelist->tail.sltail = --p1;\r
qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);\r
- \r
return statelist->head.slhead;\r
}\r
\r
while (Compare16Bits(p1, p2) == 1) p2++;\r
}\r
}\r
- \r
+\r
p3->even = 0; p3->odd = 0;\r
p4->even = 0; p4->odd = 0;\r
statelists[0].len = p3 - statelists[0].head.slhead;\r
// intersection of both lists. Create the intersection:\r
qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compar_int);\r
qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compar_int);\r
-\r
+ \r
uint64_t *p5, *p6, *p7;\r
p5 = p7 = statelists[0].head.keyhead; \r
p6 = statelists[1].head.keyhead;\r
+ \r
while (p5 <= statelists[0].tail.keytail && p6 <= statelists[1].tail.keytail) {\r
if (compar_int(p5, p6) == 0) {\r
*p7++ = *p5++;\r
statelists[0].len = p7 - statelists[0].head.keyhead;\r
statelists[0].tail.keytail = --p7;\r
\r
+ uint32_t numOfCandidates = statelists[0].len;\r
+ if ( numOfCandidates == 0 ) goto out;\r
+ \r
memset(resultKey, 0, 6);\r
uint64_t key64 = 0;\r
\r
// The list may still contain several key candidates. Test each of them with mfCheckKeys\r
// uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r
+ uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};\r
\r
- uint32_t numOfCandidates = statelists[0].len;\r
- if ( numOfCandidates > 0 ) {\r
-\r
- uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00};\r
+ for (i = 0; i < numOfCandidates; ++i){\r
+ crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
+ num_to_bytes(key64, 6, keyBlock + i * 6);\r
+ }\r
\r
- for (i = 0; i < numOfCandidates; ++i){\r
- crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
- num_to_bytes(key64, 6, keyBlock + i * 6);\r
- }\r
+ if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, numOfCandidates, keyBlock, &key64)) { \r
+ free(statelists[0].head.slhead);\r
+ free(statelists[1].head.slhead);\r
+ num_to_bytes(key64, 6, resultKey);\r
\r
- if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, numOfCandidates, keyBlock, &key64)) { \r
- free(statelists[0].head.slhead);\r
- free(statelists[1].head.slhead);\r
- num_to_bytes(key64, 6, resultKey);\r
-\r
- PrintAndLog("UID: %08x target block:%3u key type: %c -- Found key [%012"llx"]",\r
- uid,\r
- (uint16_t)resp.arg[2] & 0xff,\r
- (resp.arg[2] >> 8) ? 'B' : 'A',\r
- key64\r
- );\r
- return -5;\r
- }\r
- \r
+ PrintAndLog("UID: %08x target block:%3u key type: %c -- Found key [%012"llx"]",\r
+ uid,\r
+ (uint16_t)resp.arg[2] & 0xff,\r
+ (resp.arg[2] >> 8) ? 'B' : 'A',\r
+ key64\r
+ );\r
+ return -5;\r
}\r
+ \r
+out:\r
PrintAndLog("UID: %08x target block:%3u key type: %c",\r
uid,\r
(uint16_t)resp.arg[2] & 0xff,\r
}\r
\r
int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){\r
-\r
*key = 0;\r
UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType<<8)), clear_trace, keycnt}};\r
memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
clearCommandBuffer();\r
SendCommand(&c);\r
UsbCommand resp;\r
- if (!WaitForResponseTimeout(CMD_ACK,&resp, 3000)) return 1;\r
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1;\r
if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
*key = bytes_to_num(resp.d.asBytes, 6);\r
return 0;\r
int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {\r
UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};\r
memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); \r
-\r
clearCommandBuffer();\r
SendCommand(&c);\r
return 0;\r
}\r
\r
// "MAGIC" CARD\r
-\r
int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {\r
\r
uint8_t params = MAGIC_SINGLE;\r
}\r
\r
// SNIFFER\r
+// [iceman] so many global variables....\r
\r
// constants\r
static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00};\r
static uint8_t traceCurKey = 0;\r
\r
struct Crypto1State *traceCrypto1 = NULL;\r
-\r
struct Crypto1State *revstate = NULL;\r
\r
uint64_t key = 0;\r
int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {\r
\r
uint8_t data[64];\r
-\r
+ memset(data, 0x00, sizeof(data));\r
+ \r
if (traceState == TRACE_ERROR) return 1;\r
\r
if (len > 64) {\r
}\r
\r
// AUTHENTICATION\r
- if ((len == 4) && ((data[0] == 0x60) || (data[0] == 0x61))) {\r
+ if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {\r
traceState = TRACE_AUTH1;\r
traceCurBlock = data[1];\r
traceCurKey = data[0] == 60 ? 1:0;\r
}\r
\r
// READ\r
- if ((len ==4) && ((data[0] == 0x30))) {\r
+ if ((len ==4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {\r
traceState = TRACE_READ_DATA;\r
traceCurBlock = data[1];\r
return 0;\r
}\r
\r
// WRITE\r
- if ((len ==4) && ((data[0] == 0xA0))) {\r
+ if ((len ==4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {\r
traceState = TRACE_WRITE_OK;\r
traceCurBlock = data[1];\r
return 0;\r
}\r
\r
// HALT\r
- if ((len ==4) && ((data[0] == 0x50) && (data[1] == 0x00))) {\r
+ if ((len ==4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {\r
traceState = TRACE_ERROR; // do not decrypt the next commands\r
return 0;\r
}\r
projects / proxmark3-svn / blobdiff