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

// Work with mifare cards.\r

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

\r

// Work with mifare cards.\r

//-----------------------------------------------------------------------------\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 "crapto1/crapto1.h"\r

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

+#include "protocols.h"\r

\r

-int MF_DBGLEVEL = MF_DBG_ALL;\r

-\r

-// memory management\r

-uint8_t* get_bigbufptr_recvrespbuf(void) {\r

- return (((uint8_t *)BigBuf) + RECV_RESP_OFFSET); \r

-}\r

-uint8_t* get_bigbufptr_recvcmdbuf(void) {\r

- return (((uint8_t *)BigBuf) + RECV_CMD_OFFSET); \r

-}\r

-uint8_t* get_bigbufptr_emlcardmem(void) {\r

- return (((uint8_t *)BigBuf) + CARD_MEMORY_OFFSET);\r

-}\r

+int MF_DBGLEVEL = MF_DBG_INFO;\r

\r

// crypto1 helpers\r

\r

// crypto1 helpers\r

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

- uint8_t bt = 0;\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

- \r

+\r

if (len != 1) {\r

for (i = 0; i < len; 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

- \r

- data[0] = bt;\r

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

+\r

+ data_out[0] = bt;\r

}\r

return;\r

}\r

\r

}\r

return;\r

}\r

\r

-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {\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_encryptEx(struct Crypto1State *pcs, uint8_t *data, uint8_t *in, uint16_t len, uint8_t *par) {\r

uint8_t bt = 0;\r

int i;\r

par[0] = 0;\r

uint8_t bt = 0;\r

int i;\r

par[0] = 0;\r

- \r

+\r

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

bt = data[i];\r

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

bt = data[i];\r

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

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

+ data[i] = crypto1_byte(pcs, in==NULL?0x00:in[i], 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

- } \r

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

+ }\r

return;\r

}\r

\r

return;\r

}\r

\r

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

+ mf_crypto1_encryptEx(pcs, data, NULL, len, par);\r

+}\r

+\r

uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {\r

uint8_t bt = 0;\r

int i;\r

\r

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

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

uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {\r

uint8_t bt = 0;\r

int i;\r

\r

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

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

- \r

+\r

return bt;\r

}\r

\r

return bt;\r

}\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);

-}

-

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

-{

- uint8_t dcmd[8];

- dcmd[0] = cmd;

- dcmd[1] = data[0];

- dcmd[2] = data[1];

- dcmd[3] = data[2];

- dcmd[4] = data[3];

- dcmd[5] = data[4];

- AppendCrc14443a(dcmd, 6);

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

- int len = ReaderReceive(answer, answer_parity);

- if(!len) {

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

- return 2;

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

+ 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

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

+ if(!len) {\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

\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

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

- }

- return len;

-}

-

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

-{

- uint8_t dcmd[4], ecmd[4];

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

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

uint16_t pos, res;\r

- uint8_t par[1]; // 1 Byte parity is enough here\r

+ uint8_t par[1]; // 1 Byte parity is enough here\r

dcmd[0] = cmd;\r

dcmd[1] = data;\r

AppendCrc14443a(dcmd, 2);\r

dcmd[0] = cmd;\r

dcmd[1] = data;\r

AppendCrc14443a(dcmd, 2);\r

- \r

+\r

memcpy(ecmd, dcmd, sizeof(dcmd));\r

- \r

+\r

if (crypted) {\r

par[0] = 0;\r

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

{\r

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

if (crypted) {\r

par[0] = 0;\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

- } \r

-\r

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

+ }\r

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

-\r

} else {\r

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

}\r

\r

int len = ReaderReceive(answer, par);\r

} else {\r

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

}\r

\r

int len = ReaderReceive(answer, par);\r

- \r

+\r

if (answer_parity) *answer_parity = par[0];\r

- \r

+\r

if (crypted == CRYPT_ALL) {\r

if (len == 1) {\r

res = 0;\r

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

res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], pos)) << pos;\r

if (crypted == CRYPT_ALL) {\r

if (len == 1) {\r

res = 0;\r

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

res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], pos)) << pos;\r

