X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/05446d5bc3d9263efc6a12026f6cf84bb421735e..09c2a802a1edc929e72c804bfc145062abe8f39e:/armsrc/mifarecmd.c
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 94bc1c1c..1004e342 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -16,7 +16,8 @@
#include "mifarecmd.h"
#include "apps.h"
#include "util.h"
-
+//#include "../client/loclass/des.h"
+#include "des.h"
#include "crc.h"
//-----------------------------------------------------------------------------
@@ -89,108 +90,181 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
- byte_t isOK = 0;
byte_t dataoutbuf[16] = {0x00};
uint8_t uid[10] = {0x00};
- uint32_t cuid;
+ uint32_t cuid = 0x00;
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ 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 >= MF_DBG_ERROR)
- Dbprintf("Can't select card");
- //OnError(0);
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+ OnError(0);
return;
};
- if(mifare_ultra_auth1(cuid, dataoutbuf)){
- if (MF_DBGLEVEL >= MF_DBG_ERROR)
- Dbprintf("Authentication part1: Fail.");
- //OnError(1);
+ if(mifare_ultra_auth1(dataoutbuf)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+ OnError(1);
return;
}
- isOK = 1;
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
- DbpString("AUTH 1 FINISHED");
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
- cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
+ cmd_send(CMD_ACK,1,cuid,0,dataoutbuf,11);
LEDsoff();
}
void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
- uint32_t cuid = arg0;
uint8_t key[16] = {0x00};
- byte_t isOK = 0;
byte_t dataoutbuf[16] = {0x00};
memcpy(key, datain, 16);
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
- if(mifare_ultra_auth2(cuid, key, dataoutbuf)){
- if (MF_DBGLEVEL >= MF_DBG_ERROR)
- Dbprintf("Authentication part2: Fail...");
- //OnError(1);
+ if(mifare_ultra_auth2(key, dataoutbuf)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part2: Fail...");
+ OnError(1);
return;
}
- isOK = 1;
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
- DbpString("AUTH 2 FINISHED");
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);
+ cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
-void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
+void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
{
uint8_t blockNo = arg0;
byte_t dataout[16] = {0x00};
uint8_t uid[10] = {0x00};
- uint32_t cuid;
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ uint8_t key[16] = {0x00};
+ bool usePwd = (arg1 == 1);
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- int len = iso14443a_select_card(uid, NULL, &cuid);
+ int len = iso14443a_select_card(uid, NULL, NULL);
if(!len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
- //OnError(1);
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
+ OnError(1);
return;
- };
-
- len = mifare_ultra_readblock(cuid, blockNo, dataout);
- if(len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
- //OnError(2);
+ }
+
+ // authenticate here.
+ if ( usePwd ) {
+
+ memcpy(key, datain, 16);
+
+ uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };
+ uint8_t random_b[8] = {0x00};
+ uint8_t enc_random_b[8] = {0x00};
+ uint8_t rnd_ab[16] = {0x00};
+ uint8_t IV[8] = {0x00};
+
+ uint16_t len;
+ uint8_t receivedAnswer[MAX_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
+
+ len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);
+ if (len != 11) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+ OnError(1);
+ return;
+ }
+
+ // tag nonce.
+ memcpy(enc_random_b,receivedAnswer+1,8);
+
+ // decrypt nonce.
+ tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );
+
+
+ rol(random_b,8);
+
+ memcpy(rnd_ab ,random_a,8);
+ memcpy(rnd_ab+8,random_b,8);
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+ Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
+ 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]);
+
+ Dbprintf(" B: %02x %02x %02x %02x %02x %02x %02x %02x",
+ random_b[0],random_b[1],random_b[2],random_b[3],
+ random_b[4],random_b[5],random_b[6],random_b[7]);
+
+ Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
+ rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
+ rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+
+ Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
+ rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
+ rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );
+ }
+
+ // encrypt out, in, length, key, iv
+ tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
+
+
+ len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);
+ if (len != 11) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+ OnError(1);
+ return;
+ }
+
+ uint8_t enc_resp[8] = { 0 };
+ uint8_t resp_random_a[8] = { 0 };
+ memcpy(enc_resp, receivedAnswer+1, 8);
+
+ // decrypt out, in, length, key, iv
+ tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
+ if ( memcmp(resp_random_a, random_a, 8) != 0 )
+ Dbprintf("failed authentication");
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
+ Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
+ rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
+ rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
+
+ Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
+ rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
+ rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);
+
+ Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",
+ random_a[0],random_a[1],random_a[2],random_a[3],
+ random_a[4],random_a[5],random_a[6],random_a[7]);
+
+ Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",
+ resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
+ resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
+ }
+ }
+
+ if( mifare_ultra_readblock(blockNo, dataout) ) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
+ OnError(2);
return;
- };
+ }
- len = mifare_ultra_halt(cuid);
- if(len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
- //OnError(3);
+ if( mifare_ultra_halt() ) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+ OnError(3);
return;
- };
+ }
cmd_send(CMD_ACK,1,0,0,dataout,16);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
-
//-----------------------------------------------------------------------------
// Select, Authenticate, Read a MIFARE tag.
// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
@@ -261,71 +335,52 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
{
- // params
- uint8_t sectorNo = arg0;
+ // params
+ uint8_t sectorNo = arg0;
int Pages = arg1;
- int count_Pages = 0;
- byte_t dataout[176] = {0x00};;
- uint8_t uid[10] = {0x00};
- uint32_t cuid;
+ int countpages = 0;
+ uint8_t dataout[176] = {0x00};;
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
- if (MF_DBGLEVEL >= MF_DBG_ALL)
- Dbprintf("Pages %d",Pages);
-
+ LEDsoff();
+ LED_A_ON();
clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- int len = iso14443a_select_card(uid, NULL, &cuid);
-
+ int len = iso14443a_select_card(NULL, NULL, NULL);
if (!len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR)
- Dbprintf("Can't select card");
- //OnError(1);
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);
+ OnError(1);
return;
}
for (int i = 0; i < Pages; i++){
- len = mifare_ultra_readblock(cuid, sectorNo * 4 + i, dataout + 4 * i);
+ len = mifare_ultra_readblock(sectorNo * 4 + i, dataout + 4 * i);
if (len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR)
- Dbprintf("Read block %d error",i);
- //OnError(2);
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
+ OnError(2);
return;
} else {
- count_Pages++;
+ countpages++;
}
}
- len = mifare_ultra_halt(cuid);
- if (len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR)
- Dbprintf("Halt error");
- //OnError(3);
+ if (mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+ OnError(3);
return;
}
- if (MF_DBGLEVEL >= MF_DBG_ALL) {
- Dbprintf("Pages read %d", count_Pages);
- }
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Pages read %d", countpages);
- len = 16*4; //64 bytes
-
- // Read a UL-C
- if (Pages == 44 && count_Pages > 16)
- len = 176;
+ len = Pages*4;
cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
-
//-----------------------------------------------------------------------------
// Select, Authenticate, Write a MIFARE tag.
// read block
@@ -400,94 +455,144 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
{
- // params
- uint8_t blockNo = arg0;
+ uint8_t blockNo = arg0;
byte_t blockdata[16] = {0x00};
- memcpy(blockdata, datain,16);
+ memcpy(blockdata, datain, 16);
- // variables
- byte_t isOK = 0;
uint8_t uid[10] = {0x00};
- uint32_t cuid;
- 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);
- 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;
- };
-
- if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
- break;
- };
-
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- isOK = 1;
- break;
- }
-
- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+ if(!iso14443a_select_card(uid, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
+
+ if(mifare_ultra_writeblock(blockNo, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(0);
+ return; };
+
+ if(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
+
+ if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- cmd_send(CMD_ACK,isOK,0,0,0,0);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
+ cmd_send(CMD_ACK,1,0,0,0,0);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
}
void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
{
- // params
uint8_t blockNo = arg0;
byte_t blockdata[4] = {0x00};
memcpy(blockdata, datain,4);
- // variables
- byte_t isOK = 0;
uint8_t uid[10] = {0x00};
- uint32_t cuid;
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ if(!iso14443a_select_card(uid, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
+
+ if(mifare_ultra_special_writeblock(blockNo, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(0);
+ return;
+ };
+
+ if(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
+
+ if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+ cmd_send(CMD_ACK,1,0,0,0,0);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
+}
+
+void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
+
+ uint8_t pwd[16] = {0x00};
+ byte_t blockdata[4] = {0x00};
+
+ memcpy(pwd, datain, 16);
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
+ blockdata[0] = pwd[7];
+ blockdata[1] = pwd[6];
+ blockdata[2] = pwd[5];
+ blockdata[3] = pwd[4];
+ if(mifare_ultra_special_writeblock( 44, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(44);
+ return;
+ };
- if(mifare_ultra_special_writeblock(cuid, blockNo, blockdata)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
- break;
- };
+ blockdata[0] = pwd[3];
+ blockdata[1] = pwd[2];
+ blockdata[2] = pwd[1];
+ blockdata[3] = pwd[0];
+ if(mifare_ultra_special_writeblock( 45, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(45);
+ return;
+ };
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
+ blockdata[0] = pwd[15];
+ blockdata[1] = pwd[14];
+ blockdata[2] = pwd[13];
+ blockdata[3] = pwd[12];
+ if(mifare_ultra_special_writeblock( 46, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(46);
+ return;
+ };
- isOK = 1;
- break;
- }
+ blockdata[0] = pwd[11];
+ blockdata[1] = pwd[10];
+ blockdata[2] = pwd[9];
+ blockdata[3] = pwd[8];
+ if(mifare_ultra_special_writeblock( 47, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(47);
+ return;
+ };
- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+ if(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
- cmd_send(CMD_ACK,isOK,0,0,0,0);
+ cmd_send(CMD_ACK,1,0,0,0,0);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
@@ -1126,7 +1231,75 @@ void MifareCIdent(){
cmd_send(CMD_ACK,isOK,0,0,0,0);
}
- //
+void MifareCollectNonces(uint32_t arg0, uint32_t arg1){
+
+ BigBuf_free();
+
+ uint32_t iterations = arg0;
+ uint8_t uid[10] = {0x00};
+
+ uint8_t *response = BigBuf_malloc(MAX_MIFARE_FRAME_SIZE);
+ uint8_t *responsePar = BigBuf_malloc(MAX_MIFARE_PARITY_SIZE);
+
+ uint8_t mf_auth[] = { 0x60,0x00,0xf5,0x7b };
+
+ // get memory from BigBuf.
+ uint8_t *nonces = BigBuf_malloc(iterations * 4);
+
+ LED_A_ON();
+ LED_B_OFF();
+ LED_C_OFF();
+
+ clear_trace();
+ set_tracing(TRUE);
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ for (int i = 0; i < iterations; i++) {
+
+ WDT_HIT();
+
+ // Test if the action was cancelled
+ if(BUTTON_PRESS()) break;
+
+ // if(mifare_classic_halt(pcs, cuid)) {
+ // if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ //}
+
+ if(!iso14443a_select_card(uid, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ continue;
+ };
+
+ // Transmit MIFARE_CLASSIC_AUTH.
+ ReaderTransmit(mf_auth, sizeof(mf_auth), NULL);
+
+ // Receive the (4 Byte) "random" nonce
+ if (!ReaderReceive(response, responsePar)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Couldn't receive tag nonce");
+ continue;
+ }
+
+ nonces[i*4] = bytes_to_num(response, 4);
+ }
+
+ int packLen = iterations * 4;
+ int packSize = 0;
+ int packNum = 0;
+ while (packLen > 0) {
+ packSize = MIN(USB_CMD_DATA_SIZE, packLen);
+ LED_B_ON();
+ cmd_send(CMD_ACK, 77, 0, packSize, nonces - packLen, packSize);
+ LED_B_OFF();
+
+ packLen -= packSize;
+ packNum++;
+ }
+
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
+}
+
+//
// DESFIRE
//
@@ -1134,28 +1307,25 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
byte_t dataout[11] = {0x00};
uint8_t uid[10] = {0x00};
- uint32_t cuid;
+ uint32_t cuid = 0x00;
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);
+ 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);
+ 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));
}
@@ -1163,22 +1333,20 @@ 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};
+ byte_t isOK = 0;
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);
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
+ OnError(4);
return;
}
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
- DbpString("AUTH 2 FINISHED");
+ 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);