Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / armsrc / mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index e5a2289b29993db88019dc27f7101557c6df7696..5737615106c9a0cddd2d8a92d3763807c97d6b01 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -3,9 +3,10 @@
 
 #define MAX_APPLICATION_COUNT 28
 #define MAX_FILE_COUNT 16
 
 #define MAX_APPLICATION_COUNT 28
 #define MAX_FILE_COUNT 16

-#define MAX_FRAME_SIZE 60
+#define MAX_DESFIRE_FRAME_SIZE 60

 #define NOT_YET_AUTHENTICATED 255
 #define NOT_YET_AUTHENTICATED 255

-#define FRAME_PAYLOAD_SIZE (MAX_FRAME_SIZE - 5)
+#define FRAME_PAYLOAD_SIZE (MAX_DESFIRE_FRAME_SIZE - 5)
+#define RECEIVE_SIZE 64

 
 // the block number for the ISO14443-4 PCB
 uint8_t pcb_blocknum = 0;
 
 // the block number for the ISO14443-4 PCB
 uint8_t pcb_blocknum = 0;


@@ -17,25 +18,20 @@ static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
 //static uint8_t __res[MAX_FRAME_SIZE];
 
 bool InitDesfireCard(){
 //static uint8_t __res[MAX_FRAME_SIZE];
 
 bool InitDesfireCard(){

-
-       // Make sure it is off.
-//     FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-//     SpinDelay(300);

        
        

-       byte_t cardbuf[USB_CMD_DATA_SIZE];
-       memset(cardbuf,0,sizeof(cardbuf));
+       byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};
+
+       iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;

        
        iso14a_set_tracing(TRUE);
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
        
        
        iso14a_set_tracing(TRUE);
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
        

-       iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;

        int len = iso14443a_select_card(NULL,card,NULL);
 
        if (!len) {
        int len = iso14443a_select_card(NULL,card,NULL);
 
        if (!len) {

-               if (MF_DBGLEVEL >= 1) {
+               if (MF_DBGLEVEL >= MF_DBG_ERROR)

                        Dbprintf("Can't select card");
                        Dbprintf("Can't select card");

-               }
-               OnError();
+               OnError(1);

                return false;
        }
        return true;
                return false;
        }
        return true;


@@ -59,7 +55,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
        */
        uint8_t flags = arg0;
        size_t datalen = arg1;
        */
        uint8_t flags = arg0;
        size_t datalen = arg1;

-       uint8_t resp[RECV_RES_SIZE];
+       uint8_t resp[RECEIVE_SIZE];

        memset(resp,0,sizeof(resp));
        
        if (MF_DBGLEVEL >= 4) {
        memset(resp,0,sizeof(resp));
        
        if (MF_DBGLEVEL >= 4) {


@@ -78,12 +74,12 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
        }
        
        int len = DesfireAPDU(datain, datalen, resp);
        }
        
        int len = DesfireAPDU(datain, datalen, resp);

-               if (MF_DBGLEVEL >= 4) {
-                       print_result("ERR <--: ", resp, len);   
-               }
+       if (MF_DBGLEVEL >= 4) {
+               print_result("ERR <--: ", resp, len);
+       }

 
        if ( !len ) {
 
        if ( !len ) {

-               OnError();
+               OnError(2);

                return;
        }
        
                return;
        }
        


@@ -100,13 +96,9 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
 void MifareDesfireGetInformation(){
                
        int len = 0;
 void MifareDesfireGetInformation(){
                
        int len = 0;

-       uint8_t resp[USB_CMD_DATA_SIZE];
-       uint8_t dataout[USB_CMD_DATA_SIZE];
-       byte_t cardbuf[USB_CMD_DATA_SIZE];
-       
-       memset(resp,0,sizeof(resp));
-       memset(dataout,0, sizeof(dataout));
-       memset(cardbuf,0,sizeof(cardbuf));
+       uint8_t resp[USB_CMD_DATA_SIZE] = {0x00};
+       uint8_t dataout[USB_CMD_DATA_SIZE] = {0x00};
+       byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};

        
        /*
                1 = PCB                                 1
        
        /*
                1 = PCB                                 1


@@ -124,11 +116,11 @@ void MifareDesfireGetInformation(){
        // card select - information
        iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
        byte_t isOK = iso14443a_select_card(NULL, card, NULL);
        // card select - information
        iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
        byte_t isOK = iso14443a_select_card(NULL, card, NULL);

-       if (isOK != 1) {
-               if (MF_DBGLEVEL >= 1) {
+       if ( isOK == 0) {
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) {

                        Dbprintf("Can't select card");
                }
                        Dbprintf("Can't select card");
                }

-               OnError();
+               OnError(1);

                return;
        }
 
                return;
        }
 


@@ -144,7 +136,7 @@ void MifareDesfireGetInformation(){
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 

-               OnError();
+               OnError(2);

                return;
        }
        
                return;
        }
        


@@ -157,7 +149,7 @@ void MifareDesfireGetInformation(){
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 

-               OnError();
+               OnError(2);

                return;
        }       
        
                return;
        }       
        


@@ -169,7 +161,7 @@ void MifareDesfireGetInformation(){
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 
        len =  DesfireAPDU(cmd, cmd_len, resp);
        if ( !len ) {
                print_result("ERROR <--: ", resp, len); 

-               OnError();
+               OnError(2);

                return;
        }
        
                return;
        }
        


@@ -192,7 +184,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
        //uint8_t new_key_data8[8]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
        //uint8_t new_key_data16[16]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
 
        //uint8_t new_key_data8[8]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
        //uint8_t new_key_data16[16]  = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
 

-       //uint8_t* bigbuffer = mifare_get_bigbufptr();

        uint8_t resp[256] = {0x00};
        uint8_t IV[16] = {0x00};
 
        uint8_t resp[256] = {0x00};
        uint8_t IV[16] = {0x00};
 


@@ -206,10 +197,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
        uint8_t encBoth[32] = {0x00};
 
        InitDesfireCard();
        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
        
        // 3 olika sätt att authenticera.   AUTH (CRC16) , AUTH_ISO (CRC32) , AUTH_AES (CRC32)
        // 4 olika crypto algo   DES, 3DES, 3K3DES, AES


@@ -220,7 +207,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
         case 1:{
             if (algo == 1) {
 
         case 1:{
             if (algo == 1) {
 

-            uint8_t keybytes[8];
+            uint8_t keybytes[8] = {0x00};

             uint8_t RndA[8] = {0x00};
             uint8_t RndB[8] = {0x00};
             
             uint8_t RndA[8] = {0x00};
             uint8_t RndB[8] = {0x00};
             


@@ -238,17 +225,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 ) {
             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.");
                 }
                     DbpString("Authentication failed. Card timeout.");
                 }

-                OnError();
+                OnError(3);

                 return;
             }
             
             if ( resp[2] == 0xaf ){
             } else {
                 DbpString("Authetication failed. Invalid key number.");
                 return;
             }
             
             if ( resp[2] == 0xaf ){
             } else {
                 DbpString("Authetication failed. Invalid key number.");

-                OnError();
+                OnError(3);

                 return;
             }
             
                 return;
             }
             


@@ -269,7 +256,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             
             for (int x = 0; x < 8; x++) {
                 decRndB[x] = decRndB[x] ^ encRndA[x];
             
             for (int x = 0; x < 8; x++) {
                 decRndB[x] = decRndB[x] ^ encRndA[x];

-

             }
             
             des_dec(&encRndB, &decRndB, key->data);
             }
             
             des_dec(&encRndB, &decRndB, key->data);


@@ -281,10 +267,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             
             len = DesfireAPDU(cmd, 17, resp);
             if ( !len ) {
             
             len = DesfireAPDU(cmd, 17, resp);
             if ( !len ) {

-                if (MF_DBGLEVEL >= 1) {
+                if (MF_DBGLEVEL >= MF_DBG_ERROR) {

                     DbpString("Authentication failed. Card timeout.");
                 }
                     DbpString("Authentication failed. Card timeout.");
                 }

-                OnError();
+                OnError(3);

                 return;
             }
             
                 return;
             }
             


@@ -301,17 +287,60 @@ 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.");
                 for (int x = 0; x < 8; x++) {
                     if (decRndA[x] != encRndA[x]) {
                         DbpString("Authetication failed. Cannot varify PICC.");

-                        OnError();
+                        OnError(4);

                         return;
                     }
                 }
                 
                         return;
                     }
                 }
                 

+                //Change the selected key to a new value.
+                /*
+                 
+                cmd[0] = CHANGE_KEY;
+                cmd[1] = keyno;
+                
+                uint8_t newKey[16] = {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77};
+                
+                uint8_t first, second;
+                uint8_t buff1[8] = {0x00};
+                uint8_t buff2[8] = {0x00};
+                uint8_t buff3[8] = {0x00};
+                
+                memcpy(buff1,newKey, 8);
+                memcpy(buff2,newKey + 8, 8);
+                
+                ComputeCrc14443(CRC_14443_A, newKey, 16, &first, &second);
+                memcpy(buff3, &first, 1);
+                memcpy(buff3 + 1, &second, 1);
+                
+                des_dec(&buff1, &buff1, skey->data);
+                memcpy(cmd+2,buff1,8);
+                
+                for (int x = 0; x < 8; x++) {
+                    buff2[x] = buff2[x] ^ buff1[x];
+                }
+                des_dec(&buff2, &buff2, skey->data);
+                memcpy(cmd+10,buff2,8);
+                
+                for (int x = 0; x < 8; x++) {
+                    buff3[x] = buff3[x] ^ buff2[x];
+                }
+                des_dec(&buff3, &buff3, skey->data);
+                memcpy(cmd+18,buff3,8);
+                
+                // The command always times out on the first attempt, this will retry until a response
+                // is recieved.
+                len = 0;
+                while(!len) {
+                    len = DesfireAPDU(cmd,26,resp);
+                }
+                */
+                

                 OnSuccess();
                 cmd_send(CMD_ACK,1,0,0,skey->data,8);
                 
             } else {
                 DbpString("Authetication failed.");
                 OnSuccess();
                 cmd_send(CMD_ACK,1,0,0,skey->data,8);
                 
             } else {
                 DbpString("Authetication failed.");

-                OnError();
+                OnError(6);

                 return;
             }
             
                 return;
             }
             


