cvs.zerfleddert.de Git - proxmark3-svn/blobdiff

index 6b5e3ba2312df8e4a9742ff45a09a08b21e5411a..67277b5904aa3c0f58cf1974808944a869d9cf79 100644 (file)

--- a/client/mifarehost.c

+++ b/client/mifarehost.c

@@ -11,7 +11,7 @@

#include "mifarehost.h"\r

#include <stdio.h>\r

-#include <stdlib.h> \r

+#include <stdlib.h>\r

#include <string.h>\r

#include <pthread.h>\r

@@ -23,6 +23,8 @@

#include "util.h"\r

#include "iso14443crc.h"\r

+#include "mifare.h"\r

+\r

// mifare tracer flags used in mfTraceDecode()\r

#define TRACE_IDLE 0x00\r

#define TRACE_AUTH1 0x01\r

@@ -52,7 +54,7 @@ static uint32_t intersection(uint64_t *list1, uint64_t *list2)

return 0;\r

}\r

uint64_t *p1, *p2, *p3;\r

- p1 = p3 = list1; \r

+ p1 = p3 = list1;\r

p2 = list2;\r

while ( *p1 != -1 && *p2 != -1 ) {\r

@@ -98,7 +100,7 @@ static uint32_t nonce2key(uint32_t uid, uint32_t nt, uint32_t nr, uint64_t par_i

}\r

keylist = (uint64_t*)states;\r

- \r

+\r

for (i = 0; keylist[i]; i++) {\r

lfsr_rollback_word(states+i, uid^nt, 0);\r

crypto1_get_lfsr(states+i, &key_recovered);\r

@@ -128,16 +130,16 @@ int mfDarkside(uint64_t *key)

printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r

printf("-------------------------------------------------------------------------\n");\r

- \r

+\r

while (true) {\r

clearCommandBuffer();\r

SendCommand(&c);\r

- \r

+\r

//flush queue\r

while (ukbhit()) {\r

int c = getchar(); (void) c;\r

}\r

- \r

+\r

// wait cycle\r

while (true) {\r

printf(".");\r

@@ -146,7 +148,7 @@ int mfDarkside(uint64_t *key)

return -5;\r

break;\r

}\r

- \r

+\r

UsbCommand resp;\r

if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {\r

isOK = resp.arg[0];\r

@@ -160,7 +162,7 @@ int mfDarkside(uint64_t *key)

nr = bytes_to_num(resp.d.asBytes + 24, 4);\r

break;\r

}\r

- } \r

+ }\r

if (par_list == 0 && c.arg[0] == true) {\r

PrintAndLog("Parity is all zero. Most likely this card sends NACK on every failed authentication.");\r

@@ -171,7 +173,7 @@ int mfDarkside(uint64_t *key)

keycount = nonce2key(uid, nt, nr, par_list, ks_list, &keylist);\r

if (keycount == 0) {\r

- PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt); \r

+ PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);\r

PrintAndLog("This is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r

continue;\r

}\r

@@ -188,7 +190,7 @@ int mfDarkside(uint64_t *key)

PrintAndLog("Found %u possible keys. Trying to authenticate with each of them ...\n", keycount);\r

} else {\r

PrintAndLog("Found a possible key. Trying to authenticate...\n");\r

- } \r

+ }\r

*key = -1;\r

uint8_t keyBlock[USB_CMD_DATA_SIZE];\r

@@ -205,8 +207,8 @@ int mfDarkside(uint64_t *key)

if (!mfCheckKeys(0, 0, false, size, keyBlock, key)) {\r

break;\r

}\r

- } \r

- \r

+ }\r

+\r

if (*key != -1) {\r

free(last_keylist);\r

free(keylist);\r

@@ -217,7 +219,7 @@ int mfDarkside(uint64_t *key)

last_keylist = keylist;\r

}\r

- \r

+\r

return 0;\r

}\r

@@ -226,17 +228,46 @@ int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t key

*key = -1;\r

- UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType&0xff)<<8)), clear_trace, keycnt}};\r

