X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e6ee6c4cd135c29fcd3812e0ceea8fe17497700d..bb84c38196e5d16fc8105a6d9c7340cd11b72692:/armsrc/mifarecmd.c
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 42dee56e..a240bed4 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,6 +15,10 @@
#include "mifarecmd.h"
#include "apps.h"
+#include "util.h"
+//#include "../client/loclass/des.h"
+#include "des.h"
+#include "crc.h"
//-----------------------------------------------------------------------------
// Select, Authenticate, Read a MIFARE tag.
@@ -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();
@@ -78,68 +83,169 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
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");
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 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();
-
-
- // Thats it...
+ cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
+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};
+ 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, NULL);
+ if(!len) {
+ 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_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;
+ }
+
+ 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)
@@ -153,7 +259,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
ui64Key = bytes_to_num(datain, 6);
// variables
- byte_t isOK;
+ byte_t isOK = 0;
byte_t dataoutbuf[16 * 16];
uint8_t uid[10];
uint32_t cuid;
@@ -162,8 +268,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);
@@ -195,7 +300,6 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
}
-
// ----------------------------- crypto1 destroy
crypto1_destroy(pcs);
@@ -208,61 +312,59 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// Thats it...
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-// iso14a_set_tracing(TRUE);
}
-
-void MifareUReadCard(uint8_t arg0, uint8_t *datain)
+void MifareUReadCard(uint8_t arg0, int arg1, 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;
-
- // clear trace
- iso14a_clear_trace();
-// iso14a_set_tracing(false);
+ // params
+ uint8_t sectorNo = arg0;
+ int Pages = arg1;
+ int countpages = 0;
+ byte_t dataout[176] = {0x00};;
+ uint32_t cuid = 0x00;
- 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;
- };
- 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");
+ int len = iso14443a_select_card(NULL, NULL, &cuid);
+ if (!len) {
+ 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(sectorNo * 4 + i, dataout + 4 * i);
+
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
+ OnError(2);
+ return;
+ } else {
+ countpages++;
+ }
+ }
+
+ len = mifare_ultra_halt();
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+ OnError(3);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_ALL) Dbprintf("Pages read %d", countpages);
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
- LED_B_OFF();
+ len = 16*4; //64 bytes
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
+ // Read a UL-C
+ if (Pages == 44 && countpages > 16)
+ len = 176;
+ cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
}
@@ -290,8 +392,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);
@@ -337,129 +438,154 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// 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);
+ uint8_t uid[10] = {0x00};
- 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;
+ };
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
+ 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");
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// iso14a_set_tracing(TRUE);
+ 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];
+ byte_t blockdata[4] = {0x00};
memcpy(blockdata, datain,4);
- // variables
- byte_t isOK = 0;
- uint8_t uid[10];
- uint32_t cuid;
+ uint8_t uid[10] = {0x00};
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+ clear_trace();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- // clear trace
- iso14a_clear_trace();
- // iso14a_set_tracing(false);
+ if(!iso14443a_select_card(uid, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ if(mifare_ultra_special_writeblock(blockNo, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(0);
+ return;
+ };
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ if(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
+ if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- if(mifare_ultra_special_writeblock(cuid, blockNo, blockdata)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
- break;
- };
+ cmd_send(CMD_ACK,1,0,0,0,0);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
+}
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
+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);
- isOK = 1;
- break;
- }
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+ 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;
+ };
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
+ 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;
+ };
- // Thats it...
+ 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();
-// iso14a_set_tracing(TRUE);
-
}
-
// 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;
@@ -486,7 +612,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];
@@ -494,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 = 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);
@@ -512,6 +641,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;
@@ -610,19 +740,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;
@@ -657,10 +786,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);
@@ -676,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);
}
//-----------------------------------------------------------------------------
@@ -705,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);
@@ -740,7 +865,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();
@@ -757,7 +881,6 @@ void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
Dbprintf("Debug level: %d", MF_DBGLEVEL);
}
-
//-----------------------------------------------------------------------------
// Work with emulator memory
//
@@ -766,23 +889,19 @@ void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain)
emlClearMem();
}
-
void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
emlSetMem(datain, arg0, arg1); // data, block num, blocks count
}
-
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();
}
-
//-----------------------------------------------------------------------------
// Load a card into the emulator memory
//
@@ -802,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);
@@ -891,54 +1010,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;
};
@@ -951,20 +1065,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;
};
@@ -973,7 +1087,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;
};
@@ -994,7 +1108,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();
}
@@ -1017,46 +1130,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;
};
@@ -1078,9 +1184,90 @@ 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 = 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();
+}