FIX: hf mfu dump, now reads correct memory from device-side.

[proxmark3-svn] / armsrc / mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index e064c33aa45068e5924075d4b1cbcddcfec9988a..fb48647762b62035147fa71153651cc7c769be5e 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -1,5 +1,6 @@
 #include "mifaredesfire.h"
 #include "des.h"
+#include "BigBuf.h"
 
 #define MAX_APPLICATION_COUNT 28
 #define MAX_FILE_COUNT 16
@@ -23,14 +24,15 @@ bool InitDesfireCard(){
 
        iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
        
-       iso14a_set_tracing(TRUE);
+       set_tracing(TRUE);
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
        
        int len = iso14443a_select_card(NULL,card,NULL);
 
        if (!len) {
-               if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
-               OnError();
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)
+                       Dbprintf("Can't select card");
+               OnError(1);
                return false;
        }
        return true;
@@ -64,7 +66,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
        }
        
        if ( flags & CLEARTRACE ){
-               iso14a_clear_trace();
+               clear_trace();
        }
        
        if ( flags & INIT ){
@@ -78,7 +80,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
        }
 
        if ( !len ) {
-               OnError();
+               OnError(2);
                return;
        }
        
@@ -108,18 +110,18 @@ void MifareDesfireGetInformation(){
                PCB == 0x0A because sending CID byte.
                CID == 0x00 first card?         
        */
-       iso14a_clear_trace();
-       iso14a_set_tracing(TRUE);
+       clear_trace();
+       set_tracing(TRUE);
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
        // card select - information
        iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
        byte_t isOK = iso14443a_select_card(NULL, card, NULL);
        if ( isOK == 0) {
-               if (MF_DBGLEVEL >= 1) {
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                        Dbprintf("Can't select card");
                }
-               OnError();
+               OnError(1);
                return;
        }
 
@@ -135,7 +137,7 @@ void MifareDesfireGetInformation(){
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 
-               OnError();
+               OnError(2);
                return;
        }
        
@@ -148,7 +150,7 @@ void MifareDesfireGetInformation(){
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 
-               OnError();
+               OnError(2);
                return;
        }       
        
@@ -160,7 +162,7 @@ void MifareDesfireGetInformation(){
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 
-               OnError();
+               OnError(2);
                return;
        }
        
@@ -196,10 +198,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
        uint8_t encBoth[32] = {0x00};
 
        InitDesfireCard();
-
-       LED_A_ON();
-       LED_B_OFF();
-       LED_C_OFF();
        
        // 3 olika sätt att authenticera.   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
        // 4 olika crypto algo   DES, 3DES, 3K3DES, AES
@@ -228,17 +226,17 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             cmd[1] = keyno;  //keynumber
             len = DesfireAPDU(cmd, 2, resp);
             if ( !len ) {
-                if (MF_DBGLEVEL >= 1) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
-                OnError();
+                OnError(3);
                 return;
             }
             
             if ( resp[2] == 0xaf ){
             } else {
                 DbpString("Authetication failed. Invalid key number.");
-                OnError();
+                OnError(3);
                 return;
             }
             
@@ -270,10 +268,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             
             len = DesfireAPDU(cmd, 17, resp);
             if ( !len ) {
-                if (MF_DBGLEVEL >= 1) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                     DbpString("Authentication failed. Card timeout.");
                 }
-                OnError();
+                OnError(3);
                 return;
             }
             
@@ -290,7 +288,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 for (int x = 0; x < 8; x++) {
                     if (decRndA[x] != encRndA[x]) {
                         DbpString("Authetication failed. Cannot varify PICC.");
-                        OnError();
+                        OnError(4);
                         return;
                     }
                 }
@@ -343,7 +341,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 
             } else {
                 DbpString("Authetication failed.");
-                OnError();
+                OnError(6);
                 return;
             }
             
@@ -372,7 +370,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                                if( MF_DBGLEVEL >= 4) {
                                        Dbprintf("AES context failed to init");
                                }
-                               OnError();
+                               OnError(7);
                                return;
                        }
                        
@@ -380,10 +378,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                        cmd[1] = 0x00;  //keynumber
                        len = DesfireAPDU(cmd, 2, resp);
                        if ( !len ) {
-                               if (MF_DBGLEVEL >= 1) {
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                                        DbpString("Authentication failed. Card timeout.");
                                }
-                               OnError();
+                               OnError(3);
                                return;
                        }
                        
@@ -401,10 +399,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                        
                        len = DesfireAPDU(cmd, 33, resp);  // 1 + 32 == 33
                        if ( !len ) {
-                               if (MF_DBGLEVEL >= 1) {
+                               if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                                        DbpString("Authentication failed. Card timeout.");
                                }
-                OnError();
+                OnError(3);
                                return;
                        }
                        
@@ -416,10 +414,9 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                                print_result("SESSION : ", skey->data, 16);
                        } else {
                                DbpString("Authetication failed.");
-                               OnError();
+                               OnError(7);
                                return;
                        }
-                       
                        break;
                }       
        }
@@ -436,10 +433,10 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 
        size_t len = 0;
        size_t wrappedLen = 0;
-       uint8_t wCmd[USB_CMD_DATA_SIZE] = {0};
+       uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00};
        
-       uint8_t *resp = ((uint8_t *)BigBuf) + RECV_RESP_OFFSET;
-    uint8_t *resp_par = ((uint8_t *)BigBuf) + RECV_RESP_PAR_OFFSET;
+       uint8_t resp[MAX_FRAME_SIZE];
+    uint8_t par[MAX_PARITY_SIZE];
        
        wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
        
@@ -448,7 +445,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
        }
        ReaderTransmit( wCmd, wrappedLen, NULL);
 
-       len = ReaderReceive(resp, resp_par);
+       len = ReaderReceive(resp, par);
        
        if( len == 0x00 ){
                if (MF_DBGLEVEL >= 4) {
@@ -502,10 +499,11 @@ void OnSuccess(){
        LEDsoff();
 }
 
-void OnError(){
+void OnError(uint8_t reason){
        pcb_blocknum = 0;
        ReaderTransmit(deselect_cmd, 3 , NULL);
+       
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-       cmd_send(CMD_ACK,0,0,0,0,0);
+       cmd_send(CMD_ACK,0,reason,0,0,0);
        LEDsoff();
 }