- \r

+\r

answer[0] = res;\r

- \r

+\r

} else {\r

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

{\r

} else {\r

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

{\r

}\r

- \r

+\r

return len;\r

}\r

\r

return len;\r

}\r

\r

+\r

// mifare classic commands\r

-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) \r

-{\r

- return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);\r

+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *auth_timeout) {\r

+\r

+ return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL, auth_timeout);\r

}\r

\r

}\r

\r

-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) \r

-{\r

- // variables\r

- int len; \r

+\r

+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing, uint32_t *auth_timeout) {\r

+\r

+ int len;\r

uint32_t pos;\r

- uint8_t tmp4[4];\r

uint8_t par[1] = {0x00};\r

byte_t nr[4];\r

uint32_t nt, ntpp; // Supplied tag nonce\r

uint8_t par[1] = {0x00};\r

byte_t nr[4];\r

uint32_t nt, ntpp; // Supplied tag nonce\r

- \r

+\r

uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };\r

- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

- \r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+\r

// Transmit MIFARE_CLASSIC_AUTH\r

- len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);\r

- if (MF_DBGLEVEL >= 4) Dbprintf("rand tag nonce len: %x", len); \r

+ len = mifare_sendcmd_short(pcs, isNested, keyType & 0x01 ? MIFARE_AUTH_KEYB : MIFARE_AUTH_KEYA, blockNo, receivedAnswer, receivedAnswerPar, timing);\r

+ if (MF_DBGLEVEL >= 4) Dbprintf("rand tag nonce len: %x", len);\r

if (len != 4) return 1;\r

- \r

+\r

// "random" reader nonce:\r

nr[0] = 0x55;\r

nr[1] = 0x41;\r

nr[2] = 0x49;\r

// "random" reader nonce:\r

nr[0] = 0x55;\r

nr[1] = 0x41;\r

nr[2] = 0x49;\r

- nr[3] = 0x92; \r

- \r

+ nr[3] = 0x92;\r

+\r

// Save the tag nonce (nt)\r

nt = bytes_to_num(receivedAnswer, 4);\r

\r

// Save the tag nonce (nt)\r

nt = bytes_to_num(receivedAnswer, 4);\r

\r

crypto1_create(pcs, ui64Key);\r

\r

if (isNested == AUTH_NESTED) {\r

crypto1_create(pcs, ui64Key);\r

\r

if (isNested == AUTH_NESTED) {\r

- // decrypt nt with help of new key \r

+ // decrypt nt with help of new key\r

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

} else {\r

// Load (plain) uid^nt into the cipher\r

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

} else {\r

// Load (plain) uid^nt into the cipher\r

\r

// some statistic\r

if (!ntptr && (MF_DBGLEVEL >= 3))\r

\r

// some statistic\r

if (!ntptr && (MF_DBGLEVEL >= 3))\r

- Dbprintf("auth uid: %08x nt: %08x", uid, nt); \r

- \r

+ Dbprintf("auth uid: %08x nt: %08x", uid, nt);\r

+\r

// save Nt\r

if (ntptr)\r

*ntptr = nt;\r

\r

// Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r

par[0] = 0;\r

// save Nt\r

if (ntptr)\r

*ntptr = nt;\r

\r

// Generate (encrypted) nr+parity by loading it into the cipher (Nr)\r

par[0] = 0;\r

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

- {\r

+ for (pos = 0; pos < 4; pos++) {\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

- } \r

- \r

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

+ }\r

+\r

// Skip 32 bits in pseudo random generator\r

nt = prng_successor(nt,32);\r

\r

// ar+parity\r

// Skip 32 bits in pseudo random generator\r

nt = prng_successor(nt,32);\r

\r

// ar+parity\r

- for (pos = 4; pos < 8; pos++)\r

- {\r

+ for (pos = 4; pos < 8; pos++) {\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

- } \r

- \r

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

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

+ }\r

+\r

// Transmit reader nonce and reader answer\r

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

\r

// Receive 4 byte tag answer\r

// Transmit reader nonce and reader answer\r

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

\r

// Receive 4 byte tag answer\r

+ uint32_t save_timeout = iso14a_get_timeout(); // save standard timeout\r

+ if (auth_timeout && *auth_timeout) {\r

+ iso14a_set_timeout(*auth_timeout); // set timeout for authentication response\r

+ }\r

+ uint32_t auth_timeout_start = GetCountSspClk();\r

len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r

- if (!len)\r

- {\r

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

+ iso14a_set_timeout(save_timeout); // restore standard timeout\r

+ if (!len) {\r

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

return 2;\r

}\r

return 2;\r

}\r

- \r

- memcpy(tmp4, receivedAnswer, 4);\r

- ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);\r

- \r

- if (ntpp != bytes_to_num(tmp4, 4)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Authentication failed. Error card response.");\r

+ if (auth_timeout && !*auth_timeout) { // measure time for future authentication response timeout\r

+ *auth_timeout = (GetCountSspClk() - auth_timeout_start - (len * 9 + 2) * 8) / 8 + 1;\r

+ }\r

+\r

+ ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0, 0);\r

+\r

+ if (ntpp != bytes_to_num(receivedAnswer, 4)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Authentication failed. Error card response.");\r

return 3;\r

}\r

\r

return 0;\r

}\r

