X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/062b7cb9561e2109af559d7cd3a4878887bd44db..d8af608f8e4e6dc520045bac69e8e9dac6de7d42:/armsrc/mifarecmd.c
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 1004e342..73fb8a5a 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -16,8 +16,6 @@
#include "mifarecmd.h"
#include "apps.h"
#include "util.h"
-//#include "../client/loclass/des.h"
-#include "des.h"
#include "crc.h"
//-----------------------------------------------------------------------------
@@ -41,10 +39,10 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
struct Crypto1State *pcs;
pcs = &mpcs;
- // clear trace
- clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
@@ -87,184 +85,97 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
LEDsoff();
}
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
-void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
-
- byte_t dataoutbuf[16] = {0x00};
- uint8_t uid[10] = {0x00};
- uint32_t cuid = 0x00;
+ bool turnOffField = (arg0 == 1);
LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-
- clear_trace();
+
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- if(!iso14443a_select_card(uid, NULL, &cuid)) {
+ 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(dataoutbuf)){
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+ if(!mifare_ultra_auth(keybytes)){
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
OnError(1);
return;
}
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
-
- 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};
-
- 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 (turnOffField) {
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+ LEDsoff();
}
-
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
-
- cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- LEDsoff();
+ cmd_send(CMD_ACK,1,0,0,0,0);
}
+// 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};
- uint8_t key[16] = {0x00};
- bool usePwd = (arg1 == 1);
-
- LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-
- clear_trace();
+ bool useKey = (arg1 == 1); //UL_C
+ bool usePwd = (arg1 == 2); //UL_EV1/NTAG
+
+ LEDsoff();
+ LED_A_ON();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-
- int len = iso14443a_select_card(uid, NULL, NULL);
+
+ 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;
}
-
- // authenticate here.
- if ( usePwd ) {
-
- memcpy(key, datain, 16);
-
- uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };
- uint8_t random_b[8] = {0x00};
- uint8_t enc_random_b[8] = {0x00};
- uint8_t rnd_ab[16] = {0x00};
- uint8_t IV[8] = {0x00};
-
- uint16_t len;
- uint8_t receivedAnswer[MAX_FRAME_SIZE];
- uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
-
- len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);
- if (len != 11) {
- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
- OnError(1);
- return;
- }
-
- // tag nonce.
- memcpy(enc_random_b,receivedAnswer+1,8);
- // decrypt nonce.
- tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );
+ // UL-C authentication
+ if ( useKey ) {
+ uint8_t key[16] = {0x00};
+ memcpy(key, datain, sizeof(key) );
-
- 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] );
+ if ( !mifare_ultra_auth(key) ) {
+ OnError(1);
+ return;
}
-
- // 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]);
+ // 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;
}
+ }
- 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, Authenticate, Read a MIFARE tag.
// read sector (data = 4 x 16 bytes = 64 bytes, or 16 x 16 bytes = 256 bytes)
@@ -286,11 +197,10 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
struct Crypto1State *pcs;
pcs = &mpcs;
- // clear trace
- clear_trace();
-
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
@@ -300,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;
@@ -333,52 +243,101 @@ 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)
{
- // params
- uint8_t sectorNo = arg0;
- int Pages = arg1;
- int countpages = 0;
- uint8_t dataout[176] = {0x00};;
-
LEDsoff();
- LED_A_ON();
- clear_trace();
+ LED_A_ON();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ // free eventually allocated BigBuf memory
+ BigBuf_free();
+ clear_trace();
+
+ // params
+ 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;
+ }
+
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;
}
-
- for (int i = 0; i < Pages; i++){
-
- len = mifare_ultra_readblock(sectorNo * 4 + i, dataout + 4 * i);
+
+ // 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, 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);
- OnError(2);
+ // 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 {
- countpages++;
+ countblocks++;
}
}
-
- if (mifare_ultra_halt()) {
+
+ 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("Pages read %d", countpages);
- len = Pages*4;
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
+
+ countblocks *= 4;
- cmd_send(CMD_ACK, 1, 0, 0, dataout, len);
+ cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
+ BigBuf_free();
}
//-----------------------------------------------------------------------------
@@ -404,11 +363,10 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
struct Crypto1State *pcs;
pcs = &mpcs;
- // clear trace
- clear_trace();
-
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
@@ -453,17 +411,18 @@ 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)
{
- uint8_t blockNo = arg0;
+ uint8_t blockNo = arg0;
byte_t blockdata[16] = {0x00};
- memcpy(blockdata, datain, 16);
-
+ memcpy(blockdata, datain, 16);
+
uint8_t uid[10] = {0x00};
LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-
+
clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
@@ -473,7 +432,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
return;
};
- if(mifare_ultra_writeblock(blockNo, blockdata)) {
+ if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
OnError(0);
return; };
@@ -483,34 +442,65 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
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)
+*/
+
+// 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)
{
uint8_t blockNo = arg0;
+ bool useKey = (arg1 == 1); //UL_C
+ bool usePwd = (arg1 == 2); //UL_EV1/NTAG
byte_t blockdata[4] = {0x00};
-
- memcpy(blockdata, datain,4);
- uint8_t uid[10] = {0x00};
+ memcpy(blockdata, datain,4);
- LED_A_ON(); LED_B_OFF(); LED_C_OFF();
- clear_trace();
+ LEDsoff();
+ LED_A_ON();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
- if(!iso14443a_select_card(uid, NULL, NULL)) {
+ clear_trace();
+
+ if(!iso14443a_select_card(NULL, NULL, NULL)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
OnError(0);
return;
};
- if(mifare_ultra_special_writeblock(blockNo, blockdata)) {
+ // UL-C authentication
+ if ( useKey ) {
+ uint8_t key[16] = {0x00};
+ memcpy(key, datain+4, 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, 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;
@@ -537,9 +527,10 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
memcpy(pwd, datain, 16);
LED_A_ON(); LED_B_OFF(); LED_C_OFF();
- clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
+
if(!iso14443a_select_card(NULL, NULL, NULL)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
OnError(0);
@@ -550,7 +541,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
blockdata[1] = pwd[6];
blockdata[2] = pwd[5];
blockdata[3] = pwd[4];
- if(mifare_ultra_special_writeblock( 44, blockdata)) {
+ if(mifare_ultra_writeblock( 44, blockdata)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
OnError(44);
return;
@@ -560,7 +551,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
blockdata[1] = pwd[2];
blockdata[2] = pwd[1];
blockdata[3] = pwd[0];
- if(mifare_ultra_special_writeblock( 45, blockdata)) {
+ if(mifare_ultra_writeblock( 45, blockdata)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
OnError(45);
return;
@@ -570,7 +561,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
blockdata[1] = pwd[14];
blockdata[2] = pwd[13];
blockdata[3] = pwd[12];
- if(mifare_ultra_special_writeblock( 46, blockdata)) {
+ if(mifare_ultra_writeblock( 46, blockdata)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
OnError(46);
return;
@@ -580,7 +571,7 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
blockdata[1] = pwd[10];
blockdata[2] = pwd[9];
blockdata[3] = pwd[8];
- if(mifare_ultra_special_writeblock( 47, blockdata)) {
+ if(mifare_ultra_writeblock( 47, blockdata)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
OnError(47);
return;
@@ -639,19 +630,20 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
uint32_t auth1_time, auth2_time;
static uint16_t delta_time;
- // free eventually allocated BigBuf memory
- BigBuf_free();
- // clear trace
- clear_trace();
- 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();
@@ -662,6 +654,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
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");
@@ -709,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;
@@ -729,7 +730,7 @@ 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
+ 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
@@ -753,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;
@@ -807,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();
- 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;
@@ -842,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
- clear_trace();
- 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)) {
@@ -897,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)
@@ -933,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
- clear_trace();
- 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;
@@ -1035,10 +1039,10 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
clear_trace();
set_tracing(TRUE);
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
}
while (true) {
@@ -1153,10 +1157,10 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
clear_trace();
set_tracing(TRUE);
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
}
while (true) {
@@ -1249,10 +1253,11 @@ void MifareCollectNonces(uint32_t arg0, uint32_t arg1){
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
-
+
+iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
clear_trace();
set_tracing(TRUE);
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+
for (int i = 0; i < iterations; i++) {
@@ -1294,7 +1299,6 @@ void MifareCollectNonces(uint32_t arg0, uint32_t arg1){
packLen -= packSize;
packNum++;
}
-
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
@@ -1309,8 +1313,8 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
uint8_t uid[10] = {0x00};
uint32_t cuid = 0x00;
- clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
int len = iso14443a_select_card(uid, NULL, &cuid);
if(!len) {
@@ -1351,4 +1355,4 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
-}
+}
\ No newline at end of file