@@ -324,14 +353,14 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                case 3:{
                
                        //defaultkey
                case 3:{
                
                        //defaultkey

-                       uint8_t keybytes[16];
+                       uint8_t keybytes[16] = {0x00};

                        if (datain[1] == 0xff){
                                memcpy(keybytes,PICC_MASTER_KEY16,16); 
                        } else{
                                memcpy(keybytes, datain+1, datalen);
                        }
                        
                        if (datain[1] == 0xff){
                                memcpy(keybytes,PICC_MASTER_KEY16,16); 
                        } else{
                                memcpy(keybytes, datain+1, datalen);
                        }
                        

-                       struct desfire_key defaultkey = {0};
+                       struct desfire_key defaultkey = {0x00};

                        desfirekey_t key = &defaultkey;
                        Desfire_aes_key_new( keybytes, key);
                
                        desfirekey_t key = &defaultkey;
                        Desfire_aes_key_new( keybytes, key);
                


@@ -340,7 +369,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");
                                }
                                if( MF_DBGLEVEL >= 4) {
                                        Dbprintf("AES context failed to init");
                                }

-                               OnError();
+                               OnError(7);

                                return;
                        }
                        
                                return;
                        }
                        


@@ -348,10 +377,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 ) {
                        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.");
                                }
                                        DbpString("Authentication failed. Card timeout.");
                                }