\r

return 3;\r

}\r

\r

return 0;\r

}\r

\r

-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) \r

-{\r

+\r

+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {\r

// variables\r

- int len; \r

- uint8_t bt[2];\r

- \r

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t* receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

- \r

+ int len;\r

+ uint8_t bt[2];\r

+\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+\r

// command MIFARE_CLASSIC_READBLOCK\r

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

+ len = mifare_sendcmd_short(pcs, 1, MIFARE_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

if (len == 1) {\r

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

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

return 1;\r

}\r

if (len != 18) {\r

return 1;\r

}\r

if (len != 18) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: card timeout. len: %x", len); \r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: card timeout. len: %x", len);\r

return 2;\r

}\r

\r

memcpy(bt, receivedAnswer + 16, 2);\r

AppendCrc14443a(receivedAnswer, 16);\r

if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {\r

return 2;\r

}\r

\r

memcpy(bt, receivedAnswer + 16, 2);\r

AppendCrc14443a(receivedAnswer, 16);\r

if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Cmd CRC response error."); \r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd CRC response error.");\r

return 3;\r

}\r

return 3;\r

}\r

- \r

+\r

memcpy(blockData, receivedAnswer, 16);\r

- return 0;

-}

-

+ return 0;\r

+}\r

+\r

// mifare ultralight commands\r

-int mifare_ultra_auth1(uint32_t uid, uint8_t *blockData){\r

+int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){\r

\r

uint16_t len;\r

\r

uint16_t len;\r

- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

- \r

- len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r

- if (len == 1) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r

- return 1;\r

+ uint8_t resp[4];\r

+ uint8_t respPar[1];\r

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

+ memcpy(key, keybytes, 4);\r

+\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(MIFARE_ULEV1_AUTH, 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

+ return 0;\r

}\r

- if (len != 11)\r

- return 1;\r

\r

- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

- Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r

- receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],\r

- receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],\r

- receivedAnswer[10]);\r

- }\r

- memcpy(blockData, receivedAnswer, 11);\r

- return 0;\r

+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r

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

+\r

+ memcpy(pack, resp, 4);\r

+ return 1;\r

}\r

\r

}\r

\r

