LEDsoff();\r
}\r
\r
+// Arg0 = BlockNo,\r
+// Arg1 = UsePwd bool\r
+// datain = PWD bytes, \r
void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\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
- \r
- LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
- \r
+\r
+ LEDsoff(); \r
+ LED_A_ON(); \r
clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
\r
// authenticate here.\r
if ( usePwd ) {\r
- \r
+\r
+ uint8_t key[16] = {0x00}; \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 a[8] = {1,1,1,1,1,1,1,1 };\r
- uint8_t b[8] = {0x00};\r
- uint8_t enc_b[8] = {0x00};\r
- uint8_t ab[16] = {0x00};\r
- uint8_t enc_ab[16] = {0x00}; \r
- uint8_t enc_key[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
+ 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
}\r
\r
// tag nonce.\r
- memcpy(enc_b,receivedAnswer+1,8);\r
+ memcpy(enc_random_b,receivedAnswer+1,8);\r
\r
// decrypt nonce.\r
- tdes_2key_dec(b, enc_b, 8, key );\r
-\r
- Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x", enc_b[0],enc_b[1],enc_b[2],enc_b[3],enc_b[4],enc_b[5],enc_b[6],enc_b[7] );\r
- Dbprintf(" B: %02x %02x %02x %02x %02x %02x %02x %02x", b[0],b[1],b[2],b[3],b[4],b[5],b[6],b[7] );\r
- rol(b,8);\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
- memcpy(ab ,a,8);\r
- memcpy(ab+8,b,8);\r
-\r
- Dbprintf("AB: %02x %02x %02x %02x %02x %02x %02x %02x", ab[0],ab[1],ab[2],ab[3],ab[4],ab[5],ab[6],ab[7] );\r
- Dbprintf("AB: %02x %02x %02x %02x %02x %02x %02x %02x", ab[8],ab[9],ab[10],ab[11],ab[12],ab[13],ab[14],ab[15] );\r
-\r
- // encrypt\r
- tdes_2key_enc(enc_ab, ab, 16, key);\r
-\r
- Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", enc_ab[0],enc_ab[1],enc_ab[2],enc_ab[3],enc_ab[4],enc_ab[5],enc_ab[6],enc_ab[7] );\r
- Dbprintf("e_enc_ab: %02x %02x %02x %02x %02x %02x %02x %02x", enc_ab[8],enc_ab[9],enc_ab[10],enc_ab[11],enc_ab[12],enc_ab[13],enc_ab[14],enc_ab[15] );\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, enc_ab, receivedAnswer, receivedAnswerPar, NULL);\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
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
- // the tags' encryption of our nonce, A.\r
- memcpy(enc_key, receivedAnswer+1, 8);\r
- \r
- // clear B.\r
- memset(b, 0x00, 8);\r
- \r
- // decrypt \r
- tdes_2key_dec(b, enc_key, 8, key );\r
- if ( memcmp(a, b, 8) == 0 )\r
- Dbprintf("Verified key");\r
- else\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
- Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x", a[0],a[1],a[2],a[3],a[4],a[5],a[6],a[7] );\r
- Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x", b[0],b[1],b[2],b[3],b[4],b[5],b[6],b[7] );\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
LEDsoff();\r
}\r
\r
-void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)\r
+// arg0 = blockNo (start)\r
+// arg1 = Pages (number of blocks)\r
+// arg2 = useKey\r
+// datain = KEY bytes\r
+void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
{\r
// params\r
- uint8_t sectorNo = arg0;\r
- int Pages = arg1;\r
+ uint8_t blockNo = arg0;\r
+ uint16_t blocks = arg1;\r
+ bool useKey = (arg2 == 1);\r
int countpages = 0;\r
- byte_t dataout[176] = {0x00};;\r
- uint32_t cuid = 0x00;\r
+ uint8_t dataout[176] = {0x00};;\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
- int len = iso14443a_select_card(NULL, NULL, &cuid);\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:%d)",len);\r
OnError(1);\r
return;\r
}\r
\r
- for (int i = 0; i < Pages; i++){\r
+ // authenticate\r
+ if ( useKey ) {\r
+ \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 len;\r
+ uint8_t receivedAnswer[MAX_FRAME_SIZE];\r
+ uint8_t receivedAnswerPar[MAX_PARITY_SIZE];\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
+ 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
+ len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);\r
+ if (len != 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
+ for (int i = 0; i < blocks; i++){\r
\r
- len = mifare_ultra_readblock(sectorNo * 4 + i, dataout + 4 * i);\r
+ len = mifare_ultra_readblock(blockNo * 4 + i, dataout + 4 * i);\r
\r
if (len) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);\r
}\r
}\r
\r
- len = mifare_ultra_halt();\r
- if (len) {\r
+ if (mifare_ultra_halt()) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
OnError(3);\r
return;\r
}\r
\r
- if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Pages read %d", countpages);\r
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("blocks read %d", countpages);\r
\r
- len = 16*4; //64 bytes\r
+ len = blocks*4;\r
\r
- // Read a UL-C\r
- if (Pages == 44 && countpages > 16) \r
- len = 176;\r
-\r
- cmd_send(CMD_ACK, 1, 0, 0, dataout, len); \r
+ cmd_send(CMD_ACK, 1, len, 0, dataout, len); \r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
}\r
\r
-\r
//-----------------------------------------------------------------------------\r
// Select, Authenticate, Write a MIFARE tag. \r
// read block\r
{\r
uint8_t blockNo = arg0;\r
byte_t blockdata[4] = {0x00};\r
+ uint8_t uid[10] = {0x00};\r
\r
memcpy(blockdata, datain,4);\r
-\r
- uint8_t uid[10] = {0x00};\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
packLen -= packSize;\r
packNum++;\r
}\r
-\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
}\r
projects / proxmark3-svn / blobdiff