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

index 629c8feb4a48c93b0d1431032d3261ebe6f8da60..67277b5904aa3c0f58cf1974808944a869d9cf79 100644 (file)

--- a/client/mifarehost.c

+++ b/client/mifarehost.c

@@ -228,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

@@ -511,36 +540,12 @@ int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID) {

return 0;\r

}\r

-int mfCIdentify()\r

-{\r

- UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};\r

+int mfCIdentify() {\r

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

SendCommand(&c);\r

-\r

UsbCommand resp;\r

WaitForResponse(CMD_ACK,&resp);\r

- // iso14a_card_select_t card;\r

- // memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));\r

-\r

- // uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS, 3: proprietary Anticollision\r

-\r

- // if(select_status != 0) {\r

- // uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0\r

- // c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;\r

- // c.arg[1] = 2;\r

- // c.arg[2] = 0;\r

- // memcpy(c.d.asBytes, rats, 2);\r

- // SendCommand(&c);\r

- // WaitForResponse(CMD_ACK,&resp);\r

- // }\r

-\r

- c.cmd = CMD_MIFARE_CIDENT;\r

- c.arg[0] = 0;\r

- c.arg[1] = 0;\r

- c.arg[2] = 0;\r

- SendCommand(&c);\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

@@ -548,13 +553,6 @@ int mfCIdentify()

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

}\r

- // disconnect\r

- c.cmd = CMD_READER_ISO_14443a;\r

- c.arg[0] = 0;\r

- c.arg[1] = 0;\r

- c.arg[2] = 0;\r

- SendCommand(&c);\r

-\r

return (int) isGeneration;\r

}\r

@@ -905,3 +903,72 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,

return 0;\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