-int mifare_ultra_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){\r

+int mifare_ultra_auth(uint8_t *keybytes){\r

+\r

+ /// 3des2k\r

+\r

+ mbedtls_des3_context ctx = { {0} };\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 rnd_ab[16] = {0x00};\r

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

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

+ memcpy(key, keybytes, 16);\r

\r

uint16_t len;\r

\r

uint16_t len;\r

- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

- \r

- len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, key, receivedAnswer, receivedAnswerPar, NULL);\r

- if (len == 1) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r

- return 1;\r

+ uint8_t resp[19] = {0x00};\r

+ uint8_t respPar[3] = {0,0,0};\r

+\r

+ // REQUEST AUTHENTICATION\r

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

+ if (len != 11) {\r

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

+ return 0;\r

+ }\r

+\r

+ // tag nonce.\r

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

+\r

+ // decrypt nonce.\r

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

+ mbedtls_des3_set2key_dec(&ctx, key);\r

+ mbedtls_des3_crypt_cbc(&ctx // des3_context\r

+ , MBEDTLS_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

+\r

+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

+ Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",\r

+ enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);\r

+\r

+ Dbprintf(" B: %02x %02x %02x %02x %02x %02x %02x %02x",\r

+ random_b[0],random_b[1],random_b[2],random_b[3],random_b[4],random_b[5],random_b[6],random_b[7]);\r

+\r

+ Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r

+ rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r

+\r

+ Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",\r

+ rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );\r

+ }\r

+\r

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

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

+ mbedtls_des3_set2key_enc(&ctx, key);\r

+ mbedtls_des3_crypt_cbc(&ctx // des3_context\r

+ , MBEDTLS_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(MIFARE_ULC_AUTH_2, 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

+ return 0;\r

}\r

- if (len != 11)\r

- return 1; \r

- \r

+\r

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

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

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

+\r

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

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

+ mbedtls_des3_set2key_dec(&ctx, key);\r

+ mbedtls_des3_crypt_cbc(&ctx // des3_context\r

+ , MBEDTLS_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

+ return 0;\r

+ }\r

+\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

- Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r

- receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],\r

- receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],\r

- receivedAnswer[10]);\r

+ Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",\r

+ rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],\r

+ rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);\r

+\r

+ Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",\r

+ rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],\r

+ rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);\r

+\r

+ Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",\r

+ random_a[0],random_a[1],random_a[2],random_a[3],\r

+ random_a[4],random_a[5],random_a[6],random_a[7]);\r

+\r

+ Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",\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 1;\r

+}\r

+\r

+#define MFU_MAX_RETRIES 5\r

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

+{\r

+ uint16_t len;\r

+ uint8_t bt[2];\r

+ uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

+ uint8_t retries;\r

+ int result = 0;\r

+\r

+ for (retries = 0; retries < MFU_MAX_RETRIES; retries++) {\r

+ len = mifare_sendcmd_short(NULL, 1, MIFARE_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

+ if (len == 1) {\r

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

+ result = 1;\r

+ continue;\r

+ }\r

+ if (len != 18) {\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);\r

+ result = 2;\r

+ continue;\r

+ }\r

+\r

+ memcpy(bt, receivedAnswer + 16, 2);\r

+ AppendCrc14443a(receivedAnswer, 16);\r

+ if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");\r

+ result = 3;\r

+ continue;\r

+ }\r

+\r

+ // No errors encountered; don't retry\r

+ result = 0;\r

+ break;\r

}\r

- memcpy(blockData, receivedAnswer, 11);\r

+\r

+ if (result != 0) {\r

+ Dbprintf("Cmd Error: too many retries; read failed");\r

+ return result;\r

+ }\r

+\r

+ memcpy(blockData, receivedAnswer, 16);\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

-int mifare_ultra_readblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)

-{

- uint16_t len;

- uint8_t bt[2];

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t* receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;

-

- \r

- // command MIFARE_CLASSIC_READBLOCK

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

- if (len == 1) {

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd Error: %02x", receivedAnswer[0]);

- return 1;

- }

- if (len != 18) {

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd Error: card timeout. len: %x", len);

- return 2;

- }

-

- memcpy(bt, receivedAnswer + 16, 2);

- AppendCrc14443a(receivedAnswer, 16);

- if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd CRC response error.");

- return 3;

- }

-

- memcpy(blockData, receivedAnswer, 14);

- return 0;

-}

-

-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)

-{

- // variables

- uint16_t len, i; \r

+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)\r

