CHG: moved includes into header file where it belong

[proxmark3-svn] / armsrc / mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index b1e035f9a7ca2ea2fea1153682b2e3524c46e632..c5e42277d49650dc47d545ca504b8b0df8e76bc3 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -1,5 +1,4 @@
 #include "mifaredesfire.h"
-#include "des.h"
 #include "BigBuf.h"
 
 #define MAX_APPLICATION_COUNT 28
@@ -26,7 +25,7 @@ bool InitDesfireCard(){
        byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};
        iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
        
-       int len = iso14443a_select_card(NULL,card,NULL);
+       int len = iso14443a_select_card(NULL,card,NULL,true,0);
 
        if (!len) {
                if (MF_DBGLEVEL >= MF_DBG_ERROR)
@@ -64,9 +63,8 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
                print_result(" RX    : ", datain, datalen);
        }
        
-       if ( flags & CLEARTRACE ){
+       if ( flags & CLEARTRACE )
                clear_trace();
-       }
        
        if ( flags & INIT ){
                if ( !InitDesfireCard() )
@@ -74,9 +72,8 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
        }
        
        int len = DesfireAPDU(datain, datalen, resp);
-       if (MF_DBGLEVEL >= 4) {
+       if (MF_DBGLEVEL >= 4)
                print_result("ERR <--: ", resp, len);
-       }
 
        if ( !len ) {
                OnError(2);
@@ -86,9 +83,8 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
        // reset the pcb_blocknum,
        pcb_blocknum = 0;
        
-       if ( flags & DISCONNECT ){
+       if ( flags & DISCONNECT )
                OnSuccess();
-       }
        
        cmd_send(CMD_ACK,1,len,0,resp,len);
 }
@@ -115,7 +111,7 @@ void MifareDesfireGetInformation(){
 
        // card select - information
        iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
-       byte_t isOK = iso14443a_select_card(NULL, card, NULL);
+       byte_t isOK = iso14443a_select_card(NULL, card, NULL, true, 0);
        if ( isOK == 0) {
                if (MF_DBGLEVEL >= MF_DBG_ERROR) {
                        Dbprintf("Can't select card");
@@ -198,6 +194,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 
        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 kommunikations sätt,   PLAIN,MAC,CRYPTO
@@ -205,20 +205,32 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
        // des, nyckel 0, 
        switch (mode){
         case 1:{
-            if (algo == 1) {
-
-            uint8_t keybytes[8] = {0x00};
+            uint8_t keybytes[16];
             uint8_t RndA[8] = {0x00};
             uint8_t RndB[8] = {0x00};
             
+            if (algo == 2) {
             if (datain[1] == 0xff){
+                    memcpy(keybytes,PICC_MASTER_KEY16,16);
+                } else {
+                    memcpy(keybytes, datain+1, datalen);
+                }
+            } else {
+                if (algo == 1) {
+                    if (datain[1] == 0xff){
                 memcpy(keybytes,null_key_data8,8);
             } else{
                 memcpy(keybytes, datain+1, datalen);
             }
+                }
+            }
             
             struct desfire_key defaultkey = {0};
             desfirekey_t key = &defaultkey;
+            
+            if (algo == 2)
+                Desfire_3des_key_new_with_version(keybytes, key);
+            else if (algo ==1)
             Desfire_des_key_new(keybytes, key);
             
             cmd[0] = AUTHENTICATE;
@@ -240,8 +252,11 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             }
             
             memcpy( encRndB, resp+3, 8);
-            
+            if (algo == 2)
+                tdes_dec(&decRndB, &encRndB, key->data);
+            else if (algo == 1)
             des_dec(&decRndB, &encRndB, key->data);
+            
             memcpy(RndB, decRndB, 8);
             rol(decRndB,8);
             
@@ -250,14 +265,21 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             memcpy(RndA, decRndA, 8);
             uint8_t encRndA[8] = {0x00};
             
+            if (algo == 2)
+                tdes_dec(&encRndA, &decRndA, key->data);
+            else if (algo == 1)
             des_dec(&encRndA, &decRndA, key->data);
             
             memcpy(both, encRndA, 8);
             
             for (int x = 0; x < 8; x++) {
                 decRndB[x] = decRndB[x] ^ encRndA[x];
+                
             }
             
+            if (algo == 2)
+                tdes_dec(&encRndB, &decRndB, key->data);
+            else if (algo == 1)
             des_dec(&encRndB, &decRndB, key->data);
             
             memcpy(both + 8, encRndB, 8);
@@ -282,7 +304,12 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 //print_result("SESSION : ", skey->data, 8);
                 
                 memcpy(encRndA, resp+3, 8);
+                
+                if (algo == 2)
+                    tdes_dec(&encRndA, &encRndA, key->data);
+                else if (algo == 1)
                 des_dec(&encRndA, &encRndA, key->data);
+                
                 rol(decRndA,8);
                 for (int x = 0; x < 8; x++) {
                     if (decRndA[x] != encRndA[x]) {
@@ -295,6 +322,8 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 //Change the selected key to a new value.
                 /*
                  
+                 // Current key is a 3DES key, change it to a DES key
+                 if (algo == 2) {
                 cmd[0] = CHANGE_KEY;
                 cmd[1] = keyno;
                 
@@ -312,6 +341,48 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 memcpy(buff3, &first, 1);
                 memcpy(buff3 + 1, &second, 1);
                 
+                 tdes_dec(&buff1, &buff1, skey->data);
+                 memcpy(cmd+2,buff1,8);
+                 
+                 for (int x = 0; x < 8; x++) {
+                 buff2[x] = buff2[x] ^ buff1[x];
+                 }
+                 tdes_dec(&buff2, &buff2, skey->data);
+                 memcpy(cmd+10,buff2,8);
+                 
+                 for (int x = 0; x < 8; x++) {
+                 buff3[x] = buff3[x] ^ buff2[x];
+                 }
+                 tdes_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);
+                 }
+                 
+                 } else {
+                    // Current key is a DES key, change it to a 3DES key
+                    if (algo == 1) {
+                        cmd[0] = CHANGE_KEY;
+                        cmd[1] = keyno;
+                        
+                        uint8_t newKey[16] = {0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f};
+                        
+                        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);
                 
@@ -333,18 +404,20 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 while(!len) {
                     len = DesfireAPDU(cmd,26,resp);
                 }
+                    }
+                 }
                 */
                 
                 OnSuccess();
+                if (algo == 2)
+                    cmd_send(CMD_ACK,1,0,0,skey->data,16);
+                else if (algo == 1)
                 cmd_send(CMD_ACK,1,0,0,skey->data,8);
-                
             } else {
                 DbpString("Authetication failed.");
                 OnError(6);
                 return;
             }
-            
-            }
             }
                        break;
                case 2:
@@ -416,6 +489,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                                OnError(7);
                                return;
                        }
+                       
                        break;
                }       
        }
@@ -446,7 +520,7 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 
        len = ReaderReceive(resp, par);
        
-       if( len == 0x00 ){
+       if ( !len ) {
                if (MF_DBGLEVEL >= 4) Dbprintf("fukked");
                return FALSE; //DATA LINK ERROR
        }
@@ -498,11 +572,6 @@ void OnSuccess(){
 }
 
 void OnError(uint8_t reason){
-       pcb_blocknum = 0;
-       ReaderTransmit(deselect_cmd, 3 , NULL);
-       
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        cmd_send(CMD_ACK,0,reason,0,0,0);
-       LEDsoff();
-       set_tracing(FALSE);     
+       OnSuccess();
 }