+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((blockNo & 0xff) | ((keyType & 0xff) << 8)), clear_trace, keycnt}}; \r

memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\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

}\r

+int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector){\r

+\r

+ uint8_t keyPtr = 0;\r

+\r

+ if (e_sector == NULL)\r

+ return -1;\r

+\r

+ UsbCommand c = {CMD_MIFARE_CHKKEYS, {((sectorCnt & 0xff) | ((keyType & 0xff) << 8)), (clear_trace | 0x02)|((timeout14a & 0xff) << 8), keycnt}}; \r

+ memcpy(c.d.asBytes, keyBlock, 6 * keycnt);\r

+ SendCommand(&c);\r

+\r

+ UsbCommand resp;\r

+ if (!WaitForResponseTimeoutW(CMD_ACK, &resp, MAX(3000, 1000 + 13 * sectorCnt * keycnt * (keyType == 2 ? 2 : 1)), false)) return 1; // timeout: 13 ms / fail auth\r

+ if ((resp.arg[0] & 0xff) != 0x01) return 2;\r

+ \r

+ bool foundAKey = false;\r

+ for(int sec = 0; sec < sectorCnt; sec++){\r

+ for(int keyAB = 0; keyAB < 2; keyAB++){\r

+ keyPtr = *(resp.d.asBytes + keyAB * 40 + sec);\r

+ if (keyPtr){\r

+ e_sector[sec].foundKey[keyAB] = true;\r

+ e_sector[sec].Key[keyAB] = bytes_to_num(keyBlock + (keyPtr - 1) * 6, 6);\r

+ foundAKey = true;\r

+ }\r

+ return foundAKey ? 0 : 3;\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

@@ -244,7 +275,7 @@ int Compare16Bits(const void * a, const void * b) {

else return -1;\r

}\r

-typedef \r

+typedef\r

struct {\r

union {\r

struct Crypto1State *slhead;\r

@@ -274,11 +305,11 @@ void* nested_worker_thread(void *arg)

statelist->len = p1 - statelist->head.slhead;\r

statelist->tail.sltail = --p1;\r

qsort(statelist->head.slhead, statelist->len, sizeof(uint64_t), Compare16Bits);\r

- \r

+\r

return statelist->head.slhead;\r

}\r

-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate) \r

+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *resultKey, bool calibrate)\r

{\r

uint16_t i;\r

uint32_t uid;\r

@@ -286,10 +317,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,

StateList_t statelists[2];\r

struct Crypto1State *p1, *p2, *p3, *p4;\r

- \r

+\r

// flush queue\r

WaitForResponseTimeout(CMD_ACK, NULL, 100);\r

- \r

+\r

UsbCommand c = {CMD_MIFARE_NESTED, {blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, calibrate}};\r

memcpy(c.d.asBytes, key, 6);\r

SendCommand(&c);\r

@@ -301,10 +332,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,

if (resp.arg[0]) {\r

return resp.arg[0]; // error during nested\r

}\r

- \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

+\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

@@ -312,16 +343,16 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,

memcpy(&statelists[i].nt, (void *)(resp.d.asBytes + 4 + i * 8 + 0), 4);\r

memcpy(&statelists[i].ks1, (void *)(resp.d.asBytes + 4 + i * 8 + 4), 4);\r

}\r

- \r

+\r

// calc keys\r

- \r

+\r

pthread_t thread_id[2];\r

- \r

+\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

+\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

@@ -331,7 +362,7 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,

// 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

+ p1 = p3 = statelists[0].head.slhead;\r

p2 = p4 = statelists[1].head.slhead;\r

while (p1 <= statelists[0].tail.sltail && p2 <= statelists[1].tail.sltail) {\r

if (Compare16Bits(p1, p2) == 0) {\r

@@ -382,10 +413,10 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo,

break;\r

}\r

- \r

+\r

free(statelists[0].head.slhead);\r

free(statelists[1].head.slhead);\r

- \r

+\r

return 0;\r

}\r

@@ -403,7 +434,7 @@ int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount) {

int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {\r

UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};\r

- memcpy(c.d.asBytes, data, blocksCount * 16); \r

+ memcpy(c.d.asBytes, data, blocksCount * 16);\r

SendCommand(&c);\r

return 0;\r

}\r

@@ -416,7 +447,7 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {

UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};\r

SendCommand(&c);\r

- UsbCommand resp;\r

+ UsbCommand resp;\r

if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

isOK = resp.arg[0] & 0xff;\r

memcpy(data, resp.d.asBytes, 16);\r

@@ -432,29 +463,54 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uin

uint8_t isOK = 0;\r

UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};\r