+{\r

+ // variables\r

+ uint16_t len, i;\r

uint32_t pos;\r

- uint8_t par[3] = {0}; // enough for 18 Bytes to send\r

+ uint8_t par[3] = {0}; // enough for 18 Bytes to send\r

byte_t res;\r

- \r

+\r

uint8_t d_block[18], d_block_enc[18];\r

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t* receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

- \r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+\r

// command MIFARE_CLASSIC_WRITEBLOCK\r

- len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

+ len = mifare_sendcmd_short(pcs, 1, MIFARE_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

\r

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

\r

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

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

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

return 1;\r

}\r

return 1;\r

}\r

- \r

+\r

memcpy(d_block, blockData, 16);\r

AppendCrc14443a(d_block, 16);\r

memcpy(d_block, blockData, 16);\r

AppendCrc14443a(d_block, 16);\r

- \r

+\r

// crypto\r

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

{\r

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

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

- } \r

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

+ }\r

\r

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

\r

// Receive the response\r

\r

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

\r

// Receive the response\r

- len = ReaderReceive(receivedAnswer, receivedAnswerPar); \r

+ len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r

\r

res = 0;\r

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

res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;\r

\r

if ((len != 1) || (res != 0x0A)) {\r

\r

res = 0;\r

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

res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;\r

\r

if ((len != 1) || (res != 0x0A)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Cmd send data2 Error: %02x", res); \r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd send data2 Error: %02x", res);\r

return 2;\r

}\r

return 2;\r

}\r

- \r

- return 0;

-}

-

-int mifare_ultra_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)

-{

- uint16_t len;

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

- uint8_t d_block[18] = {0x00};

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t* receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;

-

- // command MIFARE_CLASSIC_WRITEBLOCK

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

-

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

+\r

+ return 0;\r

+}\r

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

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

+ uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

+\r

+ len = mifare_sendcmd_short(NULL, true, MIFARE_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

+\r

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

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);

- return 1;

- }

-

- memcpy(d_block, blockData, 16);

- AppendCrc14443a(d_block, 16);

-

- ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);

-

- len = ReaderReceive(receivedAnswer, receivedAnswerPar);

-

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

+ Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);\r

+ return 1;\r

+ }\r

+\r

+ memcpy(d_block, blockData, 16);\r

+ AppendCrc14443a(d_block, 16);\r

+\r

+ ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);\r

+\r

+ len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r

+\r

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

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);

- return 2;

- }

- return 0;

-}

-

-int mifare_ultra_special_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData)

-{

- uint16_t len;

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

- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;

-

- // command MIFARE_CLASSIC_WRITEBLOCK

- d_block[0]= blockNo;

- memcpy(d_block+1,blockData,4);

- AppendCrc14443a(d_block, 6);

-

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

-

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

+ Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);\r

+ return 2;\r

+ }\r

+ return 0;\r

+}\r

+*/\r

+\r

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

+{\r

+ uint16_t len;\r

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

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+\r

+ // command MIFARE_CLASSIC_WRITEBLOCK\r

+ d_block[0]= blockNo;\r

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

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

+\r

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

+\r

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

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);

- return 1;

- }

-\r return 0;

-}

-

-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)

-{

- uint16_t len; \r

- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

-\r

- len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r

+ Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);\r

+ return 1;\r

+ }\r

+ return 0;\r

+}\r

+\r

+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)\r

+{\r

+ uint16_t len;\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+\r

+ len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, ISO14443A_CMD_HALT, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r

if (len != 0) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

if (len != 0) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("halt error. response len: %x", len); \r

+ Dbprintf("halt error. response len: %x", len);\r

return 1;\r

}\r

\r

return 1;\r

}\r

\r

- return 0;

-}

-

-int mifare_ultra_halt(uint32_t uid)

-{

- uint16_t len;

- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;

-

- len = mifare_sendcmd_short(NULL, true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);

- if (len != 0) {

+ return 0;\r

+}\r

+\r

+int mifare_ultra_halt()\r

+{\r

+ uint16_t len;\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+\r

+ len = mifare_sendcmd_short(NULL, true, ISO14443A_CMD_HALT, 0x00, receivedAnswer, receivedAnswerPar, NULL);\r

+ if (len != 0) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("halt error. response len: %x", len);

- return 1;

- }

- return 0;

-}

