]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge remote-tracking branch 'origin/DESFireAuth'
authorBlaine Forbort <b.forbort@gmail.com>
Thu, 1 Jan 2015 18:41:14 +0000 (10:41 -0800)
committerBlaine Forbort <b.forbort@gmail.com>
Thu, 1 Jan 2015 18:41:14 +0000 (10:41 -0800)
1  2 
armsrc/mifaredesfire.c

diff --combined armsrc/mifaredesfire.c
index 0d8de438a71eec2ffa95167a4fa7b33ac75db058,acb16c05bc9d6c7cb13fcfbd1c809829a68457ef..3e03ee471dfaee5dc476ef3b3bdff33243884e52
@@@ -1,11 -1,11 +1,12 @@@
  #include "mifaredesfire.h"
+ #include "des.h"
  
  #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 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;
@@@ -59,7 -59,7 +60,7 @@@ void MifareSendCommand(uint8_t arg0, ui
        */
        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) {
@@@ -78,9 -78,9 +79,9 @@@
        }
        
        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 ) {
                OnError();
@@@ -124,7 -124,7 +125,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);
 -      if (isOK != 1) {
 +      if ( isOK == 0) {
                if (MF_DBGLEVEL >= 1) {
                        Dbprintf("Can't select card");
                }
@@@ -187,12 -187,12 +188,12 @@@ 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};
  
 -      //uint8_t* bigbuffer = mifare_get_bigbufptr();
 +      //uint8_t* bigbuffer = get_bigbufptr_recvrespbuf();
        uint8_t resp[256] = {0x00};
        uint8_t IV[16] = {0x00};
  
        
        // 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);
  // 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};
        
 +      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) {
        }
        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 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 
        }
 -      return status;
 +
 +      memcpy(dataout, resp, len);
 +      return len;
  }     
  
  // CreateAPDU
Impressum, Datenschutz