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

index 0469364c3f6cefe099db0297e771bea5b693add4..38ca934aa01687b542744965981e6eae886a6a1a 100644 (file)

--- a/armsrc/mifareutil.c

+++ b/armsrc/mifareutil.c

@@ -9,37 +9,44 @@

// Work with mifare cards.\r

//-----------------------------------------------------------------------------\r

// Work with mifare cards.\r

//-----------------------------------------------------------------------------\r

+#include "mifareutil.h"\r

+\r

+#include <string.h>\r

+#include <stdbool.h>\r

+\r

#include "proxmark3.h"\r

#include "apps.h"\r

#include "util.h"\r

#include "proxmark3.h"\r

#include "apps.h"\r

#include "util.h"\r

-#include "string.h"\r

-\r

+#include "parity.h"\r

#include "iso14443crc.h"\r

#include "iso14443a.h"\r

#include "iso14443crc.h"\r

#include "iso14443a.h"\r

-#include "crapto1.h"\r

-#include "mifareutil.h"\r

-#include "des.h"\r

+#include "crapto1/crapto1.h"\r

+#include "polarssl/des.h"\r

int MF_DBGLEVEL = MF_DBG_ALL;\r

// crypto1 helpers\r

int MF_DBGLEVEL = MF_DBG_ALL;\r

// crypto1 helpers\r

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

+void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out){\r

uint8_t bt = 0;\r

int i;\r

if (len != 1) {\r

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

uint8_t bt = 0;\r

int i;\r

if (len != 1) {\r

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

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

+ data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];\r

} else {\r

bt = 0;\r

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

} else {\r

bt = 0;\r

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

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

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

- data[0] = bt;\r

+ data_out[0] = bt;\r

}\r

return;\r

}\r

return;\r

}\r

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

+ mf_crypto1_decryptEx(pcs, data, len, data);\r

+}\r

+\r

void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {\r

uint8_t bt = 0;\r

int i;\r

void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {\r

uint8_t bt = 0;\r

int i;\r

@@ -50,7 +57,7 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u

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

if((i&0x0007) == 0) \r

par[i>>3] = 0;\r

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

if((i&0x0007) == 0) \r

par[i>>3] = 0;\r

- par[i>>3] |= (((filter(pcs->odd) ^ oddparity(bt)) & 0x01)<<(7-(i&0x0007)));\r

+ par[i>>3] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));\r

} \r

return;\r

}\r

} \r

return;\r

}\r

@@ -65,74 +72,25 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {

return bt;\r

}\r

return bt;\r

}\r

-// send commands\r

-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r

-{\r

- return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, answer_parity, timing);\r

-}\r

-\r

-int mifare_sendcmd_short_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r

-{\r

- uint8_t dcmd[8];\r

- dcmd[0] = cmd;\r

- dcmd[1] = data[0];\r

- dcmd[2] = data[1];\r

- dcmd[3] = data[2];\r

- dcmd[4] = data[3];\r

- dcmd[5] = data[4];\r

- AppendCrc14443a(dcmd, 6);\r

- ReaderTransmit(dcmd, sizeof(dcmd), NULL);\r

- int len = ReaderReceive(answer, answer_parity);\r

- if(!len) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Authentication failed. Card timeout.");\r

- return 2;\r

- }\r

- return len;\r

-}\r

-\r

-int mifare_sendcmd_short_mfucauth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

+// send X byte basic commands\r

+int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r

{\r

- uint8_t dcmd[19];\r

- int len; \r

- dcmd[0] = cmd;\r

- memcpy(dcmd+1,data,16);\r

- AppendCrc14443a(dcmd, 17);\r

- \r

- ReaderTransmit(dcmd, sizeof(dcmd), timing);\r

- len = ReaderReceive(answer, answer_parity);\r

- if(!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");\r

- len = ReaderReceive(answer,answer_parity);\r

- }\r

- if(len==1) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("NAK - Authentication failed.");\r

- return 1;\r

- }\r

- return len;\r

-}\r

-\r

-int mifare_sendcmd_short_mfuev1auth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

-{\r

- uint8_t dcmd[7];\r

- int len; \r

- dcmd[0] = cmd;\r

- memcpy(dcmd+1,data,4);\r

- AppendCrc14443a(dcmd, 5);\r

- \r

+ uint8_t dcmd[data_size+3];\r

+ dcmd[0] = cmd;\r

+ memcpy(dcmd+1,data,data_size);\r

+ AppendCrc14443a(dcmd, data_size+1);\r

ReaderTransmit(dcmd, sizeof(dcmd), timing);\r

- len = ReaderReceive(answer, answer_parity);\r

+ int len = ReaderReceive(answer, answer_parity);\r

if(!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");\r

- len = ReaderReceive(answer,answer_parity);\r

- }\r

- if(len==1) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("NAK - Authentication failed.");\r

- return 1;\r

- }\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("%02X Cmd failed. Card timeout.", cmd);\r