-

+ Dbprintf("halt error. response len: %x", len);\r

+ return 1;\r

+ }\r

+ return 0;\r

+}\r

+\r

\r

// Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),\r

// plus evtl. 8 sectors with 16 blocks each (4k cards)\r

\r

// Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),\r

// plus evtl. 8 sectors with 16 blocks each (4k cards)\r

-uint8_t NumBlocksPerSector(uint8_t sectorNo) \r

+uint8_t NumBlocksPerSector(uint8_t sectorNo)\r

{\r

- if (sectorNo < 32) \r

+ if (sectorNo < 32)\r

return 4;\r

else\r

return 16;\r

}\r

\r

return 4;\r

else\r

return 16;\r

}\r

\r

-uint8_t FirstBlockOfSector(uint8_t sectorNo) \r

+uint8_t FirstBlockOfSector(uint8_t sectorNo)\r

{\r

if (sectorNo < 32)\r

return sectorNo * 4;\r

else\r

return 32*4 + (sectorNo - 32) * 16;\r

{\r

if (sectorNo < 32)\r

return sectorNo * 4;\r

else\r

return 32*4 + (sectorNo - 32) * 16;\r

- \r

+\r

}\r

\r

}\r

\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

\r

-// work with emulator memory

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

- uint8_t* emCARD = get_bigbufptr_emlcardmem();

+// work with emulator memory\r

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

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

memcpy(emCARD + blockNum * 16, data, blocksCount * 16);\r

}\r

\r

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

memcpy(emCARD + blockNum * 16, data, blocksCount * 16);\r

}\r

\r

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

- uint8_t* emCARD = get_bigbufptr_emlcardmem();\r

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

memcpy(data, emCARD + blockNum * 16, blocksCount * 16);\r

}\r

\r

void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {\r

memcpy(data, emCARD + blockNum * 16, blocksCount * 16);\r

}\r

\r

void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount) {\r

- uint8_t* emCARD = get_bigbufptr_emlcardmem();\r

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

memcpy(data, emCARD + bytePtr, byteCount);\r

}\r

\r

int emlCheckValBl(int blockNum) {\r

memcpy(data, emCARD + bytePtr, byteCount);\r

}\r

\r

int emlCheckValBl(int blockNum) {\r

- uint8_t* emCARD = get_bigbufptr_emlcardmem();\r

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

uint8_t* data = emCARD + blockNum * 16;\r

\r

if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||\r

uint8_t* data = emCARD + blockNum * 16;\r

\r

if ((data[0] != (data[4] ^ 0xff)) || (data[0] != data[8]) ||\r

(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||\r

(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||\r

(data[12] != (data[15] ^ 0xff))\r

(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||\r

(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||\r

(data[12] != (data[15] ^ 0xff))\r

- ) \r

+ )\r

return 1;\r

return 0;\r

}\r

\r

int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {\r

return 1;\r

return 0;\r

}\r

\r

int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {\r

- uint8_t* emCARD = get_bigbufptr_emlcardmem();\r

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

uint8_t* data = emCARD + blockNum * 16;\r

- \r

+\r

if (emlCheckValBl(blockNum)) {\r

return 1;\r

}\r

if (emlCheckValBl(blockNum)) {\r

return 1;\r

}\r

- \r

+\r

memcpy(blReg, data, 4);\r

*blBlock = data[12];\r

return 0;\r

}\r

\r

int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {\r

memcpy(blReg, data, 4);\r

*blBlock = data[12];\r

return 0;\r

}\r

\r

int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {\r

- uint8_t* emCARD = get_bigbufptr_emlcardmem();\r

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

uint8_t* data = emCARD + blockNum * 16;\r

- \r

+\r

memcpy(data + 0, &blReg, 4);\r

memcpy(data + 8, &blReg, 4);\r

blReg = blReg ^ 0xffffffff;\r

memcpy(data + 4, &blReg, 4);\r

memcpy(data + 0, &blReg, 4);\r

memcpy(data + 8, &blReg, 4);\r

blReg = blReg ^ 0xffffffff;\r

memcpy(data + 4, &blReg, 4);\r

- \r

+\r

data[12] = blBlock;\r

data[13] = blBlock ^ 0xff;\r

data[14] = blBlock;\r

data[15] = blBlock ^ 0xff;\r

data[12] = blBlock;\r

data[13] = blBlock ^ 0xff;\r

data[14] = blBlock;\r

data[15] = blBlock ^ 0xff;\r

- \r

+\r

return 0;\r

}\r

\r

uint64_t emlGetKey(int sectorNum, int keyType) {\r

uint8_t key[6];\r

return 0;\r

}\r

\r

uint64_t emlGetKey(int sectorNum, int keyType) {\r

uint8_t key[6];\r

- uint8_t* emCARD = get_bigbufptr_emlcardmem();\r

- \r

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

+\r

memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);\r

return bytes_to_num(key, 6);\r

}\r

\r

void emlClearMem(void) {\r

int b;\r

memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);\r

return bytes_to_num(key, 6);\r

}\r

\r

void emlClearMem(void) {\r

int b;\r

- \r

+\r

const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};\r

const uint8_t uid[] = {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};\r

const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};\r

