diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index ab45ebdc2..b77897a78 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -4059,57 +4059,6 @@ void MifareSetMod(uint8_t *datain) { BigBuf_free(); } -// -// DESFIRE -// -void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain) { - uint8_t dataout[12] = {0x00}; - uint32_t cuid = 0; - - iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); - clear_trace(); - set_tracing(true); - - int len = iso14443a_select_card(NULL, NULL, &cuid, true, 0, false); - if (!len) { - if (g_dbglevel >= DBG_ERROR) Dbprintf("Can't select card"); - OnError(1); - return; - }; - - if (mifare_desfire_des_auth1(cuid, dataout) != PM3_SUCCESS) { - if (g_dbglevel >= DBG_ERROR) Dbprintf("Authentication part1: Fail."); - OnError(4); - return; - } - - if (g_dbglevel >= DBG_EXTENDED) DbpString("AUTH 1 FINISHED"); - reply_mix(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}; - uint8_t dataout[12] = {0x00}; - uint8_t isOK = 0; - - memcpy(key, datain, 16); - - isOK = mifare_desfire_des_auth2(cuid, key, dataout); - - if (isOK != PM3_SUCCESS) { - if (g_dbglevel >= DBG_EXTENDED) Dbprintf("Authentication part2: Failed"); - OnError(4); - return; - } - - if (g_dbglevel >= DBG_EXTENDED) DbpString("AUTH 2 FINISHED"); - - reply_old(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout)); - FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); - LEDsoff(); - set_tracing(false); -} // // Tear-off attack against MFU. @@ -4147,8 +4096,9 @@ void MifareU_Otp_Tearoff(uint8_t blno, uint32_t tearoff_time, uint8_t *data_test // anticollision / select card if (iso14443a_select_card(NULL, NULL, NULL, true, 0, true) == false) { if (g_dbglevel >= DBG_ERROR) Dbprintf("Can't select card"); - OnError(1); reply_ng(CMD_HF_MFU_OTP_TEAROFF, PM3_EFAILED, NULL, 0); + switch_off(); + LEDsoff(); return; }; // send @@ -4191,7 +4141,7 @@ void MifareU_Counter_Tearoff(uint8_t counter, uint32_t tearoff_time, uint8_t *da // anticollision / select card if (iso14443a_select_card(NULL, NULL, NULL, true, 0, true) == false) { if (g_dbglevel >= DBG_ERROR) Dbprintf("Can't select card"); - OnError(1); + reply_ng(CMD_HF_MFU_COUNTER_TEAROFF, PM3_EFAILED, NULL, 0); switch_off(); LEDsoff(); return; diff --git a/armsrc/mifarecmd.h b/armsrc/mifarecmd.h index 09e90151b..19b8a14cc 100644 --- a/armsrc/mifarecmd.h +++ b/armsrc/mifarecmd.h @@ -74,8 +74,6 @@ void OnErrorMagic(uint16_t cmd, uint8_t reason); int32_t dist_nt(uint32_t nt1, uint32_t nt2); //void RAMFUNC SniffMifare(uint8_t param); -void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain); -void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain); // Tear-off test for MFU void MifareU_Otp_Tearoff(uint8_t blno, uint32_t tearoff_time, uint8_t *data_testwrite); diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c index dcc8d7234..9870ae497 100644 --- a/armsrc/mifaredesfire.c +++ b/armsrc/mifaredesfire.c @@ -63,7 +63,7 @@ bool InitDesfireCard(void) { if (iso14443a_select_card(NULL, &card, NULL, true, 0, false) == 0) { if (g_dbglevel >= DBG_ERROR) DbpString("Can't select card"); - OnError(1); + OnErrorNG(CMD_HF_DESFIRE_COMMAND, 1); return false; } return true; @@ -105,7 +105,7 @@ void MifareSendCommand(uint8_t *datain) { print_result("RESP <--: ", resp, len); if (len == 0) { - OnError(2); + OnErrorNG(CMD_HF_DESFIRE_COMMAND, 2); return; } @@ -773,11 +773,6 @@ void OnSuccess(void) { switch_off(); } -void OnError(uint8_t reason) { - reply_mix(CMD_ACK, 0, reason, 0, 0, 0); - OnSuccess(); -} - void OnErrorNG(uint16_t cmd, uint8_t reason) { reply_ng(cmd, reason, NULL, 0); OnSuccess(); diff --git a/armsrc/mifaredesfire.h b/armsrc/mifaredesfire.h index c8462cace..c04592ccb 100644 --- a/armsrc/mifaredesfire.h +++ b/armsrc/mifaredesfire.h @@ -26,7 +26,6 @@ void ReaderMifareDES(uint32_t param, uint32_t param2, uint8_t *datain); int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout); size_t CreateAPDU(uint8_t *datain, size_t len, uint8_t *dataout); void OnSuccess(void); -void OnError(uint8_t reason); void OnErrorNG(uint16_t cmd, uint8_t reason); #endif