CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool.

[proxmark3-svn] / armsrc / mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 5737615106c9a0cddd2d8a92d3763807c97d6b01..6a9baeadf06ba7956def63caf66574920eb9ad5d 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -1,5 +1,4 @@
 #include "mifaredesfire.h"
 #include "mifaredesfire.h"

-#include "des.h"

 
 #define MAX_APPLICATION_COUNT 28
 #define MAX_FILE_COUNT 16
 
 #define MAX_APPLICATION_COUNT 28
 #define MAX_FILE_COUNT 16


@@ -18,19 +17,14 @@ 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(){

-       
-       byte_t cardbuf[USB_CMD_DATA_SIZE] = {0x00};

 
 

-       iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
+       iso14a_card_select_t card;

        
        

-       iso14a_set_tracing(TRUE);

        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
        iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);

-       
-       int len = iso14443a_select_card(NULL,card,NULL);
+       set_tracing(TRUE);

 
 

-       if (!len) {
-               if (MF_DBGLEVEL >= MF_DBG_ERROR)
-                       Dbprintf("Can't select card");
+       if (!iso14443a_select_card(NULL, &card, NULL, true, 0)) {
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");

                OnError(1);
                return false;
        }
                OnError(1);
                return false;
        }


@@ -64,9 +58,8 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
                print_result(" RX    : ", datain, datalen);
        }
        
                print_result(" RX    : ", datain, datalen);
        }
        

-       if ( flags & CLEARTRACE ){
-               iso14a_clear_trace();
-       }
+       if ( flags & CLEARTRACE )
+               clear_trace();

        
        if ( flags & INIT ){
                if ( !InitDesfireCard() )
        
        if ( flags & INIT ){
                if ( !InitDesfireCard() )


@@ -74,9 +67,8 @@ 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) {
+       if (MF_DBGLEVEL >= 4)

                print_result("ERR <--: ", resp, len);
                print_result("ERR <--: ", resp, len);

-       }

 
        if ( !len ) {
                OnError(2);
 
        if ( !len ) {
                OnError(2);


@@ -86,9 +78,8 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
        // reset the pcb_blocknum,
        pcb_blocknum = 0;
        
        // reset the pcb_blocknum,
        pcb_blocknum = 0;
        

-       if ( flags & DISCONNECT ){
+       if ( flags & DISCONNECT )

                OnSuccess();
                OnSuccess();

-       }

        
        cmd_send(CMD_ACK,1,len,0,resp,len);
 }
        
        cmd_send(CMD_ACK,1,len,0,resp,len);
 }


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

+       iso14a_card_select_t card;

        uint8_t resp[USB_CMD_DATA_SIZE] = {0x00};
        uint8_t dataout[USB_CMD_DATA_SIZE] = {0x00};
        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


@@ -109,22 +100,18 @@ void MifareDesfireGetInformation(){
                PCB == 0x0A because sending CID byte.
                CID == 0x00 first card?         
        */
                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
        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 >= MF_DBG_ERROR) {
-                       Dbprintf("Can't select card");
-               }
+       if ( !iso14443a_select_card(NULL, &card, NULL, true, 0) ) {
+               if (MF_DBGLEVEL >= MF_DBG_ERROR) DbpString("Can't select card");

                OnError(1);
                return;
        }
 
                OnError(1);
                return;
        }
 

-       memcpy(dataout,card->uid,7);
+       memcpy(dataout, card.uid, 7);

 
        LED_A_ON();
        LED_B_OFF();
 
        LED_A_ON();
        LED_B_OFF();


@@ -198,6 +185,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
 
        InitDesfireCard();
        
 
        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
        // 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 +196,32 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
        // des, nyckel 0, 
        switch (mode){
         case 1:{
        // 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};
             
             uint8_t RndA[8] = {0x00};
             uint8_t RndB[8] = {0x00};
             

+            if (algo == 2) {

             if (datain[1] == 0xff){
             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);
             }
                 memcpy(keybytes,null_key_data8,8);
             } else{
                 memcpy(keybytes, datain+1, datalen);
             }

+                }
+            }

             
             struct desfire_key defaultkey = {0};
             desfirekey_t key = &defaultkey;
             
             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;
             Desfire_des_key_new(keybytes, key);
             
             cmd[0] = AUTHENTICATE;


