X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6b10e3294ef52fb6c8e32118c16e477230ed4142..8b89fcae134bd1a106738a99481e9a5dea47e2c4:/client/mifarehost.c diff --git a/client/mifarehost.c b/client/mifarehost.c index 3ab1b568..1939b92b 100644 --- a/client/mifarehost.c +++ b/client/mifarehost.c @@ -15,6 +15,7 @@ #include "mifarehost.h" #include "proxmark3.h" //#include "radixsort.h" +#include // MIFARE int compar_int(const void * a, const void * b) { @@ -22,8 +23,8 @@ int compar_int(const void * a, const void * b) { //return (*(uint64_t*)b - *(uint64_t*)a); // better: - if (*(uint64_t*)b < *(uint64_t*)a) return -1; if (*(uint64_t*)b > *(uint64_t*)a) return 1; + if (*(uint64_t*)b < *(uint64_t*)a) return -1; return 0; //return (*(uint64_t*)b > *(uint64_t*)a) - (*(uint64_t*)b < *(uint64_t*)a); @@ -31,12 +32,11 @@ int compar_int(const void * a, const void * b) { // Compare 16 Bits out of cryptostate int Compare16Bits(const void * a, const void * b) { - - if ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000)) return -1; if ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) return 1; + if ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000)) return -1; return 0; - /*return +/* return ((*(uint64_t*)b & 0x00ff000000ff0000) > (*(uint64_t*)a & 0x00ff000000ff0000)) - ((*(uint64_t*)b & 0x00ff000000ff0000) < (*(uint64_t*)a & 0x00ff000000ff0000)) @@ -68,15 +68,13 @@ void* nested_worker_thread(void *arg) { struct Crypto1State *p1; StateList_t *statelist = arg; - - statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid); + statelist->head.slhead = lfsr_recovery32(statelist->ks1, statelist->nt ^ statelist->uid); for (p1 = statelist->head.slhead; *(uint64_t *)p1 != 0; p1++); statelist->len = p1 - statelist->head.slhead; statelist->tail.sltail = --p1; qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits); - return statelist->head.slhead; } @@ -97,8 +95,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo // error during nested if (resp.arg[0]) return resp.arg[0]; -// memcpy(&uid, resp.d.asBytes, 4); - uid = bytes_to_num(resp.d.asBytes, 4); + memcpy(&uid, resp.d.asBytes, 4); for (i = 0; i < 2; i++) { statelists[i].blockNo = resp.arg[2] & 0xff; @@ -149,7 +146,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo while (Compare16Bits(p1, p2) == 1) p2++; } } - + p3->even = 0; p3->odd = 0; p4->even = 0; p4->odd = 0; statelists[0].len = p3 - statelists[0].head.slhead; @@ -161,10 +158,11 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo // intersection of both lists. Create the intersection: qsort(statelists[0].head.keyhead, statelists[0].len, sizeof(uint64_t), compar_int); qsort(statelists[1].head.keyhead, statelists[1].len, sizeof(uint64_t), compar_int); - + uint64_t *p5, *p6, *p7; p5 = p7 = statelists[0].head.keyhead; p6 = statelists[1].head.keyhead; + while (p5 <= statelists[0].tail.keytail && p6 <= statelists[1].tail.keytail) { if (compar_int(p5, p6) == 0) { *p7++ = *p5++; @@ -178,17 +176,15 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo statelists[0].len = p7 - statelists[0].head.keyhead; statelists[0].tail.keytail = --p7; + uint32_t numOfCandidates = statelists[0].len; + if ( numOfCandidates == 0 ) goto out; + memset(resultKey, 0, 6); uint64_t key64 = 0; // The list may still contain several key candidates. Test each of them with mfCheckKeys // uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt; - - uint32_t numOfCandidates = statelists[0].len; - if ( numOfCandidates == 0 ) goto out; - - uint8_t *keyBlock = malloc(numOfCandidates*6); - if (keyBlock == NULL) return -6; + uint8_t keyBlock[USB_CMD_DATA_SIZE] = {0x00}; for (i = 0; i < numOfCandidates; ++i){ crypto1_get_lfsr(statelists[0].head.slhead + i, &key64); @@ -198,7 +194,6 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo if (!mfCheckKeys(statelists[0].blockNo, statelists[0].keyType, false, numOfCandidates, keyBlock, &key64)) { free(statelists[0].head.slhead); free(statelists[1].head.slhead); - free(keyBlock); num_to_bytes(key64, 6, resultKey); PrintAndLog("UID: %08x target block:%3u key type: %c -- Found key [%012"llx"]", @@ -209,10 +204,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo ); return -5; } - + out: PrintAndLog("UID: %08x target block:%3u key type: %c", - uid, + uid, (uint16_t)resp.arg[2] & 0xff, (resp.arg[2] >> 8) ? 'B' : 'A' ); @@ -223,14 +218,13 @@ out: } int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key){ - *key = 0; UsbCommand c = {CMD_MIFARE_CHKKEYS, { (blockNo | (keyType<<8)), clear_trace, keycnt}}; memcpy(c.d.asBytes, keyBlock, 6 * keycnt); clearCommandBuffer(); SendCommand(&c); UsbCommand resp; - if (!WaitForResponseTimeout(CMD_ACK,&resp, 3000)) return 1; + if (!WaitForResponseTimeout(CMD_ACK, &resp, 2500)) return 1; if ((resp.arg[0] & 0xff) != 0x01) return 2; *key = bytes_to_num(resp.d.asBytes, 6); return 0; @@ -255,14 +249,12 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) { int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) { UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}}; memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); - clearCommandBuffer(); SendCommand(&c); return 0; } // "MAGIC" CARD - int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) { uint8_t params = MAGIC_SINGLE; @@ -335,6 +327,7 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) { } // SNIFFER +// [iceman] so many global variables.... // constants static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00}; @@ -348,14 +341,12 @@ static uint8_t traceCurBlock = 0; static uint8_t traceCurKey = 0; struct Crypto1State *traceCrypto1 = NULL; - struct Crypto1State *revstate = NULL; - uint64_t key = 0; uint32_t ks2 = 0; uint32_t ks3 = 0; -uint32_t uid = 0; // serial number +uint32_t cuid = 0; // serial number uint32_t nt =0; // tag challenge uint32_t nr_enc =0; // encrypted reader challenge uint32_t ar_enc =0; // encrypted reader response @@ -376,7 +367,7 @@ int isBlockTrailer(int blockN) { return ((blockN & 0x03) == 0x03); } -int loadTraceCard(uint8_t *tuid) { +int loadTraceCard(uint8_t *tuid, uint8_t uidlen) { FILE * f; char buf[64] = {0x00}; uint8_t buf8[64] = {0x00}; @@ -386,9 +377,9 @@ int loadTraceCard(uint8_t *tuid) { saveTraceCard(); memset(traceCard, 0x00, 4096); - memcpy(traceCard, tuid + 3, 4); + memcpy(traceCard, tuid, uidlen); - FillFileNameByUID(traceFileName, tuid, ".eml", 7); + FillFileNameByUID(traceFileName, tuid, ".eml", uidlen); f = fopen(traceFileName, "r"); if (!f) return 1; @@ -399,7 +390,7 @@ int loadTraceCard(uint8_t *tuid) { memset(buf, 0, sizeof(buf)); if (fgets(buf, sizeof(buf), f) == NULL) { - PrintAndLog("File reading error."); + PrintAndLog("No trace file found or reading error."); fclose(f); return 2; } @@ -411,35 +402,35 @@ int loadTraceCard(uint8_t *tuid) { return 2; } for (i = 0; i < 32; i += 2) - sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]); + sscanf(&buf[i], "%02X", (unsigned int *)&buf8[i / 2]); memcpy(traceCard + blockNum * 16, buf8, 16); blockNum++; } fclose(f); - return 0; } int saveTraceCard(void) { - FILE * f; if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0; + FILE * f; f = fopen(traceFileName, "w+"); if ( !f ) return 1; for (int i = 0; i < 64; i++) { // blocks for (int j = 0; j < 16; j++) // bytes - fprintf(f, "%02x", *(traceCard + i * 16 + j)); + fprintf(f, "%02X", *(traceCard + i * 16 + j)); fprintf(f,"\n"); } + fflush(f); fclose(f); return 0; } -int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) { +int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) { if (traceCrypto1) crypto1_destroy(traceCrypto1); @@ -447,16 +438,14 @@ int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFil traceCrypto1 = NULL; if (wantSaveToEmlFile) - loadTraceCard(tuid); + loadTraceCard(tuid, uidlen); traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3]; traceCard[5] = sak; memcpy(&traceCard[6], atqa, 2); traceCurBlock = 0; - uid = bytes_to_num(tuid + 3, 4); - + cuid = bytes_to_num(tuid+(uidlen-4), 4); traceState = TRACE_IDLE; - return 0; } @@ -479,35 +468,37 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i } int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { - - uint8_t data[64]; if (traceState == TRACE_ERROR) return 1; - + if (len > 64) { traceState = TRACE_ERROR; return 1; } + uint8_t data[64]; + memset(data, 0x00, sizeof(data)); + memcpy(data, data_src, len); + if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) { mf_crypto1_decrypt(traceCrypto1, data, len, 0); - PrintAndLog("dec> %s", sprint_hex(data, len)); - AddLogHex(logHexFileName, "dec> ", data, len); + PrintAndLog("DEC| %s", sprint_hex(data, len)); + AddLogHex(logHexFileName, "DEC| ", data, len); } switch (traceState) { case TRACE_IDLE: // check packet crc16! if ((len >= 4) && (!CheckCrc14443(CRC_14443_A, data, len))) { - PrintAndLog("dec> CRC ERROR!!!"); - AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!"); + PrintAndLog("DEC| CRC ERROR!!!"); + AddLogLine(logHexFileName, "DEC| ", "CRC ERROR!!!"); traceState = TRACE_ERROR; // do not decrypt the next commands return 1; } // AUTHENTICATION - if ((len == 4) && ((data[0] == 0x60) || (data[0] == 0x61))) { + if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) { traceState = TRACE_AUTH1; traceCurBlock = data[1]; traceCurKey = data[0] == 60 ? 1:0; @@ -515,28 +506,25 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { } // READ - if ((len ==4) && ((data[0] == 0x30))) { + if ((len ==4) && ((data[0] == ISO14443A_CMD_READBLOCK))) { traceState = TRACE_READ_DATA; traceCurBlock = data[1]; return 0; } // WRITE - if ((len ==4) && ((data[0] == 0xA0))) { + if ((len ==4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) { traceState = TRACE_WRITE_OK; traceCurBlock = data[1]; return 0; } // HALT - if ((len ==4) && ((data[0] == 0x50) && (data[1] == 0x00))) { + if ((len ==4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) { traceState = TRACE_ERROR; // do not decrypt the next commands return 0; } - return 0; - break; - case TRACE_READ_DATA: if (len == 18) { traceState = TRACE_IDLE; @@ -552,23 +540,19 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { traceState = TRACE_ERROR; return 1; } - break; - + break; case TRACE_WRITE_OK: if ((len == 1) && (data[0] == 0x0a)) { traceState = TRACE_WRITE_DATA; - return 0; } else { traceState = TRACE_ERROR; return 1; } - break; - + break; case TRACE_WRITE_DATA: if (len == 18) { traceState = TRACE_IDLE; - memcpy(traceCard + traceCurBlock * 16, data, 16); if (wantSaveToEmlFile) saveTraceCard(); return 0; @@ -576,8 +560,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { traceState = TRACE_ERROR; return 1; } - break; - + break; case TRACE_AUTH1: if (len == 4) { traceState = TRACE_AUTH2; @@ -587,12 +570,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { traceState = TRACE_ERROR; return 1; } - break; - + break; case TRACE_AUTH2: if (len == 8) { traceState = TRACE_AUTH_OK; - nr_enc = bytes_to_num(data, 4); ar_enc = bytes_to_num(data + 4, 4); return 0; @@ -600,12 +581,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { traceState = TRACE_ERROR; return 1; } - break; - + break; case TRACE_AUTH_OK: - if (len ==4) { + if (len == 4) { traceState = TRACE_IDLE; - at_enc = bytes_to_num(data, 4); // decode key here) @@ -615,73 +594,51 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { lfsr_rollback_word(revstate, 0, 0); lfsr_rollback_word(revstate, 0, 0); lfsr_rollback_word(revstate, nr_enc, 1); - lfsr_rollback_word(revstate, uid ^ nt, 0); - + lfsr_rollback_word(revstate, cuid ^ nt, 0); crypto1_get_lfsr(revstate, &key); - printf("Key: %012"llx"\n",key); - AddLogUint64(logHexFileName, "key: ", key); + PrintAndLog("Found Key: [%012"llx"]", key); + + //if ( tryMfk64(cuid, nt, nr_enc, ar_enc, at_enc, &key) ) + AddLogUint64(logHexFileName, "Found Key: ", key); int blockShift = ((traceCurBlock & 0xFC) + 3) * 16; if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4); - if (traceCurKey) { + if (traceCurKey) num_to_bytes(key, 6, traceCard + blockShift + 10); - } else { + else num_to_bytes(key, 6, traceCard + blockShift); - } - if (wantSaveToEmlFile) saveTraceCard(); + + if (wantSaveToEmlFile) + saveTraceCard(); - if (traceCrypto1) { + if (traceCrypto1) crypto1_destroy(traceCrypto1); - } // set cryptosystem state traceCrypto1 = lfsr_recovery64(ks2, ks3); -// nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt; - - /* traceCrypto1 = crypto1_create(key); // key in lfsr - crypto1_word(traceCrypto1, nt ^ uid, 0); - crypto1_word(traceCrypto1, ar, 1); - crypto1_word(traceCrypto1, 0, 0); - crypto1_word(traceCrypto1, 0, 0);*/ - return 0; } else { traceState = TRACE_ERROR; return 1; } - break; - + break; default: traceState = TRACE_ERROR; return 1; } - return 0; } int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){ - /* - uint32_t nt; // tag challenge - uint32_t nr_enc; // encrypted reader challenge - uint32_t ar_enc; // encrypted reader response - uint32_t at_enc; // encrypted tag response - */ + PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data, len) ); struct Crypto1State *pcs = NULL; - ks2 = ar_enc ^ prng_successor(nt, 64); ks3 = at_enc ^ prng_successor(nt, 96); - - PrintAndLog("Decrypting data with:"); - PrintAndLog(" nt: %08x",nt); - PrintAndLog(" ar_enc: %08x",ar_enc); - PrintAndLog(" at_enc: %08x",at_enc); - PrintAndLog("\nEncrypted data: [%s]", sprint_hex(data,len) ); - pcs = lfsr_recovery64(ks2, ks3); mf_crypto1_decrypt(pcs, data, len, FALSE); - PrintAndLog("Decrypted data: [%s]", sprint_hex(data,len) ); + PrintAndLog("Decrypted data: [%s]", sprint_hex(data, len) ); crypto1_destroy(pcs); return 0; }