#include <pthread.h>\r
#include "mifarehost.h"\r
#include "proxmark3.h"\r
-#include "radixsort.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
- // return 0;\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
- //return (*(int64_t*)b > *(int64_t*)a) - (*(int64_t*)b < *(int64_t*)a);\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
+ 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
- // 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
+/* return \r
((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000))\r
-\r
((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000))\r
;\r
- // return \r
- // ((*(int64_t*)b & 0x00ff000000ff0000) > (*(int64_t*)a & 0x00ff000000ff0000))\r
- // -\r
- // ((*(int64_t*)b & 0x00ff000000ff0000) < (*(int64_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
+ statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid); \r
\r
- for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; ++p1);\r
+ for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++);\r
\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
if (resp.arg[0]) return resp.arg[0];\r
\r
memcpy(&uid, resp.d.asBytes, 4);\r
- \r
- for (i = 0; i < 2; ++i) {\r
+ \r
+ for (i = 0; i < 2; i++) {\r
statelists[i].blockNo = resp.arg[2] & 0xff;\r
statelists[i].keyType = (resp.arg[2] >> 8) & 0xff;\r
statelists[i].uid = uid;\r
// create and run worker threads\r
for (i = 0; i < 2; i++)\r
pthread_create(thread_id + i, NULL, nested_worker_thread, &statelists[i]);\r
- \r
+\r
// wait for threads to terminate:\r
for (i = 0; i < 2; i++)\r
pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);\r
\r
-\r
// the first 16 Bits of the cryptostate already contain part of our key.\r
// Create the intersection of the two lists based on these 16 Bits and\r
// roll back the cryptostate\r
p1 = p3 = statelists[0].head.slhead; \r
p2 = p4 = statelists[1].head.slhead;\r
+\r
while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {\r
if (Compare16Bits(p1, p2) == 0) {\r
+ \r
struct Crypto1State savestate, *savep = &savestate;\r
savestate = *p1;\r
while(Compare16Bits(p1, savep) == 0 && p1 <= statelists[0].tail.sltail) {\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
- // clock_t t1 = clock();\r
- //radixSort(statelists[0].head.keyhead, statelists[0].len);\r
- //radixSort(statelists[1].head.keyhead, statelists[1].len);\r
- // t1 = clock() - t1; \r
- // PrintAndLog("radixsort, ticks %.0f", (float)t1);\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
- for (i = 0; i < statelists[0].len; i++) {\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
+ 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
+ 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, 1, resultKey, &key64)) {\r
- free(statelists[0].head.slhead);\r
- free(statelists[1].head.slhead);\r
- PrintAndLog("UID: %08x target block:%3u key type: %c -- Found key [%012"llx"]", uid, (uint16_t)resp.arg[2] & 0xff, (resp.arg[2] >> 8)?'B':'A', key64);\r
- return -5;\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
- PrintAndLog("UID: %08x target block:%3u key type: %c", uid, (uint16_t)resp.arg[2] & 0xff, (resp.arg[2] >> 8)?'B':'A'); \r
+ \r
+out:\r
+ PrintAndLog("UID: %08x target block:%3u key type: %c",\r
+ uid,\r
+ (uint16_t)resp.arg[2] & 0xff,\r
+ (resp.arg[2] >> 8) ? 'B' : 'A'\r
+ ); \r
+\r
free(statelists[0].head.slhead);\r
free(statelists[1].head.slhead);\r
return -4;\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
projects / proxmark3-svn / blobdiff