#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
// wrapper function for multi-threaded lfsr_recovery32\r
void* nested_worker_thread(void *arg)\r
{\r
+ clock_t t1 = clock();\r
struct Crypto1State *p1;\r
StateList_t *statelist = arg;\r
\r
statelist->tail.sltail = --p1;\r
qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);\r
\r
+ \r
+ t1 = clock() - t1;\r
+ printf("lfsr_recovery32 takes %.0f ticks \n", (float)t1);\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
+ clock_t t1 = clock();\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
+ t1 = clock() - t1;\r
+ printf("Check candidates takes %.0f ticks \n", (float)t1); \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