#include <pthread.h>\r
#include "mifarehost.h"\r
#include "proxmark3.h"\r
-\r
-#define llx PRIx64\r
+//#include "radixsort.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 0;\r
- else if (*(uint64_t*)b > *(uint64_t*)a) return 1;\r
- else 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
+ //return (*(int64_t*)b > *(int64_t*)a) - (*(int64_t*)b < *(int64_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 0;\r
- else if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1;\r
- else return -1;\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
+ ((*(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
typedef \r
StateList_t *statelist = arg;\r
\r
statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid);\r
- for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++);\r
+ \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
uint16_t i;\r
uint32_t uid;\r
UsbCommand resp;\r
-\r
StateList_t statelists[2];\r
struct Crypto1State *p1, *p2, *p3, *p4;\r
\r
- // flush queue\r
- WaitForResponseTimeout(CMD_ACK,NULL,100);\r
- \r
UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};\r
memcpy(c.d.asBytes, key, 6);\r
+ clearCommandBuffer();\r
SendCommand(&c);\r
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;\r
\r
- if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r
- return -1;\r
- }\r
-\r
- if (resp.arg[0]) {\r
- return resp.arg[0]; // error during nested\r
- }\r
- \r
+ // error during nested\r
+ if (resp.arg[0]) return resp.arg[0];\r
+ \r
memcpy(&uid, resp.d.asBytes, 4);\r
- PrintAndLog("uid:%08x trgbl=%d trgkey=%x", uid, (uint16_t)resp.arg[2] & 0xff, (uint16_t)resp.arg[2] >> 8);\r
\r
- for (i = 0; i < 2; i++) {\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
memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r
}\r
\r
- // calc keys\r
- \r
+ // calc keys \r
pthread_t thread_id[2];\r
\r
// create and run worker threads\r
- for (i = 0; i < 2; i++) {\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
+ for (i = 0; i < 2; i++)\r
pthread_join(thread_id[i], (void*)&statelists[i].head.slhead);\r
- }\r
\r
\r
// the first 16 Bits of the cryptostate already contain part of our key.\r
while (Compare16Bits(p1, p2) == 1) p2++;\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
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
uint64_t *p5, *p6, *p7;\r
p5 = p7 = statelists[0].head.keyhead; \r
p6 = statelists[1].head.keyhead;\r
}\r
}\r
statelists[0].len = p7 - statelists[0].head.keyhead;\r
- statelists[0].tail.keytail=--p7;\r
+ statelists[0].tail.keytail = --p7;\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
- uint8_t keyBlock[6];\r
- uint64_t key64;\r
+\r
crypto1_get_lfsr(statelists[0].head.slhead + i, &key64);\r
- num_to_bytes(key64, 6, keyBlock);\r
- key64 = 0;\r
- if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, 1, keyBlock, &key64)) {\r
- num_to_bytes(key64, 6, resultKey);\r
- break;\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
}\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
free(statelists[0].head.slhead);\r
- free(statelists[1].head.slhead); \r
- return 0;\r
+ free(statelists[1].head.slhead);\r
+ return -4;\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
-\r
- UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};\r
+ UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType<<8)), clear_trace, keycnt}};\r
memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r
- \r
clearCommandBuffer();\r
SendCommand(&c);\r
UsbCommand resp;\r
- if (!WaitForResponseTimeout(CMD_ACK,&resp,3000)) return 1;\r
+ if (!WaitForResponseTimeout(CMD_ACK,&resp, 3000)) return 1;\r
if ((resp.arg[0] & 0xff) != 0x01) return 2;\r
*key = bytes_to_num(resp.d.asBytes, 6);\r
return 0;\r
uint8_t params = MAGIC_SINGLE;\r
uint8_t block0[16];\r
memset(block0, 0x00, sizeof(block0));\r
- \r
\r
int old = mfCGetBlock(0, block0, params);\r
- if (old == 0) {\r
+ if (old == 0)\r
PrintAndLog("old block 0: %s", sprint_hex(block0, sizeof(block0)));\r
- } else {\r
- PrintAndLog("Couldn't get old data. Will write over the last bytes of Block 0.");\r
- }\r
+ else \r
+ PrintAndLog("Couldn't get old data. Will write over the last bytes of Block 0."); \r
\r
// fill in the new values\r
// UID\r
}\r
\r
int isBlockTrailer(int blockN) {\r
- return ((blockN & 0x03) == 0x03);\r
+ return ((blockN & 0x03) == 0x03);\r
}\r
\r
int loadTraceCard(uint8_t *tuid) {\r
for (i = 0; i < len; i++)\r
data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];\r
} else {\r
- bt = 0;\r
- for (i = 0; i < 4; i++)\r
- bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], i)) << i;\r
- \r
+ bt = 0; \r
+ bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 0)) << 0;\r
+ bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 1)) << 1;\r
+ bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 2)) << 2;\r
+ bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], 3)) << 3; \r
data[0] = bt;\r
}\r
return;\r
}\r
\r
-\r
int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {\r
+ \r
uint8_t data[64];\r
\r
if (traceState == TRACE_ERROR) return 1;\r
+ \r
if (len > 64) {\r
traceState = TRACE_ERROR;\r
return 1;\r
uint32_t ar_enc; // encrypted reader response\r
uint32_t at_enc; // encrypted tag response\r
*/\r
-\r
struct Crypto1State *pcs = NULL;\r
\r
ks2 = ar_enc ^ prng_successor(nt, 64);\r
projects / proxmark3-svn / blobdiff