- memcpy(c.d.asBytes, data, 16); \r

+ memcpy(c.d.asBytes, data, 16);\r

SendCommand(&c);\r

- UsbCommand resp;\r

- if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {\r

isOK = resp.arg[0] & 0xff;\r

- if (uid != NULL) \r

+ if (uid != NULL)\r

memcpy(uid, resp.d.asBytes, 4);\r

- if (!isOK) \r

+ if (!isOK)\r

return 2;\r

} else {\r

PrintAndLog("Command execute timeout");\r

return 1;\r

}\r

+\r

return 0;\r

}\r

-int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe) {\r

+int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill) {\r

+ uint8_t isOK = 0;\r

+ uint8_t cmdParams = wantWipe + wantFill * 0x02 + gen1b * 0x04;\r

+ UsbCommand c = {CMD_MIFARE_CWIPE, {numSectors, cmdParams, 0}};\r

+ SendCommand(&c);\r

+\r

+ UsbCommand resp;\r

+ WaitForResponse(CMD_ACK,&resp);\r

+ isOK = resp.arg[0] & 0xff;\r

+ \r

+ return isOK;\r

+}\r

+\r

+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID) {\r

uint8_t oldblock0[16] = {0x00};\r

uint8_t block0[16] = {0x00};\r

+ int gen = 0, res;\r

- int old = mfCGetBlock(0, oldblock0, CSETBLOCK_SINGLE_OPER);\r

- if (old == 0) {\r

+ gen = mfCIdentify();\r

+\r

+ /* generation 1a magic card by default */\r

+ uint8_t cmdParams = CSETBLOCK_SINGLE_OPER;\r

+ if (gen == 2) {\r

+ /* generation 1b magic card */\r

+ cmdParams = CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B;\r

+ }\r

+ \r

+ res = mfCGetBlock(0, oldblock0, cmdParams);\r

+\r

+ if (res == 0) {\r

memcpy(block0, oldblock0, 16);\r

PrintAndLog("old block 0: %s", sprint_hex(block0,16));\r

} else {\r

@@ -463,20 +519,44 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool w

// fill in the new values\r

// UID\r

- memcpy(block0, uid, 4); \r

+ memcpy(block0, uid, 4);\r

// Mifare UID BCC\r

- block0[4] = block0[0]^block0[1]^block0[2]^block0[3];\r

+ block0[4] = block0[0] ^ block0[1] ^ block0[2] ^ block0[3];\r

// mifare classic SAK(byte 5) and ATQA(byte 6 and 7, reversed)\r

- if (sak!=NULL)\r

- block0[5]=sak[0];\r

- if (atqa!=NULL) {\r

- block0[6]=atqa[1];\r

- block0[7]=atqa[0];\r

- }\r

- PrintAndLog("new block 0: %s", sprint_hex(block0,16));\r

- return mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER);\r

+ if (sak != NULL)\r

+ block0[5] = sak[0];\r

+ if (atqa != NULL) {\r

+ block0[6] = atqa[1];\r

+ block0[7] = atqa[0];\r

+ }\r

+ PrintAndLog("new block 0: %s", sprint_hex(block0, 16));\r

+\r

+ res = mfCSetBlock(0, block0, oldUID, false, cmdParams);\r

+ if (res) {\r

+ PrintAndLog("Can't set block 0. Error: %d", res);\r

+ return res;\r

+ }\r

+ \r

+ return 0;\r

}\r

+int mfCIdentify() {\r

+ UsbCommand c = {CMD_MIFARE_CIDENT, {0, 0, 0}};\r

+ SendCommand(&c);\r

+ UsbCommand resp;\r

+ WaitForResponse(CMD_ACK,&resp);\r

+\r

+ uint8_t isGeneration = resp.arg[0] & 0xff;\r

+ switch( isGeneration ){\r

+ case 1: PrintAndLog("Chinese magic backdoor commands (GEN 1a) detected"); break;\r

+ case 2: PrintAndLog("Chinese magic backdoor command (GEN 1b) detected"); break;\r

+ default: PrintAndLog("No chinese magic backdoor command detected"); break;\r

+ }\r

+\r

+ return (int) isGeneration;\r

+}\r

+\r

// SNIFFER\r

// constants\r

@@ -508,7 +588,7 @@ int isTraceCardEmpty(void) {

}\r

int isBlockEmpty(int blockN) {\r

- for (int i = 0; i < 16; i++) \r

+ for (int i = 0; i < 16; i++)\r

if (traceCard[blockN * 16 + i] != 0) return 0;\r

return 1;\r

@@ -520,15 +600,15 @@ int isBlockTrailer(int blockN) {

int saveTraceCard(void) {\r

FILE * f;\r

- \r

+\r

if ((!strlen(traceFileName)) || (isTraceCardEmpty())) return 0;\r

- \r

+\r

f = fopen(traceFileName, "w+");\r

if ( !f ) return 1;\r

- \r

+\r

for (int i = 0; i < 64; i++) { // blocks\r

for (int j = 0; j < 16; j++) // bytes\r

- fprintf(f, "%02x", *(traceCard + i * 16 + j)); \r

+ fprintf(f, "%02x", *(traceCard + i * 16 + j));\r

fprintf(f,"\n");\r

}\r

fclose(f);\r

@@ -540,10 +620,10 @@ int loadTraceCard(uint8_t *tuid) {

char buf[64] = {0x00};\r

uint8_t buf8[64] = {0x00};\r

int i, blockNum;\r

- \r

- if (!isTraceCardEmpty()) \r

+\r

+ if (!isTraceCardEmpty())\r

saveTraceCard();\r

- \r

+\r

memset(traceCard, 0x00, 4096);\r

memcpy(traceCard, tuid + 3, 4);\r

@@ -551,11 +631,11 @@ int loadTraceCard(uint8_t *tuid) {

f = fopen(traceFileName, "r");\r

if (!f) return 1;\r

- \r

+\r

blockNum = 0;\r

- \r

+\r

while(!feof(f)){\r

- \r

+\r

memset(buf, 0, sizeof(buf));\r

if (fgets(buf, sizeof(buf), f) == NULL) {\r

PrintAndLog("File reading error.");\r

@@ -583,20 +663,20 @@ int loadTraceCard(uint8_t *tuid) {

int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile) {\r

- if (traceCrypto1) \r

+ if (traceCrypto1)\r

crypto1_destroy(traceCrypto1);\r

traceCrypto1 = NULL;\r

- if (wantSaveToEmlFile) \r

+ if (wantSaveToEmlFile)\r

loadTraceCard(tuid);\r

- \r

+\r

traceCard[4] = traceCard[0] ^ traceCard[1] ^ traceCard[2] ^ traceCard[3];\r

traceCard[5] = sak;\r

memcpy(&traceCard[6], atqa, 2);\r

traceCurBlock = 0;\r

uid = bytes_to_num(tuid + 3, 4);\r

- \r

+\r

traceState = TRACE_IDLE;\r

return 0;\r

@@ -605,7 +685,7 @@ int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFil

void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted){\r

uint8_t bt = 0;\r

int i;\r

- \r

+\r

if (len != 1) {\r

for (i = 0; i < len; i++)\r

data[i] = crypto1_byte(pcs, 0x00, isEncrypted) ^ data[i];\r

@@ -613,7 +693,7 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i

bt = 0;\r

for (i = 0; i < 4; i++)\r

bt |= (crypto1_bit(pcs, 0, isEncrypted) ^ BIT(data[0], i)) << i;\r

- \r

+\r

data[0] = bt;\r

}\r

return;\r

@@ -628,24 +708,24 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

traceState = TRACE_ERROR;\r

return 1;\r

}\r

- \r

+\r

memcpy(data, data_src, len);\r

if ((traceCrypto1) && ((traceState == TRACE_IDLE) || (traceState > TRACE_AUTH_OK))) {\r

mf_crypto1_decrypt(traceCrypto1, data, len, 0);\r

PrintAndLog("dec> %s", sprint_hex(data, len));\r

- AddLogHex(logHexFileName, "dec> ", data, len); \r

+ AddLogHex(logHexFileName, "dec> ", data, len);\r

}\r

- \r

+\r

switch (traceState) {\r

- case TRACE_IDLE: \r

+ case TRACE_IDLE:\r

// check packet crc16!\r

if ((len >= 4) && (!CheckCrc14443(CRC_14443_A, data, len))) {\r

PrintAndLog("dec> CRC ERROR!!!");\r

- AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!"); \r

+ AddLogLine(logHexFileName, "dec> ", "CRC ERROR!!!");\r

traceState = TRACE_ERROR; // do not decrypt the next commands\r

return 1;\r

}\r

- \r

+\r

// AUTHENTICATION\r

if ((len ==4) && ((data[0] == 0x60) || (data[0] == 0x61))) {\r

traceState = TRACE_AUTH1;\r

@@ -673,11 +753,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

traceState = TRACE_ERROR; // do not decrypt the next commands\r

return 0;\r

}\r

- \r

+\r

return 0;\r

break;\r

- \r

- case TRACE_READ_DATA: \r

+\r

+ case TRACE_READ_DATA:\r

if (len == 18) {\r

traceState = TRACE_IDLE;\r

@@ -694,7 +774,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

}\r

break;\r

- case TRACE_WRITE_OK: \r

+ case TRACE_WRITE_OK:\r

if ((len == 1) && (data[0] == 0x0a)) {\r

traceState = TRACE_WRITE_DATA;\r

@@ -705,7 +785,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

}\r

break;\r

- case TRACE_WRITE_DATA: \r

+ case TRACE_WRITE_DATA:\r

if (len == 18) {\r

traceState = TRACE_IDLE;\r

@@ -718,7 +798,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

}\r

break;\r

- case TRACE_AUTH1: \r

+ case TRACE_AUTH1:\r

if (len == 4) {\r

traceState = TRACE_AUTH2;\r

nt = bytes_to_num(data, 4);\r

@@ -729,7 +809,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

}\r

break;\r

- case TRACE_AUTH2: \r

+ case TRACE_AUTH2:\r

if (len == 8) {\r

traceState = TRACE_AUTH_OK;\r

@@ -742,12 +822,12 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

}\r

break;\r

- case TRACE_AUTH_OK: \r

+ case TRACE_AUTH_OK:\r

if (len ==4) {\r

traceState = TRACE_IDLE;\r

at_enc = bytes_to_num(data, 4);\r

- \r

+\r

// decode key here)\r

ks2 = ar_enc ^ prng_successor(nt, 64);\r

ks3 = at_enc ^ prng_successor(nt, 96);\r

@@ -759,11 +839,11 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

crypto1_get_lfsr(revstate, &lfsr);\r

printf("key> %x%x\n", (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), (unsigned int)(lfsr & 0xFFFFFFFF));\r

- AddLogUint64(logHexFileName, "key> ", lfsr); \r

- \r

+ AddLogUint64(logHexFileName, "key> ", lfsr);\r

+\r

int blockShift = ((traceCurBlock & 0xFC) + 3) * 16;\r

if (isBlockEmpty((traceCurBlock & 0xFC) + 3)) memcpy(traceCard + blockShift + 6, trailerAccessBytes, 4);\r

- \r

+\r

if (traceCurKey) {\r

num_to_bytes(lfsr, 6, traceCard + blockShift + 10);\r

} else {\r

@@ -774,10 +854,10 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

if (traceCrypto1) {\r

crypto1_destroy(traceCrypto1);\r

}\r

- \r

+\r

// set cryptosystem state\r

traceCrypto1 = lfsr_recovery64(ks2, ks3);\r

- \r

+\r

// nt = crypto1_word(traceCrypto1, nt ^ uid, 1) ^ nt;\r

/* traceCrypto1 = crypto1_create(lfsr); // key in lfsr\r

@@ -785,7 +865,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

crypto1_word(traceCrypto1, ar, 1);\r

crypto1_word(traceCrypto1, 0, 0);\r

crypto1_word(traceCrypto1, 0, 0);*/\r

- \r

+\r

return 0;\r

} else {\r

traceState = TRACE_ERROR;\r

@@ -793,7 +873,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

}\r

break;\r

- default: \r

+ default:\r

traceState = TRACE_ERROR;\r

return 1;\r

}\r

@@ -801,6 +881,8 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {

return 0;\r

}\r

+// DECODING\r

+\r

int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len){\r

/*\r

uint32_t nt; // tag challenge\r

@@ -820,3 +902,73 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,

crypto1_destroy(traceCrypto1);\r

return 0;\r

}\r

+\r

+/** validate_prng_nonce\r

+ * Determine if nonce is deterministic. ie: Suspectable to Darkside attack.\r

+ * returns\r

+ * true = weak prng\r

+ * false = hardend prng\r

+ */\r

+bool validate_prng_nonce(uint32_t nonce) {\r

+ uint16_t *dist = 0;\r

+ uint16_t x, i;\r

+\r

+ dist = malloc(2 << 16);\r

+ if(!dist)\r

+ return -1;\r

+\r

+ // init prng table:\r

+ for (x = i = 1; i; ++i) {\r

+ dist[(x & 0xff) << 8 | x >> 8] = i;\r

+ x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15;\r

+ }\r

+ \r

+ uint32_t res = (65535 - dist[nonce >> 16] + dist[nonce & 0xffff]) % 65535;\r

+ \r

+ free(dist); \r

+ return (res == 16);\r

+}\r

+\r

+/* Detect Tag Prng, \r

+* function performs a partial AUTH, where it tries to authenticate against block0, key A, but only collects tag nonce.\r

+* the tag nonce is check to see if it has a predictable PRNG.\r

+* @returns \r

+* TRUE if tag uses WEAK prng (ie Now the NACK bug also needs to be present for Darkside attack)\r

+* FALSE is tag uses HARDEND prng (ie hardnested attack possible, with known key)\r

+*/\r

+int DetectClassicPrng(void){\r

+\r

+ UsbCommand resp, respA; \r

+ uint8_t cmd[] = {0x60, 0x00}; // MIFARE_AUTH_KEYA\r

+ uint32_t flags = ISO14A_CONNECT | ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_RATS;\r

+ \r

+ UsbCommand c = {CMD_READER_ISO_14443a, {flags, sizeof(cmd), 0}};\r

+ memcpy(c.d.asBytes, cmd, sizeof(cmd));\r

+\r

+ clearCommandBuffer();\r

+ SendCommand(&c);\r

+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {\r

+ PrintAndLog("PRNG UID: Reply timeout.");\r

+ return -1;\r

+ }\r

+ \r

+ // if select tag failed.\r

+ if (resp.arg[0] == 0) {\r

+ PrintAndLog("PRNG error: selecting tag failed, can't detect prng.");\r

+ return -1;\r

+ }\r

+ \r

+ if (!WaitForResponseTimeout(CMD_ACK, &respA, 5000)) {\r

+ PrintAndLog("PRNG data: Reply timeout.");\r

+ return -1;\r

+ }\r

+\r

+ // check respA\r

+ if (respA.arg[0] != 4) {\r

+ PrintAndLog("PRNG data error: Wrong length: %d", respA.arg[0]);\r

+ return -1;\r

+ }\r

+\r

+ uint32_t nonce = bytes_to_num(respA.d.asBytes, respA.arg[0]);\r

+ return validate_prng_nonce(nonce);\r

+}\r