X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1604d0a2909a6ae1a5b615d280671d867c1028a4..70ee301e0d21f73949173483f7e6728deb9c8b32:/armsrc/mifarecmd.c
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 6a491b53..6bb04caf 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -2,6 +2,9 @@
// Merlok - June 2011, 2012
// Gerhard de Koning Gans - May 2008
// Hagen Fritsch - June 2010
+// Midnitesnake - Dec 2013
+// Andy Davies - Apr 2014
+// Iceman - May 2014
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
@@ -12,9 +15,13 @@
#include "mifarecmd.h"
#include "apps.h"
+#include "util.h"
+//#include "../client/loclass/des.h"
+#include "des.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)
@@ -35,9 +42,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
pcs = &mpcs;
// clear trace
- iso14a_clear_trace();
-// iso14a_set_tracing(false);
-
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
LED_A_ON();
@@ -46,22 +51,22 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
while (true) {
if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
break;
};
if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+ if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
break;
};
if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
+ if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
break;
};
if(mifare_classic_halt(pcs, cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
break;
};
@@ -74,83 +79,195 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
-
-// UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
-// memcpy(ack.d.asBytes, dataoutbuf, 16);
-
LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+ cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
LED_B_OFF();
-
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-// iso14a_set_tracing(TRUE);
-
}
-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];
- uint32_t cuid;
+
+void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
+
+ byte_t dataoutbuf[16] = {0x00};
+ uint8_t uid[10] = {0x00};
+ 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);
+
+ if(!iso14443a_select_card(uid, NULL, &cuid)) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
+
+ if(mifare_ultra_auth1(dataoutbuf)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+ OnError(1);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ cmd_send(CMD_ACK,1,cuid,0,dataoutbuf,11);
+ LEDsoff();
+}
+void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
+
+ uint8_t key[16] = {0x00};
+ byte_t dataoutbuf[16] = {0x00};
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
-
- if(mifare_ultra_readblock(cuid, blockNo, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block error");
- break;
- };
-
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- isOK = 1;
- break;
+ memcpy(key, datain, 16);
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+
+ if(mifare_ultra_auth2(key, dataoutbuf)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part2: Fail...");
+ OnError(1);
+ return;
}
- if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
-
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
- LED_B_OFF();
-
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
- // Thats it...
+ cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
+// Arg0 = BlockNo,
+// Arg1 = UsePwd bool
+// datain = PWD bytes,
+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};
+ bool usePwd = (arg1 == 1);
+
+ LEDsoff();
+ LED_A_ON();
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ int len = iso14443a_select_card(uid, NULL, NULL);
+ if(!len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
+ OnError(1);
+ return;
+ }
+
+ // authenticate here.
+ if ( usePwd ) {
+
+ uint8_t key[16] = {0x00};
+ 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;
+ }
+
+ 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, Authenticaate, Read an MIFARE tag.
-// read sector (data = 4 x 16 bytes = 64 bytes)
+// Select, Authenticate, Read a MIFARE tag.
+// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
//-----------------------------------------------------------------------------
void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
{
@@ -162,7 +279,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// variables
byte_t isOK = 0;
- byte_t dataoutbuf[16 * 4];
+ byte_t dataoutbuf[16 * 16];
uint8_t uid[10];
uint32_t cuid;
struct Crypto1State mpcs = {0, 0};
@@ -170,8 +287,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
pcs = &mpcs;
// clear trace
- iso14a_clear_trace();
-// iso14a_set_tracing(false);
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -179,134 +295,150 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
LED_B_OFF();
LED_C_OFF();
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
+ isOK = 1;
+ if(!iso14443a_select_card(uid, NULL, &cuid)) {
+ isOK = 0;
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
+ }
- if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {
+
+ if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+ isOK = 0;
if (MF_DBGLEVEL >= 1) Dbprintf("Auth error");
+ }
+
+ for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+ if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {
+ isOK = 0;
+ if (MF_DBGLEVEL >= 1) Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);
break;
- };
-
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf + 16 * 0)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 0 error");
- break;
- };
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf + 16 * 1)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 1 error");
- break;
- };
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf + 16 * 2)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 2 error");
- break;
- };
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf + 16 * 3)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 3 error");
- break;
- };
+ }
+ }
- if(mifare_classic_halt(pcs, cuid)) {
+ if(mifare_classic_halt(pcs, cuid)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- isOK = 1;
- break;
}
-
+
// ----------------------------- crypto1 destroy
crypto1_destroy(pcs);
if (MF_DBGLEVEL >= 2) DbpString("READ SECTOR FINISHED");
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
-
-// UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
-// memcpy(ack.d.asBytes, dataoutbuf, 16 * 2);
-
LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,32);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
-// SpinDelay(100);
-
-// memcpy(ack.d.asBytes, dataoutbuf + 16 * 2, 16 * 2);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf+32, 32);
+ cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16*NumBlocksPerSector(sectorNo));
LED_B_OFF();
// Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-// iso14a_set_tracing(TRUE);
-
}
-void MifareUReadCard(uint8_t arg0, uint8_t *datain)
+// arg0 = blockNo (start)
+// arg1 = Pages (number of blocks)
+// arg2 = useKey
+// datain = KEY bytes
+void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
{
- // params
- uint8_t sectorNo = arg0;
-
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16 * 4];
- uint8_t uid[10];
- uint32_t cuid;
+ // params
+ uint8_t blockNo = arg0;
+ uint16_t blocks = arg1;
+ bool useKey = (arg2 == 1);
+ int countpages = 0;
+ uint8_t dataout[176] = {0x00};;
- // clear trace
- iso14a_clear_trace();
-// iso14a_set_tracing(false);
+ LEDsoff();
+ LED_A_ON();
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ int len = iso14443a_select_card(NULL, NULL, NULL);
+ if (!len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);
+ OnError(1);
+ return;
+ }
+
+ // authenticate
+ if ( useKey ) {
+
+ uint8_t key[16] = {0x00};
+ 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);
+
+ // encrypt out, in, length, key, iv
+ tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
- 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;
- };
- for(int sec=0;sec<16;sec++){
- if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block %d error",sec);
- break;
- };
- }
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- isOK = 1;
- break;
- }
-
- if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");
+ len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);
+ if (len != 11) {
+ OnError(1);
+ return;
+ }
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
- //cmd_send(CMD_ACK,isOK,0,0,dataoutbuf+32, 32);
- LED_B_OFF();
+ 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");
+ }
+
+ for (int i = 0; i < blocks; i++){
+
+ len = mifare_ultra_readblock(blockNo * 4 + i, dataout + 4 * i);
+
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
+ OnError(2);
+ return;
+ } else {
+ countpages++;
+ }
+ }
+
+ if (mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+ OnError(3);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("blocks read %d", countpages);
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// iso14a_set_tracing(TRUE);
+ len = blocks*4;
+ cmd_send(CMD_ACK, 1, len, 0, dataout, len);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
}
-
//-----------------------------------------------------------------------------
-// Select, Authenticaate, Read an MIFARE tag.
+// Select, Authenticate, Write a MIFARE tag.
// read block
//-----------------------------------------------------------------------------
void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
@@ -329,8 +461,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
pcs = &mpcs;
// clear trace
- iso14a_clear_trace();
-// iso14a_set_tracing(false);
+ clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -368,159 +499,168 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
-
-// UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
-
LED_B_ON();
cmd_send(CMD_ACK,isOK,0,0,0,0);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
LED_B_OFF();
// Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-// iso14a_set_tracing(TRUE);
-
}
void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
{
- // params
- uint8_t blockNo = arg0;
- byte_t blockdata[16];
+ uint8_t blockNo = arg0;
+ byte_t blockdata[16] = {0x00};
- memset(blockdata,'\0',16);
- memcpy(blockdata, datain,16);
+ memcpy(blockdata, datain, 16);
- // variables
- byte_t isOK = 0;
- uint8_t uid[10];
- uint32_t cuid;
-
- // clear trace
- iso14a_clear_trace();
- // iso14a_set_tracing(false);
-
- 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");
-
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,0,0);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
+ uint8_t uid[10] = {0x00};
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// iso14a_set_tracing(TRUE);
+ 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,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];
-
+ uint8_t blockNo = arg0;
+ byte_t blockdata[4] = {0x00};
+ uint8_t uid[10] = {0x00};
+
memcpy(blockdata, datain,4);
+
+ LEDsoff();
+ LED_A_ON();
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- // variables
- byte_t isOK = 0;
- uint8_t uid[10];
- uint32_t cuid;
-
- // clear trace
- iso14a_clear_trace();
- // iso14a_set_tracing(false);
-
- 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_special_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(!iso14443a_select_card(uid, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+ if(mifare_ultra_special_writeblock(blockNo, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(0);
+ return;
+ };
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
+ if(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,0,0);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
- LED_B_OFF();
+ if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+ cmd_send(CMD_ACK,1,0,0,0,0);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
+}
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// iso14a_set_tracing(TRUE);
+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);
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
+
+ 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;
+ };
+
+ 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;
+ };
+
+ 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;
+ };
+
+ 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(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
+
+ 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, 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;
}
-
//-----------------------------------------------------------------------------
// MIFARE nested authentication.
//
@@ -541,7 +681,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];
@@ -549,14 +690,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);
@@ -567,6 +710,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;
@@ -665,19 +809,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;
@@ -712,10 +855,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);
@@ -731,7 +870,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);
}
//-----------------------------------------------------------------------------
@@ -760,8 +899,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);
@@ -769,18 +908,11 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
LED_B_OFF();
LED_C_OFF();
-// SpinDelay(300);
for (i = 0; i < keyCount; i++) {
-// FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-// SpinDelay(100);
-// FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
- // prepare next select by sending a HALT. There is no need to power down the card.
if(mifare_classic_halt(pcs, cuid)) {
if (MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Halt error");
}
- // SpinDelay(50);
-
if(!iso14443a_select_card(uid, NULL, &cuid)) {
if (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card");
break;
@@ -798,15 +930,10 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// ----------------------------- crypto1 destroy
crypto1_destroy(pcs);
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
-
LED_B_ON();
cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);
LED_B_OFF();
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
@@ -836,14 +963,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){
-// UsbCommand ack = {CMD_ACK, {arg0, arg1, 0}};
-
- byte_t buf[48];
- emlGetMem(buf, arg0, arg1); // data, block num, blocks count
+ 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);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+ cmd_send(CMD_ACK,arg0,arg1,0,buf,USB_CMD_DATA_SIZE);
LED_B_OFF();
}
@@ -852,8 +976,7 @@ void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
//
//-----------------------------------------------------------------------------
void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
- int i;
- uint8_t sectorNo = 0;
+ uint8_t numSectors = arg0;
uint8_t keyType = arg1;
uint64_t ui64Key = 0;
uint32_t cuid;
@@ -867,8 +990,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);
@@ -876,63 +999,51 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
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;
- };
-
- for (i = 0; i < 16; i++) {
- sectorNo = i;
- ui64Key = emlGetKey(sectorNo, keyType);
-
- if (!i){
- if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_FIRST)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%d]. Auth error", i);
- break;
- }
- } else {
- if(mifare_classic_auth(pcs, cuid, sectorNo * 4, keyType, ui64Key, AUTH_NESTED)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%d]. Auth nested error", i);
- break;
- }
- }
+ bool isOK = true;
+
+ if(!iso14443a_select_card(uid, NULL, &cuid)) {
+ isOK = false;
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ }
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 0, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 0 error");
- break;
- };
- emlSetMem(dataoutbuf, sectorNo * 4 + 0, 1);
-
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 1, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 1 error");
+ for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {
+ ui64Key = emlGetKey(sectorNo, keyType);
+ if (sectorNo == 0){
+ if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
+ isOK = false;
+ if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);
break;
- };
- emlSetMem(dataoutbuf, sectorNo * 4 + 1, 1);
-
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 2, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 2 error");
+ }
+ } else {
+ if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {
+ isOK = false;
+ if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth nested error", sectorNo);
break;
- };
- emlSetMem(dataoutbuf, sectorNo * 4 + 2, 1);
-
- // get block 3 bytes 6-9
- if(mifare_classic_readblock(pcs, cuid, sectorNo * 4 + 3, dataoutbuf)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block 3 error");
+ }
+ }
+
+ for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
+ if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {
+ isOK = false;
+ if (MF_DBGLEVEL >= 1) Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);
break;
};
- emlGetMem(dataoutbuf2, sectorNo * 4 + 3, 1);
- memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
- emlSetMem(dataoutbuf2, sectorNo * 4 + 3, 1);
+ if (isOK) {
+ if (blockNo < NumBlocksPerSector(sectorNo) - 1) {
+ emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);
+ } else { // sector trailer, keep the keys, set only the AC
+ emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
+ memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);
+ emlSetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);
+ }
+ }
}
- if(mifare_classic_halt(pcs, cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- break;
- }
+ }
+
+ if(mifare_classic_halt(pcs, cuid)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ };
// ----------------------------- crypto1 destroy
crypto1_destroy(pcs);
@@ -942,16 +1053,8 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");
- // add trace trailer
- memset(uid, 0x44, 4);
- LogTrace(uid, 4, 0, 0, TRUE);
}
-//-----------------------------------------------------------------------------
-// MIFARE 1k emulator
-//
-//-----------------------------------------------------------------------------
-
//-----------------------------------------------------------------------------
// Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)
@@ -976,54 +1079,49 @@ 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)) {
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;
};
};
// 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;
};
@@ -1036,20 +1134,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;
};
@@ -1058,7 +1156,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;
};
@@ -1074,31 +1172,17 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
break;
}
-// UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
-// if (isOK) memcpy(ack.d.asBytes, uid, 4);
-
- // add trace trailer
- /**
- * Removed by Martin, the uid is overwritten with 0x44,
- * which can 't be intended.
- *
- * memset(uid, 0x44, 4);
- * LogTrace(uid, 4, 0, 0, TRUE);
- **/
-
-
LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,uid,4);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+ cmd_send(CMD_ACK,isOK,0,0,uid,4);
LED_B_OFF();
if ((workFlags & 0x10) || (!isOK)) {
- // Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
}
+
void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
// params
@@ -1115,46 +1199,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;
};
@@ -1171,26 +1248,162 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
break;
}
-// UsbCommand ack = {CMD_ACK, {isOK, 0, 0}};
-// if (isOK) memcpy(ack.d.asBytes, data, 18);
-
- // add trace trailer
- /*
- * Removed by Martin, this piece of overwrites the 'data' variable
- * which is sent two lines down, and is obviously not correct.
- *
- * memset(data, 0x44, 4);
- * LogTrace(data, 4, 0, 0, TRUE);
- */
LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,data,18);
-// UsbSendPacket((uint8_t *)&ack, sizeof(UsbCommand));
+ cmd_send(CMD_ACK,isOK,0,0,data,18);
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);
+}
+
+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
+//
+
+void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
+
+ byte_t dataout[11] = {0x00};
+ uint8_t uid[10] = {0x00};
+ 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);
+ 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 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);
+ 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();
+}