-                               OnError();
+                               OnError(3);

                                return;
                        }
                        
                                return;
                        }
                        


@@ -369,10 +398,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 ) {
                        
                        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.");
                                }
                                        DbpString("Authentication failed. Card timeout.");
                                }

-                OnError();
+                OnError(3);

                                return;
                        }
                        
                                return;
                        }
                        


@@ -384,10 +413,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.");
                                print_result("SESSION : ", skey->data, 16);
                        } else {
                                DbpString("Authetication failed.");

-                               OnError();
+                               OnError(7);

                                return;
                        }
                                return;
                        }

-                       

                        break;
                }       
        }
                        break;
                }       
        }


@@ -402,10 +430,13 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 // dataout = pointer to response data array
 int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 
 // dataout = pointer to response data array
 int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 

-       uint32_t status = 0;
+       size_t len = 0;

        size_t wrappedLen = 0;
        uint8_t wCmd[USB_CMD_DATA_SIZE] = {0};
        
        size_t wrappedLen = 0;
        uint8_t wCmd[USB_CMD_DATA_SIZE] = {0};
        

+       uint8_t *resp = ((uint8_t *)BigBuf) + RECV_RESP_OFFSET;
+    uint8_t *resp_par = ((uint8_t *)BigBuf) + RECV_RESP_PAR_OFFSET;
+       

        wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
        
        if (MF_DBGLEVEL >= 4) {
        wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
        
        if (MF_DBGLEVEL >= 4) {


@@ -413,9 +444,9 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
        }
        ReaderTransmit( wCmd, wrappedLen, NULL);
 
        }
        ReaderTransmit( wCmd, wrappedLen, NULL);
 

