ADD: midnitesnakes desfire, ultralight changes from Unstable branch.

[proxmark3-svn] / armsrc / mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 4a58037140fa5d2bba13b2b27af7f24c56face5a..7511932264815e4574e8b95b5f4ef35517b83278 100644 (file)
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -24,17 +24,15 @@ bool InitDesfireCard(){
        
        byte_t cardbuf[USB_CMD_DATA_SIZE];
        memset(cardbuf,0,sizeof(cardbuf));
        
        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_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) {
-                       Dbprintf("Can't select card");
-               }
+               if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");

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


@@ -78,9 +76,9 @@ 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 ) {
                OnError();
 
        if ( !len ) {
                OnError();


@@ -124,7 +122,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);
        // 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");
                }
                if (MF_DBGLEVEL >= 1) {
                        Dbprintf("Can't select card");
                }


@@ -306,7 +304,7 @@ 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};
        


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

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

        
        

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

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


@@ -330,16 +328,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
+       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 
        }
                 && ((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 
        }

-       // copy response to
-       dataout = resp;
-       return status;
+
+       memcpy(dataout, resp, len);
+       return len;

 }      
 
 // CreateAPDU
 }      
 
 // CreateAPDU


@@ -352,7 +350,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);