const uint8_t uid[] = {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};\r

- uint8_t* emCARD = get_bigbufptr_emlcardmem();\r

- \r

+ uint8_t* emCARD = BigBuf_get_EM_addr();\r

+\r

memset(emCARD, 0, CARD_MEMORY_SIZE);\r

- \r

+\r

// fill sectors trailer data\r

for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {\r

emlSetMem((uint8_t *)trailer, b , 1);\r

// fill sectors trailer data\r

for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {\r

emlSetMem((uint8_t *)trailer, b , 1);\r

- } \r

+ }\r

\r

// uid\r

emlSetMem((uint8_t *)uid, 0, 1);\r

\r

// uid\r

emlSetMem((uint8_t *)uid, 0, 1);\r

// Mifare desfire commands\r

int mifare_sendcmd_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

// Mifare desfire commands\r

int mifare_sendcmd_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[5] = {0x00};\r

- dcmd[0] = cmd;\r

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

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

+ dcmd[0] = cmd;\r

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

AppendCrc14443a(dcmd, 3);\r

- \r

+\r

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

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

if(!len) {\r

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

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

if(!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) \r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

Dbprintf("Authentication failed. Card timeout.");\r

return 1;\r

Dbprintf("Authentication failed. Card timeout.");\r

return 1;\r

- }\r

+ }\r

return len;\r

}\r

\r

int mifare_sendcmd_special2(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 len;\r

}\r

\r

int mifare_sendcmd_special2(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[20] = {0x00};\r

- dcmd[0] = cmd;\r

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

+ uint8_t dcmd[20] = {0x00};\r

+ dcmd[0] = cmd;\r

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

AppendCrc14443a(dcmd, 18);\r

\r

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

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

if(!len){\r

AppendCrc14443a(dcmd, 18);\r

\r

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

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

if(!len){\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

Dbprintf("Authentication failed. Card timeout.");\r

return 1;\r

Dbprintf("Authentication failed. Card timeout.");\r

return 1;\r

- }\r

+ }\r

return len;\r

}\r

\r

return len;\r

}\r

\r

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 = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

- \r

+ uint8_t receivedAnswer[MAX_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r

+\r

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

if (len == 1) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r

return 1;\r

}\r

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

if (len == 1) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r

return 1;\r

}\r

- \r

+\r

if (len == 12) {\r

- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r

receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],\r

receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],\r

receivedAnswer[10],receivedAnswer[11]);\r

}\r

memcpy(blockData, receivedAnswer, 12);\r

Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r

receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],\r

receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],\r

receivedAnswer[10],receivedAnswer[11]);\r

}\r

memcpy(blockData, receivedAnswer, 12);\r

- return 0;\r

+ return 0;\r

}\r

