#include "apps.h"\r
#include "util.h"\r
\r
-#include "des.h"\r
#include "crc.h"\r
\r
// the block number for the ISO14443-4 PCB\r
LEDsoff();\r
}\r
\r
-void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){\r
\r
- byte_t dataoutbuf[16] = {0x00};\r
- uint8_t uid[10] = {0x00};\r
- uint32_t cuid = 0x00;\r
+ bool turnOffField = (arg0 == 1);\r
\r
LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
- \r
clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
- if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
OnError(0);\r
return;\r
};\r
\r
- if(mifare_ultra_auth1(dataoutbuf)){\r
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");\r
+ if(!mifare_ultra_auth(keybytes)){\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r
OnError(1);\r
return;\r
}\r
\r
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
- \r
- cmd_send(CMD_ACK,1,cuid,0,dataoutbuf,11);\r
- LEDsoff();\r
-}\r
-void MifareUC_Auth2(uint8_t arg0, uint8_t *datain){\r
-\r
- uint8_t key[16] = {0x00};\r
- byte_t dataoutbuf[16] = {0x00};\r
- \r
- memcpy(key, datain, 16);\r
- \r
- LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
- \r
- if(mifare_ultra_auth2(key, dataoutbuf)){\r
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part2: Fail...");\r
- OnError(1);\r
- return; \r
- }\r
- \r
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");\r
- \r
- cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);\r
- if (arg0) {\r
+ if (turnOffField) {\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
}\r
+ cmd_send(CMD_ACK,1,0,0,0,0);\r
}\r
\r
// Arg0 = BlockNo,\r
{\r
uint8_t blockNo = arg0;\r
byte_t dataout[16] = {0x00};\r
- uint8_t uid[10] = {0x00};\r
- uint8_t key[16] = {0x00};\r
- bool usePwd = (arg1 == 1);\r
+ bool useKey = (arg1 == 1); //UL_C\r
+ bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r
\r
LEDsoff();\r
LED_A_ON();\r
clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
- int len = iso14443a_select_card(uid, NULL, NULL);\r
+ int len = iso14443a_select_card(NULL, NULL, NULL);\r
if(!len) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r
OnError(1);\r
return;\r
}\r
\r
- // authenticate here.\r
- if ( usePwd ) {\r
-\r
- memcpy(key, datain, 16);\r
-\r
- // Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7] );\r
- // Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[8],key[9],key[10],key[11],key[12],key[13],key[14],key[15] );\r
-\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
-\r
- uint16_t len;\r
- uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
- uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
+ // UL-C authentication\r
+ if ( useKey ) {\r
+ uint8_t key[16] = {0x00};\r
+ memcpy(key, datain, sizeof(key) );\r
\r
- len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
- if (len != 11) {\r
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+ if ( !mifare_ultra_auth(key) ) {\r
OnError(1);\r
return;\r
}\r
- \r
- // tag nonce.\r
- memcpy(enc_random_b,receivedAnswer+1,8);\r
-\r
- // decrypt nonce.\r
- tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\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],\r
- 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],\r
- 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],\r
- 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],\r
- 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
+ }\r
\r
- len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
- if (len != 11) {\r
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+ // UL-EV1 / NTAG authentication\r
+ if ( usePwd ) {\r
+ uint8_t pwd[4] = {0x00};\r
+ memcpy(pwd, datain, 4);\r
+ uint8_t pack[4] = {0,0,0,0};\r
+ if (!mifare_ul_ev1_auth(pwd, pack)) {\r
OnError(1);\r
return;\r
}\r
+ } \r
\r
- uint8_t enc_resp[8] = { 0 };\r
- uint8_t resp_random_a[8] = { 0 };\r
- memcpy(enc_resp, receivedAnswer+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
- if ( memcmp(resp_random_a, random_a, 8) != 0 )\r
- Dbprintf("failed authentication");\r
-\r
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {\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
- }\r
- \r
if( mifare_ultra_readblock(blockNo, dataout) ) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r
OnError(2);\r
return;\r
}\r
- \r
+\r
if( mifare_ultra_halt() ) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
OnError(3);\r
return;\r
}\r
- \r
- cmd_send(CMD_ACK,1,0,0,dataout,16);\r
+\r
+ cmd_send(CMD_ACK,1,0,0,dataout,16);\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
}\r
\r
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
{\r
+ // free eventually allocated BigBuf memory\r
+ BigBuf_free();\r
+ // clear trace\r
+ clear_trace();\r
+\r
// params\r
uint8_t blockNo = arg0;\r
uint16_t blocks = arg1;\r
bool useKey = (arg2 == 1); //UL_C\r
bool usePwd = (arg2 == 2); //UL_EV1/NTAG\r
- int countblocks = 0;\r
- uint8_t dataout[176] = {0x00};\r
+ uint32_t countblocks = 0;\r
+ uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);\r
+ if (dataout == NULL){\r
+ Dbprintf("out of memory");\r
+ OnError(1);\r
+ return;\r
+ }\r
\r
LEDsoff();\r
LED_A_ON();\r
- clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
int len = iso14443a_select_card(NULL, NULL, NULL);\r
return;\r
}\r
\r
- // authenticate\r
+ // UL-C authentication\r
if ( useKey ) {\r
uint8_t key[16] = {0x00};\r
- memcpy(key, datain, 16);\r
-\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
-\r
- uint16_t len2;\r
- uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
- uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\r
+ memcpy(key, datain, sizeof(key) );\r
\r
- len2 = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);\r
- if (len2 != 11) {\r
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r
+ if ( !mifare_ultra_auth(key) ) {\r
OnError(1);\r
return;\r
}\r
-\r
- // tag nonce.\r
- memcpy(enc_random_b,receivedAnswer+1,8);\r
-\r
- // decrypt nonce.\r
- tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
- rol(random_b,8);\r
- memcpy(rnd_ab ,random_a,8);\r
- memcpy(rnd_ab+8,random_b,8);\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
- len2 = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
- if (len2 != 11) {\r
- OnError(1);\r
- return;\r
- }\r
-\r
- uint8_t enc_resp[8] = { 0 };\r
- uint8_t resp_random_a[8] = { 0 };\r
- memcpy(enc_resp, receivedAnswer+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
- if ( memcmp(resp_random_a, random_a, 8) != 0 )\r
- Dbprintf("failed authentication"); \r
}\r
\r
- if (usePwd) { //ev1 or ntag auth\r
- uint8_t Pwd[4] = {0x00};\r
- memcpy(Pwd, datain, 4);\r
+ // UL-EV1 / NTAG authentication\r
+ if (usePwd) {\r
+ uint8_t pwd[4] = {0x00};\r
+ memcpy(pwd, datain, sizeof(pwd));\r
uint8_t pack[4] = {0,0,0,0};\r
\r
- if (mifare_ul_ev1_auth(Pwd, pack)){\r
+ if (!mifare_ul_ev1_auth(pwd, pack)){\r
OnError(1);\r
- Dbprintf("failed authentication");\r
return; \r
}\r
}\r
\r
for (int i = 0; i < blocks; i++){\r
- len = mifare_ultra_readblock(blockNo * 4 + i, dataout + 4 * i);\r
+ if ((i*4) + 4 > CARD_MEMORY_SIZE) {\r
+ Dbprintf("Data exceeds buffer!!");\r
+ break;\r
+ }\r
+ \r
+ len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r
\r
if (len) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);\r
- OnError(2);\r
- return;\r
+ // if no blocks read - error out\r
+ if (i==0){\r
+ OnError(2);\r
+ return;\r
+ } else {\r
+ //stop at last successful read block and return what we got\r
+ break;\r
+ }\r
} else {\r
countblocks++;\r
}\r
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
\r
- len = blocks * 4;\r
-\r
- cmd_send(CMD_ACK, 1, len, 0, dataout, len); \r
+ countblocks *= 4;\r
+ cmd_send(CMD_ACK, 1, countblocks, countblocks, 0, 0);\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
}\r
{\r
uint8_t blockNo = arg0;\r
byte_t blockdata[4] = {0x00};\r
- \r
- memcpy(blockdata, datain,4);\r
\r
- uint8_t uid[10] = {0x00};\r
+ memcpy(blockdata, datain,4);\r
\r
- LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
+ LEDsoff();\r
+ LED_A_ON();\r
clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
- if(!iso14443a_select_card(uid, NULL, NULL)) {\r
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
OnError(0);\r
return;\r
\r
int len = iso14443a_select_card(uid, NULL, &cuid);\r
if(!len) {\r
- if (MF_DBGLEVEL >= MF_DBG_ERROR) \r
- Dbprintf("Can't select card");\r
- //OnError(1);\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
+ OnError(1);\r
return;\r
};\r
\r
if(mifare_desfire_des_auth1(cuid, dataout)){\r
- if (MF_DBGLEVEL >= MF_DBG_ERROR) \r
- Dbprintf("Authentication part1: Fail.");\r
- //OnError(4);\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");\r
+ OnError(4);\r
return;\r
}\r
\r
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r
- \r
cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\r
}\r
\r
projects / proxmark3-svn / blobdiff