X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/79d7bcbb51db25dab899b3b250f48a0ab40e30e9..refs/pull/162/head:/armsrc/mifarecmd.c?ds=sidebyside
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 2a21ac48..a3d6609d 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -44,10 +44,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();
@@ -95,9 +95,11 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
bool turnOffField = (arg0 == 1);
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 >= MF_DBG_ERROR) Dbprintf("Can't select card");
OnError(0);
@@ -129,9 +131,10 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
LEDsoff();
LED_A_ON();
- clear_trace();
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);
@@ -199,11 +202,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();
@@ -252,9 +254,12 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
// 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
clear_trace();
// params
@@ -270,10 +275,6 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
return;
}
- LEDsoff();
- LED_A_ON();
- 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);
@@ -305,7 +306,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
}
for (int i = 0; i < blocks; i++){
- if ((i*4) + 4 > CARD_MEMORY_SIZE) {
+ if ((i*4) + 4 >= CARD_MEMORY_SIZE) {
Dbprintf("Data exceeds buffer!!");
break;
}
@@ -337,16 +338,11 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
countblocks *= 4;
-/*
- LED_B_ON();
- for(size_t i=0; i < countblocks; i += USB_CMD_DATA_SIZE) {
- size_t len = MIN((countblocks - i),USB_CMD_DATA_SIZE);
- cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,countblocks,dataout+i,len);
- }
-*/
+
cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
+ BigBuf_free();
}
//-----------------------------------------------------------------------------
@@ -372,11 +368,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();
@@ -421,7 +416,8 @@ 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;
byte_t blockdata[16] = {0x00};
@@ -441,7 +437,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; };
@@ -458,6 +454,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff();
}
+*/
// Arg0 : Block to write to.
// Arg1 : 0 = use no authentication.
@@ -465,7 +462,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
// 2 = use 0x1B authentication.
// datain : 4 first bytes is data to be written.
// : 4/16 next bytes is authentication key.
-void MifareUWriteBlock_Special(uint8_t arg0, uint8_t arg1, uint8_t *datain)
+void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
{
uint8_t blockNo = arg0;
bool useKey = (arg1 == 1); //UL_C
@@ -476,9 +473,10 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t arg1, uint8_t *datain)
LEDsoff();
LED_A_ON();
- 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);
@@ -507,7 +505,7 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t arg1, uint8_t *datain)
}
}
- if(mifare_ultra_special_writeblock(blockNo, blockdata)) {
+ if(mifare_ultra_writeblock(blockNo, blockdata)) {
if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");
OnError(0);
return;
@@ -534,9 +532,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);
@@ -547,7 +546,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;
@@ -557,7 +556,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;
@@ -567,7 +566,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;
@@ -577,7 +576,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;
@@ -636,19 +635,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();
@@ -659,6 +659,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");
@@ -706,14 +712,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;
@@ -721,12 +730,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
LED_B_OFF();
}
-// -------------------------------------------------------------------------------------------------
+ // -------------------------------------------------------------------------------------------------
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
@@ -750,7 +759,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;
@@ -804,25 +813,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;
@@ -839,15 +848,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)) {
@@ -894,16 +901,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)
@@ -930,15 +944,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;
@@ -1032,10 +1044,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) {
@@ -1131,6 +1143,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
// bit 2 - need HALT after sequence
// bit 3 - need init FPGA and field before sequence
// bit 4 - need reset FPGA and LED
+ // bit 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)
uint8_t workFlags = arg0;
uint8_t blockNo = arg2;
@@ -1150,10 +1163,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) {
@@ -1190,7 +1203,12 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai
}
LED_B_ON();
- cmd_send(CMD_ACK,isOK,0,0,data,18);
+ if (workFlags & 0x20) {
+ if (isOK)
+ memcpy(datain, data, 18);
+ }
+ else
+ cmd_send(CMD_ACK,isOK,0,0,data,18);
LED_B_OFF();
if ((workFlags & 0x10) || (!isOK)) {
@@ -1228,7 +1246,7 @@ void MifareCIdent(){
cmd_send(CMD_ACK,isOK,0,0,0,0);
}
- //
+//
// DESFIRE
//
@@ -1238,8 +1256,8 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
uint8_t uid[10] = {0x00};
uint32_t cuid;
- clear_trace();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
+ clear_trace();
int len = iso14443a_select_card(uid, NULL, &cuid);
if(!len) {
@@ -1270,14 +1288,12 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
isOK = mifare_desfire_des_auth2(cuid, key, dataout);
if( isOK) {
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
- Dbprintf("Authentication part2: Failed");
- //OnError(4);
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");
+ OnError(4);
return;
}
- if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
- DbpString("AUTH 2 FINISHED");
+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);