X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6ff6ade2f5f24ffb52a9f90238ee7b8c77edc89c..8fac5452b851fe2f6427c8eb8fc833018f75d330:/armsrc/mifarecmd.c?ds=sidebyside
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index fc480a38..73fb8a5a 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -16,8 +16,7 @@
#include "mifarecmd.h"
#include "apps.h"
#include "util.h"
-#include "desfire.h"
-#include "../common/crc.h"
+#include "crc.h"
//-----------------------------------------------------------------------------
// Select, Authenticate, Read a MIFARE tag.
@@ -40,10 +39,10 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
struct Crypto1State *pcs;
pcs = &mpcs;
- // clear trace
- iso14a_clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
@@ -76,7 +75,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);
@@ -86,113 +85,93 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
LEDsoff();
}
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
+
+ bool turnOffField = (arg0 == 1);
+
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16];
- uint8_t uid[10];
- uint32_t cuid;
-
- // clear trace
- iso14a_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");
+ clear_trace();
+
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {
+ 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_auth(keybytes)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
+ OnError(1);
+ return;
}
- isOK=1;
- if (MF_DBGLEVEL >= 2) DbpString("AUTH 1 FINISHED");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
- LED_B_OFF();
-
- // Thats it...
- LEDsoff();
-}
-void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){
- // params
- uint32_t cuid = arg0;
- uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16];
-
- memcpy(key, datain, 16);
-
- 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 (turnOffField) {
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
}
- 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();
-
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
+ cmd_send(CMD_ACK,1,0,0,0,0);
}
-void MifareUReadBlock(uint8_t arg0,uint8_t *datain)
+// Arg0 = BlockNo,
+// Arg1 = UsePwd bool
+// datain = PWD bytes,
+void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
{
- // params
uint8_t blockNo = arg0;
-
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16];
- uint8_t uid[10];
- uint32_t cuid;
-
- // clear trace
- iso14a_clear_trace();
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
+ byte_t dataout[16] = {0x00};
+ bool useKey = (arg1 == 1); //UL_C
+ bool usePwd = (arg1 == 2); //UL_EV1/NTAG
+
+ LEDsoff();
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_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;
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ clear_trace();
+
+ int len = iso14443a_select_card(NULL, NULL, NULL);
+ if(!len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
+ OnError(1);
+ return;
}
-
- if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);
- LED_B_OFF();
+
+ // UL-C authentication
+ if ( useKey ) {
+ uint8_t key[16] = {0x00};
+ memcpy(key, datain, sizeof(key) );
+
+ if ( !mifare_ultra_auth(key) ) {
+ OnError(1);
+ return;
+ }
+ }
+
+ // UL-EV1 / NTAG authentication
+ if ( usePwd ) {
+ uint8_t pwd[4] = {0x00};
+ memcpy(pwd, datain, 4);
+ uint8_t pack[4] = {0,0,0,0};
+ if (!mifare_ul_ev1_auth(pwd, pack)) {
+ OnError(1);
+ return;
+ }
+ }
+
+ 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();
}
@@ -218,11 +197,10 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
struct Crypto1State *pcs;
pcs = &mpcs;
- // clear trace
- iso14a_clear_trace();
-
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
@@ -232,7 +210,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
isOK = 0;
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
}
-
+
if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {
isOK = 0;
@@ -265,64 +243,103 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
LEDsoff();
}
-void MifareUReadCard(uint8_t arg0, int arg1, 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)
{
+ LEDsoff();
+ LED_A_ON();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ // free eventually allocated BigBuf memory
+ BigBuf_free();
+ clear_trace();
+
// params
- uint8_t sectorNo = arg0;
- int Pages=arg1;
- int count_Pages=0;
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[176];
- uint8_t uid[10];
- uint32_t cuid;
+ uint8_t blockNo = arg0;
+ uint16_t blocks = arg1;
+ bool useKey = (arg2 == 1); //UL_C
+ bool usePwd = (arg2 == 2); //UL_EV1/NTAG
+ uint32_t countblocks = 0;
+ uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);
+ if (dataout == NULL){
+ Dbprintf("out of memory");
+ OnError(1);
+ return;
+ }
- // clear trace
- iso14a_clear_trace();
+ 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;
+ }
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ // UL-C authentication
+ if ( useKey ) {
+ uint8_t key[16] = {0x00};
+ memcpy(key, datain, sizeof(key) );
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
- Dbprintf("Pages %d",Pages);
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
- for(int sec=0;sec<Pages;sec++){
- if(mifare_ultra_readblock(cuid, sectorNo * 4 + sec, dataoutbuf + 4 * sec)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Read block %d error",sec);
- break;
- }else{
- count_Pages++;
- };
- }
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
-
- isOK = 1;
- break;
- }
- Dbprintf("Pages read %d",count_Pages);
- if (MF_DBGLEVEL >= 2) DbpString("READ CARD FINISHED");
-
- LED_B_ON();
- if (Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
- if (Pages==44 && count_Pages==16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,64);
- if (Pages==44 && count_Pages>16) cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,176);
- LED_B_OFF();
+ if ( !mifare_ultra_auth(key) ) {
+ OnError(1);
+ return;
+ }
+ }
- // Thats it...
+ // UL-EV1 / NTAG authentication
+ if (usePwd) {
+ uint8_t pwd[4] = {0x00};
+ memcpy(pwd, datain, sizeof(pwd));
+ uint8_t pack[4] = {0,0,0,0};
+
+ if (!mifare_ul_ev1_auth(pwd, pack)){
+ OnError(1);
+ return;
+ }
+ }
+
+ for (int i = 0; i < blocks; i++){
+ if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
+ Dbprintf("Data exceeds buffer!!");
+ break;
+ }
+
+ len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);
+
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
+ // if no blocks read - error out
+ if (i==0){
+ OnError(2);
+ return;
+ } else {
+ //stop at last successful read block and return what we got
+ break;
+ }
+ } else {
+ countblocks++;
+ }
+ }
+
+ len = mifare_ultra_halt();
+ if (len) {
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
+ OnError(3);
+ return;
+ }
+
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
+
+ countblocks *= 4;
+
+ cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-
+ BigBuf_free();
}
-
//-----------------------------------------------------------------------------
// Select, Authenticate, Write a MIFARE tag.
// read block
@@ -346,11 +363,10 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
struct Crypto1State *pcs;
pcs = &mpcs;
- // clear trace
- iso14a_clear_trace();
-
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
@@ -395,117 +411,185 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
LEDsoff();
}
-void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
+/* // Command not needed but left for future testing
+void MifareUWriteBlockCompat(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);
-
- // variables
- byte_t isOK = 0;
- uint8_t uid[10];
- uint32_t cuid;
+ memcpy(blockdata, datain, 16);
- // clear trace
- iso14a_clear_trace();
+ uint8_t uid[10] = {0x00};
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();
- 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");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
-
-
- // Thats it...
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
-// iso14a_set_tracing(TRUE);
-}
+ 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_writeblock_compat(blockNo, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(0);
+ return; };
-void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
+ 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();
+}
+*/
+
+// Arg0 : Block to write to.
+// Arg1 : 0 = use no authentication.
+// 1 = use 0x1A authentication.
+// 2 = use 0x1B authentication.
+// datain : 4 first bytes is data to be written.
+// : 4/16 next bytes is authentication key.
+void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
{
- // params
uint8_t blockNo = arg0;
- byte_t blockdata[4];
-
+ bool useKey = (arg1 == 1); //UL_C
+ bool usePwd = (arg1 == 2); //UL_EV1/NTAG
+ byte_t blockdata[4] = {0x00};
+
memcpy(blockdata, datain,4);
+
+ LEDsoff();
+ LED_A_ON();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- // variables
- byte_t isOK = 0;
- uint8_t uid[10];
- uint32_t cuid;
+ clear_trace();
- // clear trace
- iso14a_clear_trace();
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ // UL-C authentication
+ if ( useKey ) {
+ uint8_t key[16] = {0x00};
+ memcpy(key, datain+4, sizeof(key) );
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
+ if ( !mifare_ultra_auth(key) ) {
+ OnError(1);
+ return;
+ }
+ }
+
+ // UL-EV1 / NTAG authentication
+ if (usePwd) {
+ uint8_t pwd[4] = {0x00};
+ memcpy(pwd, datain+4, 4);
+ uint8_t pack[4] = {0,0,0,0};
+ if (!mifare_ul_ev1_auth(pwd, pack)) {
+ OnError(1);
+ return;
+ }
+ }
+
+ if(mifare_ultra_writeblock(blockNo, blockdata)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
+ OnError(0);
+ return;
+ };
- while (true) {
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
- break;
- };
+ if(mifare_ultra_halt()) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
+ OnError(0);
+ return;
+ };
- if(mifare_ultra_special_writeblock(cuid, blockNo, blockdata)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
- break;
- };
+ if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
- if(mifare_ultra_halt(cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");
- break;
- };
+ cmd_send(CMD_ACK,1,0,0,0,0);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
+}
- isOK = 1;
- 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();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");
+ clear_trace();
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,0,0);
- LED_B_OFF();
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {
+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
+ OnError(0);
+ return;
+ };
- // Thats it...
+ blockdata[0] = pwd[7];
+ blockdata[1] = pwd[6];
+ blockdata[2] = pwd[5];
+ blockdata[3] = pwd[4];
+ if(mifare_ultra_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_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_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_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, 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;
@@ -541,32 +625,41 @@ 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;
- // clear trace
- iso14a_clear_trace();
- iso14a_set_tracing(false);
-
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
LED_A_ON();
LED_C_OFF();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ // free eventually allocated BigBuf memory
+ BigBuf_free();
+
+ if (calibrate) clear_trace();
+ set_tracing(true);
// statistics on nonce distance
+ int16_t isOK = 0;
+ #define NESTED_MAX_TRIES 12
+ uint16_t unsuccessfull_tries = 0;
if (calibrate) { // for first call only. Otherwise reuse previous calibration
LED_B_ON();
WDT_HIT();
davg = dmax = 0;
- dmin = 2000;
+ dmin = 2000;
delta_time = 0;
for (rtr = 0; rtr < 17; rtr++) {
+ // Test if the action was cancelled
+ if(BUTTON_PRESS()) {
+ isOK = -2;
+ break;
+ }
+
// prepare next select. No need to power down the card.
if(mifare_classic_halt(pcs, cuid)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Halt error");
@@ -599,7 +692,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;
}
@@ -614,14 +707,17 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
delta_time = auth2_time - auth1_time + 32; // allow some slack for proper timing
}
if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);
+ } else {
+ unsuccessfull_tries++;
+ if (unsuccessfull_tries > NESTED_MAX_TRIES) { // card isn't vulnerable to nested attack (random numbers are not predictable)
+ isOK = -3;
+ }
}
}
-
- if (rtr <= 1) return;
davg = (davg + (rtr - 1)/2) / (rtr - 1);
- if (MF_DBGLEVEL >= 3) Dbprintf("min=%d max=%d avg=%d, delta_time=%d", dmin, dmax, davg, delta_time);
+ if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);
dmin = davg - 2;
dmax = davg + 2;
@@ -634,20 +730,11 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
LED_C_ON();
// 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;
- }
+ for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces
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");
@@ -667,7 +754,7 @@ 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_short(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;
@@ -707,7 +794,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
@@ -721,25 +808,25 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
memcpy(buf+16, &target_ks[1], 4);
LED_B_ON();
- cmd_send(CMD_ACK, 0, 2, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
+ cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));
LED_B_OFF();
if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
- iso14a_set_tracing(TRUE);
}
//-----------------------------------------------------------------------------
// MIFARE check keys. key count up to 85.
//
//-----------------------------------------------------------------------------
-void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
{
// params
- uint8_t blockNo = arg0;
- uint8_t keyType = arg1;
+ uint8_t blockNo = arg0 & 0xff;
+ uint8_t keyType = (arg0 >> 8) & 0xff;
+ bool clearTrace = arg1;
uint8_t keyCount = arg2;
uint64_t ui64Key = 0;
@@ -756,15 +843,13 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
int OLD_MF_DBGLEVEL = MF_DBGLEVEL;
MF_DBGLEVEL = MF_DBG_NONE;
- // 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();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ if (clearTrace) clear_trace();
+ set_tracing(TRUE);
for (i = 0; i < keyCount; i++) {
if(mifare_classic_halt(pcs, cuid)) {
@@ -811,16 +896,23 @@ void MifareSetDbgLvl(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
//-----------------------------------------------------------------------------
// Work with emulator memory
//
+// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not
+// involved in dealing with emulator memory. But if it is called later, it might
+// destroy the Emulator Memory.
//-----------------------------------------------------------------------------
+
void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
emlClearMem();
}
void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
emlSetMem(datain, arg0, arg1); // data, block num, blocks count
}
void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){
+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
byte_t buf[USB_CMD_DATA_SIZE];
emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)
@@ -847,15 +939,13 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
byte_t dataoutbuf2[16];
uint8_t uid[10];
- // 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();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ clear_trace();
+ set_tracing(false);
bool isOK = true;
@@ -941,18 +1031,18 @@ 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);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ clear_trace();
+ set_tracing(TRUE);
}
while (true) {
@@ -961,12 +1051,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;
};
};
@@ -1060,17 +1150,17 @@ 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);
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
+ clear_trace();
+ set_tracing(TRUE);
}
while (true) {
@@ -1125,8 +1215,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)) {
@@ -1145,78 +1235,124 @@ 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();
+
+iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+ set_tracing(TRUE);
+
+
+ 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){
- // variables
- byte_t isOK = 0;
- byte_t dataoutbuf[16];
- uint8_t uid[10];
- uint32_t cuid;
+
+ byte_t dataout[11] = {0x00};
+ uint8_t uid[10] = {0x00};
+ uint32_t cuid = 0x00;
- // clear trace
- iso14a_clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
+ clear_trace();
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card, something went wrong before auth");
+ 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, dataoutbuf)){
- if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part1: Fail.");
+ if(mifare_desfire_des_auth1(cuid, dataout)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+ OnError(4);
+ return;
}
- isOK=1;
- if (MF_DBGLEVEL >= 2) DbpString("AUTH 1 FINISHED");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);
- LED_B_OFF();
-
- // Thats it...
- //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
+ 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){
- // params
+
uint32_t cuid = arg0;
- uint8_t key[16]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
- // variables
+ uint8_t key[16] = {0x00};
+ byte_t dataout[12] = {0x00};
byte_t isOK = 0;
- byte_t dataoutbuf[16];
memcpy(key, datain, 16);
- // clear trace
- //iso14a_clear_trace();
- //iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
- LED_A_ON();
- LED_B_OFF();
- LED_C_OFF();
-
-// Dbprintf("Sending %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-// key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7],key[8],
-// key[9],key[10],key[11],key[12],key[13],key[14],key[15]);
- if(mifare_desfire_des_auth2(cuid, key, dataoutbuf)){
- if (MF_DBGLEVEL >= 1) Dbprintf("Authentication part2: Fail...");
+ isOK = mifare_desfire_des_auth2(cuid, key, dataout);
+
+ if( isOK) {
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
+ OnError(4);
+ return;
}
- isOK=1;
- if (MF_DBGLEVEL >= 2) DbpString("AUTH 2 FINISHED");
-
- LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,12);
- LED_B_OFF();
-
- // Thats it...
+
+ 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