+ len = ReaderReceive(answer,answer_parity);\r

+ //return 0;\r

+ }\r

return len;\r

}\r

return len;\r

}\r

-int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

+// send 2 byte commands\r

+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

{\r

uint8_t dcmd[4], ecmd[4];\r

uint16_t pos, res;\r

{\r

uint8_t dcmd[4], ecmd[4];\r

uint16_t pos, res;\r

@@ -148,7 +106,7 @@ int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm

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

{\r

ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r

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

{\r

ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r

- par[0] |= (((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) << (7-pos));\r

+ par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r

} \r

ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r

} \r

ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r

@@ -242,7 +200,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN

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

{\r

mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r

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

{\r

mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r

- par[0] |= (((filter(pcs->odd) ^ oddparity(nr[pos])) & 0x01) << (7-pos));\r

+ par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));\r

} \r

// Skip 32 bits in pseudo random generator\r

} \r

// Skip 32 bits in pseudo random generator\r

@@ -253,7 +211,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN

{\r

nt = prng_successor(nt,8);\r

mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r

{\r

nt = prng_successor(nt,8);\r

mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r

- par[0] |= (((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) << (7-pos));\r

+ par[0] |= (((filter(pcs->odd) ^ oddparity8(nt)) & 0x01) << (7-pos));\r

} \r

// Transmit reader nonce and reader answer\r

} \r

// Transmit reader nonce and reader answer\r

@@ -318,25 +276,27 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){

uint8_t key[4] = {0x00};\r

memcpy(key, keybytes, 4);\r

uint8_t key[4] = {0x00};\r

memcpy(key, keybytes, 4);\r

- Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r

- len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r

+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r

+ Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r

+ len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);\r

+ //len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r

if (len != 4) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r

if (len != 4) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);\r

- OnError(1);\r

- return 1;\r

+ return 0;\r

}\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r

Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);\r

memcpy(pack, resp, 4);\r

}\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r

Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);\r

memcpy(pack, resp, 4);\r

- return 0;\r

+ return 1;\r

}\r

int mifare_ultra_auth(uint8_t *keybytes){\r

/// 3des2k\r

}\r

int mifare_ultra_auth(uint8_t *keybytes){\r

/// 3des2k\r

+ des3_context ctx = { 0x00 };\r

uint8_t random_a[8] = {1,1,1,1,1,1,1,1};\r

uint8_t random_b[8] = {0x00};\r

uint8_t enc_random_b[8] = {0x00};\r

uint8_t random_a[8] = {1,1,1,1,1,1,1,1};\r

uint8_t random_b[8] = {0x00};\r

uint8_t enc_random_b[8] = {0x00};\r

@@ -353,15 +313,23 @@ int mifare_ultra_auth(uint8_t *keybytes){

len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, resp, respPar ,NULL);\r

if (len != 11) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r

len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, resp, respPar ,NULL);\r

if (len != 11) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r

- OnError(1);\r

- return 1;\r

+ return 0;\r

}\r

// tag nonce.\r

memcpy(enc_random_b,resp+1,8);\r

// decrypt nonce.\r

}\r

// tag nonce.\r

memcpy(enc_random_b,resp+1,8);\r

// decrypt nonce.\r

- tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r

+ // tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r

+ des3_set2key_dec(&ctx, key);\r

+ des3_crypt_cbc(&ctx // des3_context\r

+ , DES_DECRYPT // int mode\r

+ , sizeof(random_b) // length\r

+ , IV // iv[8]\r

+ , enc_random_b // input\r

+ , random_b // output\r

+ );\r

+\r

rol(random_b,8);\r

memcpy(rnd_ab ,random_a,8);\r

memcpy(rnd_ab+8,random_b,8);\r

rol(random_b,8);\r

memcpy(rnd_ab ,random_a,8);\r

memcpy(rnd_ab+8,random_b,8);\r

@@ -381,13 +349,21 @@ int mifare_ultra_auth(uint8_t *keybytes){

}\r

// encrypt out, in, length, key, iv\r

}\r

// encrypt out, in, length, key, iv\r

- tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r

-\r

- len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);\r

+ //tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r

+ des3_set2key_enc(&ctx, key);\r

+ des3_crypt_cbc(&ctx // des3_context\r

+ , DES_ENCRYPT // int mode\r

+ , sizeof(rnd_ab) // length\r

+ , enc_random_b // iv[8]\r

+ , rnd_ab // input\r

+ , rnd_ab // output\r

+ );\r

+\r

+ //len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);\r

+ len = mifare_sendcmd(0xAF, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);\r

if (len != 11) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r

