X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/225ccb910e9de6c38b6d1c81d4fc025d05c13570..e8b07838ab6119cc3b90f48b51bd2b54eece94be:/armsrc/mifarecmd.c?ds=sidebyside
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 27c0ce13..a240bed4 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -16,8 +16,9 @@
#include "mifarecmd.h"
#include "apps.h"
#include "util.h"
-#include "desfire.h"
-#include "../common/crc.h"
+//#include "../client/loclass/des.h"
+#include "des.h"
+#include "crc.h"
//-----------------------------------------------------------------------------
// Select, Authenticate, Read a MIFARE tag.
@@ -41,7 +42,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();
@@ -76,7 +77,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// ----------------------------- crypto1 destroy
crypto1_destroy(pcs);
- if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
+ if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
LED_B_ON();
cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
@@ -88,104 +89,163 @@ 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] = {0x00};
uint8_t uid[10] = {0x00};
- uint32_t cuid;
+ uint32_t cuid = 0x00;
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
- // clear trace
- iso14a_clear_trace();
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
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(mifare_ultra_auth1(dataoutbuf)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+ OnError(1);
+ return;
}
- isOK=1;
- if (MF_DBGLEVEL >= 2) DbpString("AUTH 1 FINISHED");
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
- LED_B_ON();
- 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 >= 1) Dbprintf("Authentication part2: Fail...");
+ if(mifare_ultra_auth2(key, dataoutbuf)){
+ 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();
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
+ 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;
+ uint8_t key[16] = {0x00};
+ bool usePwd = (arg1 == 1);
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
- iso14a_clear_trace();
+ 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");
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
OnError(1);
return;
- };
+ }
+
+ // authenticate here.
+ if ( usePwd ) {
+
+ memcpy(key, datain, 16);
+
+ // 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] );
+ // 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] );
+
+ uint8_t a[8] = {1,1,1,1,1,1,1,1 };
+ uint8_t b[8] = {0x00};
+ uint8_t enc_b[8] = {0x00};
+ uint8_t ab[16] = {0x00};
+ uint8_t enc_ab[16] = {0x00};
+ uint8_t enc_key[8] = {0x00};
+
+ uint16_t len;
+ uint8_t receivedAnswer[MAX_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
- len = mifare_ultra_readblock(cuid, blockNo, dataout);
- if(len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
+ 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_b,receivedAnswer+1,8);
+
+ // decrypt nonce.
+ tdes_2key_dec(b, enc_b, 8, key );
+
+ 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] );
+ 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] );
+ rol(b,8);
+
+ memcpy(ab ,a,8);
+ memcpy(ab+8,b,8);
+
+ 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] );
+ 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] );
+
+ // encrypt
+ tdes_2key_enc(enc_ab, ab, 16, key);
+
+ 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] );
+ 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] );
+
+ len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, enc_ab, receivedAnswer, receivedAnswerPar, NULL);
+ if (len != 11) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+ OnError(1);
+ return;
+ }
+
+ // the tags' encryption of our nonce, A.
+ memcpy(enc_key, receivedAnswer+1, 8);
+
+ // clear B.
+ memset(b, 0x00, 8);
+
+ // decrypt
+ tdes_2key_dec(b, enc_key, 8, key );
+ if ( memcmp(a, b, 8) == 0 )
+ Dbprintf("Verified key");
+ else
+ Dbprintf("failed authentication");
+
+ 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] );
+ 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] );
+ }
+
+ 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");
+ }
+
+ 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)
@@ -208,7 +268,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);
@@ -259,60 +319,47 @@ void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)
// params
uint8_t sectorNo = arg0;
int Pages = arg1;
- int count_Pages = 0;
+ int countpages = 0;
byte_t dataout[176] = {0x00};;
- uint8_t uid[10] = {0x00};
- uint32_t cuid;
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ uint32_t cuid = 0x00;
- if (MF_DBGLEVEL >= MF_DBG_ALL)
- Dbprintf("Pages %d",Pages);
-
- iso14a_clear_trace();
+ 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(NULL, NULL, &cuid);
if (!len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR)
- Dbprintf("Can't select card");
+ 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);
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
OnError(2);
return;
} else {
- count_Pages++;
+ countpages++;
}
}
- len = mifare_ultra_halt(cuid);
+ len = mifare_ultra_halt();
if (len) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR)
- Dbprintf("Halt error");
+ 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_ALL) Dbprintf("Pages read %d", countpages);
len = 16*4; //64 bytes
-
+
// Read a UL-C
- if (Pages == 44 && count_Pages > 16)
+ if (Pages == 44 && countpages > 16)
len = 176;
cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
@@ -345,7 +392,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);
@@ -395,100 +442,150 @@ 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);
-
- // variables
- byte_t isOK = 0;
+ memcpy(blockdata, datain, 16);
+
uint8_t uid[10] = {0x00};
- uint32_t cuid;
- iso14a_clear_trace();
+ 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(!iso14443a_select_card(uid, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
- if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
- break;
- };
+ if(mifare_ultra_writeblock(blockNo, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(0);
+ return; };
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
+ if(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
- isOK = 1;
- break;
- }
-
if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- cmd_send(CMD_ACK,isOK,0,0,0,0);
+ 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);
- iso14a_clear_trace();
+ 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();
}
// Return 1 if the nonce is invalid else return 0
-int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_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;
@@ -524,14 +621,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 = get_bigbufptr_recvrespbuf();
+ 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);
@@ -545,7 +644,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
WDT_HIT();
davg = dmax = 0;
- dmin = 2000;
+ dmin = 2000;
delta_time = 0;
for (rtr = 0; rtr < 17; rtr++) {
@@ -582,7 +681,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
};
nttmp = prng_successor(nt1, 100); //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160
- for (i = 141; i < 1200; i++) {
+ for (i = 101; i < 1200; i++) {
nttmp = prng_successor(nttmp, 1);
if (nttmp == nt2) break;
}
@@ -600,7 +699,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
}
}
- if (rtr <= 1) return;
+ if (rtr <= 1) return;
davg = (davg + (rtr - 1)/2) / (rtr - 1);
@@ -619,18 +718,9 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
// get crypted nonces for target sector
for(i=0; i < 2; i++) { // look for exactly two different nonces
- WDT_HIT();
- if(BUTTON_PRESS()) {
- DbpString("Nested: cancelled");
- crypto1_destroy(pcs);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
- return;
- }
-
target_nt[i] = 0;
while(target_nt[i] == 0) { // continue until we have an unambiguous nonce
-
+
// prepare next select. No need to power down the card.
if(mifare_classic_halt(pcs, cuid)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Halt error");
@@ -690,7 +780,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
if (target_nt[i] == 0 && j == dmax+1 && MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (all invalid)", i+1);
}
}
-
+
LED_C_OFF();
// ----------------------------- crypto1 destroy
@@ -711,7 +801,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);
}
//-----------------------------------------------------------------------------
@@ -740,8 +830,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);
@@ -831,8 +921,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);
@@ -924,17 +1014,17 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
uint8_t d_block[18] = {0x00};
uint32_t cuid;
- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();
- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;
-
+ 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();
-
- iso14a_clear_trace();
- iso14a_set_tracing(TRUE);
+
+ clear_trace();
+ set_tracing(TRUE);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
}
@@ -944,12 +1034,12 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
if (workFlags & 0x01) {
if(!iso14443a_select_card(uid, NULL, &cuid)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
+ //break;
};
if(mifare_classic_halt(NULL, cuid)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
+ //break;
};
};
@@ -1043,16 +1133,16 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
uint8_t data[18] = {0x00};
uint32_t cuid = 0;
- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();
- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;
+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
if (workFlags & 0x08) {
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
-
- iso14a_clear_trace();
- iso14a_set_tracing(TRUE);
+
+ clear_trace();
+ set_tracing(TRUE);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
}
@@ -1108,8 +1198,8 @@ void MifareCIdent(){
// variables
byte_t isOK = 1;
- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();
- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;
+ 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)) {
@@ -1128,7 +1218,7 @@ void MifareCIdent(){
cmd_send(CMD_ACK,isOK,0,0,0,0);
}
-//
+ //
// DESFIRE
//
@@ -1136,28 +1226,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;
- iso14a_clear_trace();
+ 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");
+ 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.");
+ 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));
}
@@ -1165,24 +1252,22 @@ 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");
+ 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);
LEDsoff();
-}
\ No newline at end of file
+}