return 1;\r

}\r

return 1;\r

}\r

uint8_t data[17] = {0x00};\r

data[0] = 0xAF;\r

memcpy(data+1,key,16);\r

uint8_t data[17] = {0x00};\r

data[0] = 0xAF;\r

memcpy(data+1,key,16);\r

- \r

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

- \r

+\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+\r

len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);\r

- \r

+\r

if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);\r

return 1;\r

}\r

if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {\r

if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);\r

return 1;\r

}\r

- \r

+\r

if (len == 12){\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r

if (len == 12){\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\r

Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",\r

return 0;\r

}\r

return 1;\r

return 0;\r

}\r

return 1;\r

-}

\ No newline at end of file

+}\r

+\r

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

+// MIFARE check keys\r

+//\r

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

+// one key check\r

+static int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint8_t *key, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, bool fixed_nonce) {\r

+\r

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

+ struct Crypto1State *pcs;\r

+ pcs = &mpcs;\r

+\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 (!fixed_nonce) {\r

+ uint64_t ui64Key = bytes_to_num(key, 6);\r

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

+ return -2;\r

+ } else {\r

+ mifare_classic_halt(pcs, *cuid);\r

+ }\r

+ } else {\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+ // Transmit MIFARE_CLASSIC_AUTH\r

+ int len = mifare_sendcmd_short(pcs, false, keyType & 0x01 ? MIFARE_AUTH_KEYB : MIFARE_AUTH_KEYA, blockNo, receivedAnswer, receivedAnswerPar, NULL);\r

+ if (len != 4) return -2;\r

+ // Transmit encrypted reader nonce and reader answer\r

+ uint8_t mf_nr_ar[8] = NESTED_FIXED_NR_ENC;\r

+ memcpy(mf_nr_ar + 4, key, 4);\r

+ ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), key + 4, NULL);\r

+ uint32_t save_timeout = iso14a_get_timeout(); // save standard timeout\r

+ iso14a_set_timeout(*auth_timeout); // set timeout for authentication response\r

+ len = ReaderReceive(receivedAnswer, receivedAnswerPar);\r

+ iso14a_set_timeout(save_timeout); // restore standard timeout\r

+ if (!len) return -2;\r

+ }\r

+\r

+ return 0; // success\r

+}\r

+\r

+// multi key check\r

+static int MifareChkBlockKeysEx(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, bool fixed_nonce) {\r

+\r

+ uint8_t uid[10];\r

+ uint32_t cuid = 0;\r

+ uint8_t cascade_levels = 0;\r

+\r

+ int retryCount = 0;\r

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

+ uint8_t bytes_per_key = fixed_nonce ? 5 : 6;\r

+ int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, keys + i*bytes_per_key, blockNo, keyType, auth_timeout, debugLevel, fixed_nonce);\r

+ if (res == -1) { // couldn't select\r

+ retryCount++;\r

+ if (retryCount >= 5) {\r

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

+ return -1;\r

+ } else {\r

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

+ SpinDelay(20);\r

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

+ continue;\r

+ }\r

+ if (res == -2) { // couldn't authenticate with this key\r

+ retryCount = 0;\r

+ continue;\r

+ }\r

+\r

+ return i + 1; // successful authentication\r

+\r

+ }\r

+\r

+ if (BUTTON_PRESS()) {\r

+ return -2;\r

+ }\r

+\r

+ return 0; // couldn't authenticate with any key\r

+}\r

+\r

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

+ return MifareChkBlockKeysEx(keys, keyCount, blockNo, keyType, auth_timeout, debugLevel, false);\r

+}\r

+\r

+// fixed nonce check\r

+int MifareChkBlockKeysFixedNonce(uint8_t *ar_par, uint8_t ar_par_cnt, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {\r

+ return MifareChkBlockKeysEx(ar_par, ar_par_cnt, blockNo, keyType, auth_timeout, debugLevel, true);\r

+}\r

+\r

+// multisector multikey check\r

+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint32_t *auth_timeout, 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, auth_timeout, 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 1;\r

+}\r

+\r