Merge pull request #1 from bforbort/master

Added DES AUTH command support

diff --combined armsrc/mifaredesfire.c
index 7511932264815e4574e8b95b5f4ef35517b83278,3e03ee471dfaee5dc476ef3b3bdff33243884e52..155538cb45a9a0612811d89158face468a59a293
--- 1/armsrc/mifaredesfire.c
--- 2/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@@ -1,4 -1,5 +1,5 @@@
  #include "mifaredesfire.h"
+ #include "des.h"
  
  #define MAX_APPLICATION_COUNT 28
  #define MAX_FILE_COUNT 16
@@@ -24,15 -25,17 +25,15 @@@ bool InitDesfireCard()
        
        byte_t cardbuf[USB_CMD_DATA_SIZE];
        memset(cardbuf,0,sizeof(cardbuf));
 +      iso14a_card_select_t *card = (iso14a_card_select_t*)cardbuf;
        
        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) {
 -              if (MF_DBGLEVEL >= 1) {
 -                      Dbprintf("Can't select card");
 -              }
 +              if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
                OnError();
                return false;
        }
@@@ -185,7 -188,7 +186,7 @@@ void MifareDES_Auth1(uint8_t mode, uint
        int len = 0;
        //uint8_t PICC_MASTER_KEY8[8] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47};
        uint8_t PICC_MASTER_KEY16[16] = { 0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f };
-       //uint8_t null_key_data8[8] = {0x00};
+       uint8_t null_key_data8[8] = {0x00};
        //uint8_t null_key_data16[16] = {0x00}; 
        //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};
@@@ -215,10 -218,149 +216,149 @@@
        
        // des, nyckel 0, 
        switch (mode){
-               case 1:
-                       // if ( SendDesfireCommand(AUTHENTICATE, &keyno, resp) > 0 ){
-                               // // fick nonce från kortet
-                       // }
+         case 1:{
+             if (algo == 1) {
+ 
+             uint8_t keybytes[8];
+             uint8_t RndA[8] = {0x00};
+             uint8_t RndB[8] = {0x00};
+             
+             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;
+             Desfire_des_key_new(keybytes, key);
+             
+             cmd[0] = AUTHENTICATE;
+             cmd[1] = keyno;  //keynumber
+             len = DesfireAPDU(cmd, 2, resp);
+             if ( !len ) {
+                 if (MF_DBGLEVEL >= 1) {
+                     DbpString("Authentication failed. Card timeout.");
+                 }
+                 OnError();
+                 return;
+             }
+             
+             if ( resp[2] == 0xaf ){
+             } else {
+                 DbpString("Authetication failed. Invalid key number.");
+                 OnError();
+                 return;
+             }
+             
+             memcpy( encRndB, resp+3, 8);
+             
+             des_dec(&decRndB, &encRndB, key->data);
+             memcpy(RndB, decRndB, 8);
+             rol(decRndB,8);
+             
+             // This should be random
+             uint8_t decRndA[8] = {0x00};
+             memcpy(RndA, decRndA, 8);
+             uint8_t encRndA[8] = {0x00};
+             
+             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(&encRndB, &decRndB, key->data);
+             
+             memcpy(both + 8, encRndB, 8);
+             
+             cmd[0] = ADDITIONAL_FRAME;
+             memcpy(cmd+1, both, 16 );
+             
+             len = DesfireAPDU(cmd, 17, resp);
+             if ( !len ) {
+                 if (MF_DBGLEVEL >= 1) {
+                     DbpString("Authentication failed. Card timeout.");
+                 }
+                 OnError();
+                 return;
+             }
+             
+             if ( resp[2] == 0x00 ){
+                 
+                 struct desfire_key sessionKey = {0};
+                 desfirekey_t skey = &sessionKey;
+                 Desfire_session_key_new( RndA, RndB , key, skey );
+                 //print_result("SESSION : ", skey->data, 8);
+                 
+                 memcpy(encRndA, resp+3, 8);
+                 des_dec(&encRndA, &encRndA, key->data);
+                 rol(decRndA,8);
+                 for (int x = 0; x < 8; x++) {
+                     if (decRndA[x] != encRndA[x]) {
+                         DbpString("Authetication failed. Cannot varify PICC.");
+                         OnError();
+                         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.");
+                 OnError();
+                 return;
+             }
+             
+             }
+             }
                        break;
                case 2:
                        //SendDesfireCommand(AUTHENTICATE_ISO, &keyno, resp);
@@@ -350,7 -492,7 +490,7 @@@ size_t CreateAPDU( uint8_t *datain, siz
        
        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);