if (len != 11) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);\r

- OnError(1);\r

- return 1;\r

+ return 0;\r

}\r

uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };\r

}\r

uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };\r

@@ -395,10 +371,18 @@ int mifare_ultra_auth(uint8_t *keybytes){

memcpy(enc_resp, resp+1, 8);\r

// decrypt out, in, length, key, iv \r

memcpy(enc_resp, resp+1, 8);\r

// decrypt out, in, length, key, iv \r

- tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r

+ // tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r

+ des3_set2key_dec(&ctx, key);\r

+ des3_crypt_cbc(&ctx // des3_context\r

+ , DES_DECRYPT // int mode\r

+ , 8 // length\r

+ , enc_random_b // iv[8]\r

+ , enc_resp // input\r

+ , resp_random_a // output\r

+ );\r

if ( memcmp(resp_random_a, random_a, 8) != 0 ) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");\r

if ( memcmp(resp_random_a, random_a, 8) != 0 ) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");\r

- return 1;\r

+ return 0;\r

}\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

}\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

@@ -418,7 +402,7 @@ int mifare_ultra_auth(uint8_t *keybytes){

resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],\r

resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);\r

}\r

resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],\r

resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);\r

}\r

- return 0;\r

+ return 1;\r

}\r

int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)\r

}\r

int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)\r

@@ -428,6 +412,7 @@ int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)

uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

+\r

len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

if (len == 1) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r

len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

if (len == 1) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r

@@ -476,7 +461,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl

for (pos = 0; pos < 18; pos++)\r

{\r

d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r

for (pos = 0; pos < 18; pos++)\r

{\r

d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r

- par[pos>>3] |= (((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));\r

+ par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));\r

} \r

ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r

} \r

ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r

@@ -496,7 +481,8 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl

return 0;\r

}\r

return 0;\r

}\r

-int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) \r

+/* // command not needed, but left for future testing\r

+int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) \r

{\r

uint16_t len;\r

uint8_t par[3] = {0}; // enough for 18 parity bits\r

{\r

uint16_t len;\r

uint8_t par[3] = {0}; // enough for 18 parity bits\r

@@ -504,7 +490,6 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)

uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

- // command MIFARE_CLASSIC_WRITEBLOCK\r

len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

if ((len != 1) || (receivedAnswer[0] != 0x0A)) { // 0x0a - ACK\r

len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

if ((len != 1) || (receivedAnswer[0] != 0x0A)) { // 0x0a - ACK\r

@@ -527,20 +512,21 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)

}\r

return 0;\r

}\r

return 0;\r

}\r

+*/\r

-int mifare_ultra_special_writeblock(uint8_t blockNo, uint8_t *blockData)\r

+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)\r

{\r

uint16_t len;\r

{\r

uint16_t len;\r

- uint8_t d_block[8] = {0x00};\r

+ uint8_t d_block[5] = {0x00};\r

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

// command MIFARE_CLASSIC_WRITEBLOCK\r

d_block[0]= blockNo;\r

memcpy(d_block+1,blockData,4);\r

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

// command MIFARE_CLASSIC_WRITEBLOCK\r

d_block[0]= blockNo;\r

memcpy(d_block+1,blockData,4);\r

- AppendCrc14443a(d_block, 6);\r

+ //AppendCrc14443a(d_block, 6);\r

- len = mifare_sendcmd_short_special(NULL, 1, 0xA2, d_block, receivedAnswer, receivedAnswerPar, NULL);\r

+ len = mifare_sendcmd(0xA2, d_block, sizeof(d_block), receivedAnswer, receivedAnswerPar, NULL);\r

if (receivedAnswer[0] != 0x0A) { // 0x0a - ACK\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

if (receivedAnswer[0] != 0x0A) { // 0x0a - ACK\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

@@ -601,6 +587,19 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)

}\r

+uint8_t SectorTrailer(uint8_t blockNo)\r

+{\r

+ if (blockNo < 32*4) {\r

+ return (blockNo | 0x03);\r

+ } else {\r

+ return (blockNo | 0x0f);\r

+ }\r

+}\r

+\r

+bool IsSectorTrailer(uint8_t blockNo)\r

+{\r

+ return (blockNo == SectorTrailer(blockNo));\r

+}\r

// work with emulator memory\r

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

// work with emulator memory\r

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

@@ -731,8 +730,8 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){

int len;\r

// load key, keynumber\r

uint8_t data[2]={0x0a, 0x00};\r

int len;\r

// load key, keynumber\r

uint8_t data[2]={0x0a, 0x00};\r

- uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

- uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+ uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);\r

if (len == 1) {\r

len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);\r

if (len == 1) {\r

@@ -784,3 +783,125 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){

}\r

return 1;\r

}\r

return 1;\r

}\r