@@ -240,8 +243,11 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
             }
             
             memcpy( encRndB, resp+3, 8);
             }
             
             memcpy( encRndB, resp+3, 8);

-            
+            if (algo == 2)
+                tdes_dec(&decRndB, &encRndB, key->data);
+            else if (algo == 1)

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

+            

             memcpy(RndB, decRndB, 8);
             rol(decRndB,8);
             
             memcpy(RndB, decRndB, 8);
             rol(decRndB,8);
             


@@ -250,14 +256,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};
             
             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];
             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);
             des_dec(&encRndB, &decRndB, key->data);
             
             memcpy(both + 8, encRndB, 8);


@@ -282,7 +295,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);
                 //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);
                 des_dec(&encRndA, &encRndA, key->data);

+                

                 rol(decRndA,8);
                 for (int x = 0; x < 8; x++) {
                     if (decRndA[x] != encRndA[x]) {
                 rol(decRndA,8);
                 for (int x = 0; x < 8; x++) {
                     if (decRndA[x] != encRndA[x]) {


@@ -295,6 +313,8 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 //Change the selected key to a new value.
                 /*
                  
                 //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;
                 
                 cmd[0] = CHANGE_KEY;
                 cmd[1] = keyno;
                 


@@ -312,6 +332,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);
                 
                 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);
                 
                 des_dec(&buff1, &buff1, skey->data);
                 memcpy(cmd+2,buff1,8);
                 


@@ -333,18 +395,20 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                 while(!len) {
                     len = DesfireAPDU(cmd,26,resp);
                 }
                 while(!len) {
                     len = DesfireAPDU(cmd,26,resp);
                 }

+                    }
+                 }

                 */
                 
                 OnSuccess();
                 */
                 
                 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);
                 cmd_send(CMD_ACK,1,0,0,skey->data,8);

-                

             } else {
                 DbpString("Authetication failed.");
                 OnError(6);
                 return;
             }
             } else {
                 DbpString("Authetication failed.");
                 OnError(6);
                 return;
             }

-            
-            }

             }
                        break;
                case 2:
             }
                        break;
                case 2:


@@ -416,6 +480,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno,  uint8_t *datain
                                OnError(7);
                                return;
                        }
                                OnError(7);
                                return;
                        }

+                       

                        break;
                }       
        }
                        break;
                }       
        }


@@ -432,24 +497,20 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 
        size_t len = 0;
        size_t wrappedLen = 0;
 
        size_t len = 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;
+       uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00};
+       uint8_t resp[MAX_FRAME_SIZE];
+    uint8_t par[MAX_PARITY_SIZE];

        
        wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
        
        
        wrappedLen = CreateAPDU( cmd, cmd_len, wCmd);
        

-       if (MF_DBGLEVEL >= 4) {
+       if (MF_DBGLEVEL >= 4)

                print_result("WCMD <--: ", wCmd, wrappedLen);   
                print_result("WCMD <--: ", wCmd, wrappedLen);   

-       }
+

        ReaderTransmit( wCmd, wrappedLen, NULL);
 
        ReaderTransmit( wCmd, wrappedLen, NULL);
 

-       len = ReaderReceive(resp, resp_par);
-       
-       if( len == 0x00 ){
-               if (MF_DBGLEVEL >= 4) {
-                       Dbprintf("fukked");
-               }
+       len = ReaderReceive(resp, par);
+       if ( !len ) {
+               if (MF_DBGLEVEL >= 4) Dbprintf("fukked");

                return FALSE; //DATA LINK ERROR
        }
        // if we received an I- or R(ACK)-Block with a block number equal to the
                return FALSE; //DATA LINK ERROR
        }
        // if we received an I- or R(ACK)-Block with a block number equal to the


@@ -494,14 +555,13 @@ size_t CreateAPDU( uint8_t *datain, size_t len, uint8_t *dataout){
 void OnSuccess(){
        pcb_blocknum = 0;
        ReaderTransmit(deselect_cmd, 3 , NULL);
 void OnSuccess(){
        pcb_blocknum = 0;
        ReaderTransmit(deselect_cmd, 3 , NULL);

+       mifare_ultra_halt();

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LEDsoff();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        LEDsoff();

+       set_tracing(FALSE);     

 }
 
 void OnError(uint8_t reason){
 }
 
 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);
        cmd_send(CMD_ACK,0,reason,0,0,0);

-       LEDsoff();
+       OnSuccess();

 }
 }