-       status = ReaderReceive(dataout);
+       len = ReaderReceive(resp, resp_par);

        
        

-       if( status == 0x00){
+       if( len == 0x00 ){

                if (MF_DBGLEVEL >= 4) {
                        Dbprintf("fukked");
                }
                if (MF_DBGLEVEL >= 4) {
                        Dbprintf("fukked");
                }


@@ -423,14 +454,16 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
        }
        // if we received an I- or R(ACK)-Block with a block number equal to the
        // current block number, toggle the current block number
        }
        // if we received an I- or R(ACK)-Block with a block number equal to the
        // current block number, toggle the current block number

-       else if (status >= 4 // PCB+CID+CRC = 4 bytes
-                && ((dataout[0] & 0xC0) == 0 // I-Block
-                    || (dataout[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
-                && (dataout[0] & 0x01) == pcb_blocknum) // equal block numbers
+       else if (len >= 4 // PCB+CID+CRC = 4 bytes
+                && ((resp[0] & 0xC0) == 0 // I-Block
+                    || (resp[0] & 0xD0) == 0x80) // R-Block with ACK bit set to 0
+                && (resp[0] & 0x01) == pcb_blocknum) // equal block numbers

        {
                pcb_blocknum ^= 1;  //toggle next block 
        }
        {
                pcb_blocknum ^= 1;  //toggle next block 
        }

-       return status;
+
+       memcpy(dataout, resp, len);
+       return len;

 }      
 
 // CreateAPDU
 }      
 
 // CreateAPDU


@@ -443,7 +476,7 @@ size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout){
        
        cmd[0] = 0x0A;  //  0x0A = skicka cid,  0x02 = ingen cid. Särskilda bitar //
        cmd[0] |= pcb_blocknum; // OR the block number into the PCB     
        
        cmd[0] = 0x0A;  //  0x0A = skicka cid,  0x02 = ingen cid. Särskilda bitar //
        cmd[0] |= pcb_blocknum; // OR the block number into the PCB     

-       cmd[1] = 0x00;  //  CID: 0x00 //FIXME: allow multiple selected cards
+       cmd[1] = 0x00;  //  CID: 0x00 //TODO: allow multiple selected cards

        
        memcpy(cmd+2, datain, len);
        AppendCrc14443a(cmd, len+2);
        
        memcpy(cmd+2, datain, len);
        AppendCrc14443a(cmd, len+2);


@@ -465,10 +498,10 @@ void OnSuccess(){
        LEDsoff();
 }
 
        LEDsoff();
 }
 

-void OnError(){
+void OnError(uint8_t reason){

        pcb_blocknum = 0;
        ReaderTransmit(deselect_cmd, 3 , NULL);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        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();
 }
        LEDsoff();
 }