+\r

+//-----------------------------------------------------------------------------\r

+// MIFARE check keys\r

+//\r

+//-----------------------------------------------------------------------------\r

+// one key check\r

+int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel) {\r

+\r

+ struct Crypto1State mpcs = {0, 0};\r

+ struct Crypto1State *pcs;\r

+ pcs = &mpcs;\r

+\r

+ // Iceman: use piwi's faster nonce collecting part in hardnested.\r

+ if (*cascade_levels == 0) { // need a full select cycle to get the uid first\r

+ iso14a_card_select_t card_info;\r

+ if(!iso14443a_select_card(uid, &card_info, cuid, true, 0, true)) {\r

+ if (debugLevel >= 1) Dbprintf("ChkKeys: Can't select card");\r

+ return 1;\r

+ }\r

+ switch (card_info.uidlen) {\r

+ case 4 : *cascade_levels = 1; break;\r

+ case 7 : *cascade_levels = 2; break;\r

+ case 10: *cascade_levels = 3; break;\r

+ default: break;\r

+ }\r

+ } else { // no need for anticollision. We can directly select the card\r

+ if(!iso14443a_select_card(uid, NULL, NULL, false, *cascade_levels, true)) {\r

+ if (debugLevel >= 1) Dbprintf("ChkKeys: Can't select card (UID) lvl=%d", *cascade_levels);\r

+ return 1;\r

+ }\r

+ \r

+ if(mifare_classic_auth(pcs, *cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r

+// SpinDelayUs(AUTHENTICATION_TIMEOUT); // it not needs because mifare_classic_auth have timeout from iso14a_set_timeout()\r

+ return 2;\r

+ } else {\r

+/* // let it be here. it like halt command, but maybe it will work in some strange cases\r

+ uint8_t dummy_answer = 0;\r

+ ReaderTransmit(&dummy_answer, 1, NULL);\r

+ int timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT; \r

+ // wait for the card to become ready again\r

+ while(GetCountSspClk() < timeout) {};\r

+*/\r

+ // it needs after success authentication\r

+ mifare_classic_halt(pcs, *cuid);\r

+ }\r

+ \r

+ return 0;\r

+}\r

+\r

+// multi key check\r

+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel) {\r

+ uint8_t uid[10];\r

+ uint32_t cuid = 0;\r

+ uint8_t cascade_levels = 0;\r

+ uint64_t ui64Key = 0;\r

+\r

+ int retryCount = 0;\r

+ for (uint8_t i = 0; i < keyCount; i++) {\r

+\r

+ // Allow button press / usb cmd to interrupt device\r

+ if (BUTTON_PRESS() && !usb_poll_validate_length()) { \r

+ Dbprintf("ChkKeys: Cancel operation. Exit...");\r

+ return -2;\r

+ }\r

+\r

+ ui64Key = bytes_to_num(keys + i * 6, 6);\r

+ int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, ui64Key, blockNo, keyType, debugLevel);\r

+ \r

+ // can't select\r

+ if (res == 1) {\r

+ retryCount++;\r

+ if (retryCount >= 5) {\r

+ Dbprintf("ChkKeys: block=%d key=%d. Can't select. Exit...", blockNo, keyType);\r

+ return -1;\r

+ }\r

+ --i; // try the same key once again\r

+\r

+ SpinDelay(20);\r

+// Dbprintf("ChkKeys: block=%d key=%d. Try the same key once again...", blockNo, keyType);\r

+ continue;\r

+ }\r

+ \r

+ // can't authenticate\r

+ if (res == 2) {\r

+ retryCount = 0;\r

+ continue; // can't auth. wrong key.\r

+ }\r

+\r

+ return i + 1;\r

+ }\r

+ \r

+ return 0;\r

+}\r

+\r

+// multisector multikey check\r

+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint8_t debugLevel, TKeyIndex *keyIndex) {\r

+ int res = 0;\r

+ \r

+// int clk = GetCountSspClk();\r

+\r

+ for(int sc = 0; sc < SectorCount; sc++){\r

+ WDT_HIT();\r

+\r

+ int keyAB = keyType;\r

+ do {\r

+ res = MifareChkBlockKeys(keys, keyCount, FirstBlockOfSector(sc), keyAB & 0x01, debugLevel);\r

+ if (res < 0){\r

+ return res;\r

+ }\r

+ if (res > 0){\r

+ (*keyIndex)[keyAB & 0x01][sc] = res;\r

+ }\r

+ } while(--keyAB > 0);\r

+ }\r

+ \r

+// Dbprintf("%d %d", GetCountSspClk() - clk, (GetCountSspClk() - clk)/(SectorCount*keyCount*(keyType==2?2:1)));\r

+ \r

+ return 0;\r

+}\r

+\r