X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f38a152863a5eb289acb169c5a38b4b77e87956e..00a863f9ad9d556be56b25a8faf2870785778aa0:/armsrc/mifarecmd.c?ds=inline
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index ff853a57..a16cbf16 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -16,11 +16,11 @@
#include "mifarecmd.h"
#include "apps.h"
#include "util.h"
-#include "desfire.h"
-#include "../common/crc.h"
+
+#include "crc.h"
//-----------------------------------------------------------------------------
-// Select, Authenticaate, Read an MIFARE tag.
+// Select, Authenticate, Read a MIFARE tag.
// read block
//-----------------------------------------------------------------------------
void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
@@ -41,7 +41,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
pcs = &mpcs;
// clear trace
- iso14a_clear_trace();
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
LED_A_ON();
@@ -88,49 +88,46 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
- // variables
+
byte_t isOK = 0;
- byte_t dataoutbuf[16];
- uint8_t uid[10];
+ byte_t dataoutbuf[16] = {0x00};
+ uint8_t uid[10] = {0x00};
uint32_t cuid;
-
- // clear trace
- iso14a_clear_trace();
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
+
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
-
+
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card, something went wrong before auth");
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Can't select card");
+ //OnError(0);
+ return;
};
-
-
-
if(mifare_ultra_auth1(cuid, dataoutbuf)){
- if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part1: Fail.");
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Authentication part1: Fail.");
+ //OnError(1);
+ return;
}
- isOK=1;
- if (MF_DBGLEVEL >= 2) DbpString("AUTH 1 FINISHED");
+ isOK = 1;
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+ DbpString("AUTH 1 FINISHED");
- LED_B_ON();
cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
- LED_B_OFF();
-
- // Thats it...
LEDsoff();
}
void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
- // params
+
uint32_t cuid = arg0;
- uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
- // variables
+ uint8_t key[16] = {0x00};
byte_t isOK = 0;
- byte_t dataoutbuf[16];
+ byte_t dataoutbuf[16] = {0x00};
memcpy(key, datain, 16);
@@ -139,63 +136,57 @@ void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
LED_C_OFF();
if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
- if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Authentication part2: Fail...");
+ //OnError(1);
+ return;
}
- isOK=1;
- if (MF_DBGLEVEL >= 2) DbpString("AUTH 2 FINISHED");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);
- LED_B_OFF();
+
+ isOK = 1;
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+ DbpString("AUTH 2 FINISHED");
+ cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
{
- // params
uint8_t blockNo = arg0;
-
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16];
- uint8_t uid[10];
+ byte_t dataout[16] = {0x00};
+ uint8_t uid[10] = {0x00};
uint32_t cuid;
- // clear trace
- iso14a_clear_trace();
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ int len = iso14443a_select_card(uid, NULL, &cuid);
+ if(!len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+ //OnError(1);
+ return;
};
- if(mifare_ultra_readblock(cuid, blockNo, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
- break;
+ len = mifare_ultra_readblock(cuid, blockNo, dataout);
+ if(len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
+ //OnError(2);
+ return;
};
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
+ len = mifare_ultra_halt(cuid);
+ if(len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+ //OnError(3);
+ return;
};
- isOK = 1;
- break;
- }
-
- if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
- LED_B_OFF();
+ cmd_send(CMD_ACK,1,0,0,dataout,16);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
@@ -222,7 +213,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
pcs = &mpcs;
// clear trace
- iso14a_clear_trace();
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -272,57 +263,66 @@ void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
{
// params
uint8_t sectorNo = arg0;
- int Pages=arg1;
- int count_Pages=0;
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[44 * 4];
- uint8_t uid[10];
- uint32_t cuid;
-
- // clear trace
- iso14a_clear_trace();
-
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ int Pages = arg1;
+ int count_Pages = 0;
+ byte_t dataout[176] = {0x00};;
+ uint8_t uid[10] = {0x00};
+ uint32_t cuid;
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
- Dbprintf("Pages %d",Pages);
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
- for(int sec=0;sec<Pages;sec++){
- if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block %d error",sec);
- break;
- }else{
- count_Pages++;
- };
- }
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
+ LED_A_ON();
+ LED_B_OFF();
+ LED_C_OFF();
- isOK = 1;
- break;
- }
- Dbprintf("Pages read %d",count_Pages);
- if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");
+ if (MF_DBGLEVEL >= MF_DBG_ALL)
+ Dbprintf("Pages %d",Pages);
+
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- LED_B_ON();
- if (Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
- if (Pages==44 && count_Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
- if (Pages==44 && count_Pages>16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,176);
- LED_B_OFF();
+ int len = iso14443a_select_card(uid, NULL, &cuid);
+
+ if (!len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Can't select card");
+ //OnError(1);
+ return;
+ }
+
+ for (int i = 0; i < Pages; i++){
+
+ len = mifare_ultra_readblock(cuid, sectorNo * 4 + i, dataout + 4 * i);
+
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Read block %d error",i);
+ //OnError(2);
+ return;
+ } else {
+ count_Pages++;
+ }
+ }
+
+ len = mifare_ultra_halt(cuid);
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Halt error");
+ //OnError(3);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_ALL) {
+ Dbprintf("Pages read %d", count_Pages);
+ }
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
+ len = 16*4; //64 bytes
+
+ // Read a UL-C
+ if (Pages == 44 && count_Pages > 16)
+ len = 176;
+ cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
}
@@ -350,7 +350,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
pcs = &mpcs;
// clear trace
- iso14a_clear_trace();
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -402,19 +402,16 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
{
// params
uint8_t blockNo = arg0;
- byte_t blockdata[16];
+ byte_t blockdata[16] = {0x00};
- memset(blockdata,'\0',16);
memcpy(blockdata, datain,16);
// variables
byte_t isOK = 0;
- uint8_t uid[10];
+ uint8_t uid[10] = {0x00};
uint32_t cuid;
- // clear trace
- iso14a_clear_trace();
-
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
LED_A_ON();
@@ -443,33 +440,25 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- LED_B_ON();
cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
-
-
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-// iso14a_set_tracing(TRUE);
}
void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
{
// params
uint8_t blockNo = arg0;
- byte_t blockdata[4];
+ byte_t blockdata[4] = {0x00};
memcpy(blockdata, datain,4);
// variables
byte_t isOK = 0;
- uint8_t uid[10];
+ uint8_t uid[10] = {0x00};
uint32_t cuid;
- // clear trace
- iso14a_clear_trace();
-
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
LED_A_ON();
@@ -498,17 +487,13 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- LED_B_ON();
cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
-
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
// Return 1 if the nonce is invalid else return 0
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, byte_t * parity) {
+int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \
(oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \
(oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;
@@ -535,7 +520,8 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
uint16_t davg;
static uint16_t dmin, dmax;
uint8_t uid[10];
- uint32_t cuid, nt1, nt2, nttmp, nttest, par, ks1;
+ uint32_t cuid, nt1, nt2, nttmp, nttest, ks1;
+ uint8_t par[1];
uint32_t target_nt[2], target_ks[2];
uint8_t par_array[4];
@@ -543,14 +529,16 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
struct Crypto1State mpcs = {0, 0};
struct Crypto1State *pcs;
pcs = &mpcs;
- uint8_t* receivedAnswer = mifare_get_bigbufptr();
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
uint32_t auth1_time, auth2_time;
static uint16_t delta_time;
+ // free eventually allocated BigBuf memory
+ BigBuf_free();
// clear trace
- iso14a_clear_trace();
- iso14a_set_tracing(false);
+ clear_trace();
+ set_tracing(false);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -561,6 +549,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
// statistics on nonce distance
if (calibrate) { // for first call only. Otherwise reuse previous calibration
LED_B_ON();
+ WDT_HIT();
davg = dmax = 0;
dmin = 2000;
@@ -659,19 +648,18 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
// nested authentication
auth2_time = auth1_time + delta_time;
- len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, &par, &auth2_time);
+ len = mifare_sendcmd_shortex(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);
if (len != 4) {
if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error len=%d", len);
continue;
};
nt2 = bytes_to_num(receivedAnswer, 4);
- if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par);
+ if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);
// Parity validity check
for (j = 0; j < 4; j++) {
- par_array[j] = (oddparity(receivedAnswer[j]) != ((par & 0x08) >> 3));
- par = par << 1;
+ par_array[j] = (oddparity(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));
}
ncount = 0;
@@ -706,10 +694,6 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
// ----------------------------- crypto1 destroy
crypto1_destroy(pcs);
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
-
byte_t buf[4 + 4 * 4];
memcpy(buf, &cuid, 4);
memcpy(buf+4, &target_nt[0], 4);
@@ -725,7 +709,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
- iso14a_set_tracing(TRUE);
+ set_tracing(TRUE);
}
//-----------------------------------------------------------------------------
@@ -754,8 +738,8 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
MF_DBGLEVEL = MF_DBG_NONE;
// clear trace
- iso14a_clear_trace();
- iso14a_set_tracing(TRUE);
+ clear_trace();
+ set_tracing(TRUE);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -789,7 +773,6 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);
LED_B_OFF();
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
@@ -819,11 +802,11 @@ void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
}
void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
- byte_t buf[48];
+ byte_t buf[USB_CMD_DATA_SIZE];
emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
LED_B_ON();
- cmd_send(CMD_ACK,arg0,arg1,0,buf,48);
+ cmd_send(CMD_ACK,arg0,arg1,0,buf,USB_CMD_DATA_SIZE);
LED_B_OFF();
}
@@ -846,8 +829,8 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
uint8_t uid[10];
// clear trace
- iso14a_clear_trace();
- iso14a_set_tracing(false);
+ clear_trace();
+ set_tracing(false);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -935,31 +918,26 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
// variables
byte_t isOK = 0;
- uint8_t uid[10];
- uint8_t d_block[18];
+ uint8_t uid[10] = {0x00};
+ uint8_t d_block[18] = {0x00};
uint32_t cuid;
- memset(uid, 0x00, 10);
- uint8_t* receivedAnswer = mifare_get_bigbufptr();
-
- if (workFlags & 0x08) {
- // clear trace
- iso14a_clear_trace();
- iso14a_set_tracing(TRUE);
-
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
+ // reset FPGA and LED
+ if (workFlags & 0x08) {
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
- SpinDelay(300);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(100);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+ clear_trace();
+ set_tracing(TRUE);
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
}
while (true) {
+
// get UID from chip
if (workFlags & 0x01) {
if(!iso14443a_select_card(uid, NULL, &cuid)) {
@@ -975,14 +953,14 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
// reset chip
if (needWipe){
- ReaderTransmitBitsPar(wupC1,7,0, NULL);
- if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");
break;
};
ReaderTransmit(wipeC, sizeof(wipeC), NULL);
- if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wipeC error");
break;
};
@@ -995,20 +973,20 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
// write block
if (workFlags & 0x02) {
- ReaderTransmitBitsPar(wupC1,7,0, NULL);
- if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");
break;
};
ReaderTransmit(wupC2, sizeof(wupC2), NULL);
- if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error");
break;
};
}
- if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
+ if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("write block send command error");
break;
};
@@ -1017,7 +995,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
AppendCrc14443a(d_block, 16);
ReaderTransmit(d_block, sizeof(d_block), NULL);
- if ((ReaderReceive(receivedAnswer) != 1) || (receivedAnswer[0] != 0x0a)) {
+ if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("write block send data error");
break;
};
@@ -1038,7 +1016,6 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
LED_B_OFF();
if ((workFlags & 0x10) || (!isOK)) {
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
@@ -1061,46 +1038,39 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
// variables
byte_t isOK = 0;
- uint8_t data[18];
+ uint8_t data[18] = {0x00};
uint32_t cuid = 0;
- memset(data, 0x00, 18);
- uint8_t* receivedAnswer = mifare_get_bigbufptr();
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
if (workFlags & 0x08) {
- // clear trace
- iso14a_clear_trace();
- iso14a_set_tracing(TRUE);
-
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
- SpinDelay(300);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(100);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
+ clear_trace();
+ set_tracing(TRUE);
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
}
while (true) {
if (workFlags & 0x02) {
ReaderTransmitBitsPar(wupC1,7,0, NULL);
- if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");
break;
};
ReaderTransmit(wupC2, sizeof(wupC2), NULL);
- if(!ReaderReceive(receivedAnswer) || (receivedAnswer[0] != 0x0a)) {
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error");
break;
};
}
// read block
- if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, NULL) != 18)) {
+ if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {
if (MF_DBGLEVEL >= 1) Dbprintf("read block send command error");
break;
};
@@ -1122,9 +1092,95 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
LED_B_OFF();
if ((workFlags & 0x10) || (!isOK)) {
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
}
+void MifareCIdent(){
+
+ // card commands
+ uint8_t wupC1[] = { 0x40 };
+ uint8_t wupC2[] = { 0x43 };
+
+ // variables
+ byte_t isOK = 1;
+
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
+
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+ isOK = 0;
+ };
+
+ ReaderTransmit(wupC2, sizeof(wupC2), NULL);
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
+ isOK = 0;
+ };
+
+ if (mifare_classic_halt(NULL, 0)) {
+ isOK = 0;
+ };
+
+ cmd_send(CMD_ACK,isOK,0,0,0,0);
+}
+
+ //
+// DESFIRE
+//
+
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
+
+ byte_t dataout[11] = {0x00};
+ uint8_t uid[10] = {0x00};
+ uint32_t cuid;
+
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ int len = iso14443a_select_card(uid, NULL, &cuid);
+ if(!len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Can't select card");
+ //OnError(1);
+ return;
+ };
+
+ if(mifare_desfire_des_auth1(cuid, dataout)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR)
+ Dbprintf("Authentication part1: Fail.");
+ //OnError(4);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
+
+ cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));
+}
+
+void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
+
+ uint32_t cuid = arg0;
+ uint8_t key[16] = {0x00};
+ byte_t isOK = 0;
+ byte_t dataout[12] = {0x00};
+
+ memcpy(key, datain, 16);
+
+ isOK = mifare_desfire_des_auth2(cuid, key, dataout);
+
+ if( isOK) {
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+ Dbprintf("Authentication part2: Failed");
+ //OnError(4);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+ DbpString("AUTH 2 FINISHED");
+
+ cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
+}