\r
#include "crc.h"\r
\r
+// the block number for the ISO14443-4 PCB\r
+uint8_t pcb_blocknum = 0;\r
+// Deselect card by sending a s-block. the crc is precalced for speed\r
+static uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\r
+\r
+\r
//-----------------------------------------------------------------------------\r
// Select, Authenticate, Read a MIFARE tag. \r
// read block\r
LEDsoff();\r
}\r
\r
-\r
void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){\r
\r
bool turnOffField = (arg0 == 1);\r
return;\r
};\r
\r
- if(mifare_ultra_auth(keybytes) == 1){\r
+ if(!mifare_ultra_auth(keybytes)){\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r
OnError(1);\r
return;\r
}\r
- \r
- cmd_send(CMD_ACK,1,0,0,0,0);\r
\r
if (turnOffField) {\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
+ }\r
+ cmd_send(CMD_ACK,1,0,0,0,0);\r
} \r
+ cmd_send(CMD_ACK,1,0,0,0,0);\r
}\r
\r
// Arg0 = BlockNo,\r
// Arg1 = UsePwd bool\r
-// datain = PWD bytes, \r
+// datain = PWD bytes,\r
void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r
{\r
uint8_t blockNo = arg0;\r
bool useKey = (arg1 == 1); //UL_C\r
bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r
\r
- LEDsoff(); \r
- LED_A_ON(); \r
+ LEDsoff();\r
+ LED_A_ON();\r
clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
- \r
+\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
+\r
// UL-C authentication\r
if ( useKey ) {\r
- uint8_t key[16] = {0x00}; \r
+ uint8_t key[16] = {0x00};\r
memcpy(key, datain, sizeof(key) );\r
\r
- if ( mifare_ultra_auth(key) == 1 ) {\r
+ if ( !mifare_ultra_auth(key) ) {\r
OnError(1);\r
- return; \r
+ return;\r
}\r
}\r
- \r
+\r
// UL-EV1 / NTAG authentication\r
- if (usePwd) { \r
+ if ( usePwd ) {\r
uint8_t pwd[4] = {0x00};\r
memcpy(pwd, datain, 4);\r
uint8_t pack[4] = {0,0,0,0};\r
-\r
- if (mifare_ul_ev1_auth(pwd, pack) == 1){\r
+ if (!mifare_ul_ev1_auth(pwd, pack)) {\r
OnError(1);\r
- return; \r
+ return;\r
}\r
- }\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
+\r
cmd_send(CMD_ACK,1,0,0,dataout,16);\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
}\r
+\r
//-----------------------------------------------------------------------------\r
// Select, Authenticate, Read a MIFARE tag. \r
// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)\r
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
}\r
\r
+ \r
if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r
isOK = 0;\r
if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");\r
// datain = KEY bytes\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
+ LED_A_ON();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
int len = iso14443a_select_card(NULL, NULL, NULL);\r
OnError(1);\r
return;\r
}\r
+\r
+ // UL-C authentication\r
+ if ( useKey ) {\r
+ uint8_t key[16] = {0x00};\r
+ memcpy(key, datain, sizeof(key) );\r
+\r
+ if ( !mifare_ultra_auth(key) ) {\r
+ OnError(1);\r
+ return;\r
+ }\r
+ }\r
+\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
+ OnError(1);\r
+ return; \r
+ }\r
+ }\r
+\r
+ for (int i = 0; i < blocks; i++){\r
+ if ((i*4) + 4 > CARD_MEMORY_SIZE) {\r
+ Dbprintf("Data exceeds buffer!!");\r
+ break;\r
+ }\r
\r
// UL-C authentication\r
if ( useKey ) {\r
uint8_t key[16] = {0x00}; \r
memcpy(key, datain, sizeof(key) );\r
\r
- if ( mifare_ultra_auth(key) == 1 ) {\r
+ if ( !mifare_ultra_auth(key) ) {\r
OnError(1);\r
return; \r
}\r
memcpy(pwd, datain, sizeof(pwd));\r
uint8_t pack[4] = {0,0,0,0};\r
\r
- if (mifare_ul_ev1_auth(pwd, pack) == 1){\r
+ if (!mifare_ul_ev1_auth(pwd, pack)){\r
OnError(1);\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
+ // 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
- \r
+\r
len = mifare_ultra_halt();\r
if (len) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r
OnError(3);\r
return;\r
}\r
- \r
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r
\r
- len = blocks*4;\r
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\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
LEDsoff();\r
}\r
\r
-\r
void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r
{\r
- uint8_t blockNo = arg0;\r
+ uint8_t blockNo = arg0;\r
byte_t blockdata[16] = {0x00};\r
\r
- memcpy(blockdata, datain, 16);\r
- \r
+ memcpy(blockdata, datain, 16);\r
+\r
uint8_t uid[10] = {0x00};\r
\r
LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
- \r
+\r
clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
OnError(0);\r
return;\r
};\r
- \r
+\r
if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r
\r
cmd_send(CMD_ACK,1,0,0,0,0);\r
LEDsoff();\r
}\r
\r
-void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r
+// Arg0 : Block to write to.\r
+// Arg1 : 0 = use no authentication.\r
+// 1 = use 0x1A authentication.\r
+// 2 = use 0x1B authentication.\r
+// datain : 4 first bytes is data to be written.\r
+// : 4/16 next bytes is authentication key.\r
+void MifareUWriteBlock_Special(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r
{\r
uint8_t blockNo = arg0;\r
+ bool useKey = (arg1 == 1); //UL_C\r
+ bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r
byte_t blockdata[4] = {0x00};\r
- uint8_t uid[10] = {0x00};\r
- \r
+\r
memcpy(blockdata, datain,4);\r
\r
LEDsoff();\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
\r
+ // UL-C authentication\r
+ if ( useKey ) {\r
+ uint8_t key[16] = {0x00}; \r
+ memcpy(key, datain+4, sizeof(key) );\r
+\r
+ if ( !mifare_ultra_auth(key) ) {\r
+ OnError(1);\r
+ return; \r
+ }\r
+ }\r
+ \r
+ // UL-EV1 / NTAG authentication\r
+ if (usePwd) { \r
+ uint8_t pwd[4] = {0x00};\r
+ memcpy(pwd, datain+4, 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
if(mifare_ultra_special_writeblock(blockNo, blockdata)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r
OnError(0);\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
}\r
+\r
+void OnSuccess(){\r
+ pcb_blocknum = 0;\r
+ ReaderTransmit(deselect_cmd, 3 , NULL);\r
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+ LEDsoff();\r
+}\r
+\r
+void OnError(uint8_t reason){\r
+ pcb_blocknum = 0;\r
+ ReaderTransmit(deselect_cmd, 3 , NULL);\r
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
+ cmd_send(CMD_ACK,0,reason,0,0,0);\r
+ LEDsoff();\r
+}\r
projects / proxmark3-svn / blobdiff