X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7c5f70dd9f8805967628f429f96fe1159a8bb827..0956e0dba568044b63636151999c817e76f47964:/armsrc/mifaredesfire.c diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c index 155538cb..cacd767f 100644 --- a/armsrc/mifaredesfire.c +++ b/armsrc/mifaredesfire.c @@ -1,5 +1,5 @@ #include "mifaredesfire.h" -#include "des.h" +#include "BigBuf.h" #define MAX_APPLICATION_COUNT 28 #define MAX_FILE_COUNT 16 @@ -19,22 +19,18 @@ static uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4}; bool InitDesfireCard(){ - // Make sure it is off. -// FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); -// SpinDelay(300); - - 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); + set_tracing(TRUE); + + 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); if (!len) { - if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card"); - OnError(); + if (MF_DBGLEVEL >= MF_DBG_ERROR) + Dbprintf("Can't select card"); + OnError(1); return false; } return true; @@ -68,7 +64,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){ } if ( flags & CLEARTRACE ){ - iso14a_clear_trace(); + clear_trace(); } if ( flags & INIT ){ @@ -82,7 +78,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){ } if ( !len ) { - OnError(); + OnError(2); return; } @@ -99,13 +95,9 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){ void MifareDesfireGetInformation(){ int len = 0; - uint8_t resp[USB_CMD_DATA_SIZE]; - uint8_t dataout[USB_CMD_DATA_SIZE]; - byte_t cardbuf[USB_CMD_DATA_SIZE]; - - memset(resp,0,sizeof(resp)); - memset(dataout,0, sizeof(dataout)); - memset(cardbuf,0,sizeof(cardbuf)); + 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 @@ -116,18 +108,18 @@ void MifareDesfireGetInformation(){ 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 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 >= 1) { + if (MF_DBGLEVEL >= MF_DBG_ERROR) { Dbprintf("Can't select card"); } - OnError(); + OnError(1); return; } @@ -143,7 +135,7 @@ void MifareDesfireGetInformation(){ len = DesfireAPDU(cmd, cmd_len, resp); if ( !len ) { print_result("ERROR <--: ", resp, len); - OnError(); + OnError(2); return; } @@ -156,7 +148,7 @@ void MifareDesfireGetInformation(){ len = DesfireAPDU(cmd, cmd_len, resp); if ( !len ) { print_result("ERROR <--: ", resp, len); - OnError(); + OnError(2); return; } @@ -168,7 +160,7 @@ void MifareDesfireGetInformation(){ len = DesfireAPDU(cmd, cmd_len, resp); if ( !len ) { print_result("ERROR <--: ", resp, len); - OnError(); + OnError(2); return; } @@ -191,7 +183,6 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain //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 = get_bigbufptr_recvrespbuf(); uint8_t resp[256] = {0x00}; uint8_t IV[16] = {0x00}; @@ -205,7 +196,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain uint8_t encBoth[32] = {0x00}; InitDesfireCard(); - + LED_A_ON(); LED_B_OFF(); LED_C_OFF(); @@ -217,43 +208,58 @@ 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]; + 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; cmd[1] = keyno; //keynumber len = DesfireAPDU(cmd, 2, resp); if ( !len ) { - if (MF_DBGLEVEL >= 1) { + if (MF_DBGLEVEL >= MF_DBG_ERROR) { DbpString("Authentication failed. Card timeout."); } - OnError(); + OnError(3); return; } if ( resp[2] == 0xaf ){ } else { DbpString("Authetication failed. Invalid key number."); - OnError(); + OnError(3); return; } 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); @@ -262,15 +268,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); @@ -280,10 +292,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain len = DesfireAPDU(cmd, 17, resp); if ( !len ) { - if (MF_DBGLEVEL >= 1) { + if (MF_DBGLEVEL >= MF_DBG_ERROR) { DbpString("Authentication failed. Card timeout."); } - OnError(); + OnError(3); return; } @@ -295,12 +307,17 @@ 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]) { DbpString("Authetication failed. Cannot varify PICC."); - OnError(); + OnError(4); return; } } @@ -308,6 +325,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; @@ -325,6 +344,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); @@ -346,18 +407,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(); + OnError(6); return; } - - } } break; case 2: @@ -366,14 +429,14 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain case 3:{ //defaultkey - uint8_t keybytes[16]; + uint8_t keybytes[16] = {0x00}; if (datain[1] == 0xff){ memcpy(keybytes,PICC_MASTER_KEY16,16); } else{ memcpy(keybytes, datain+1, datalen); } - struct desfire_key defaultkey = {0}; + struct desfire_key defaultkey = {0x00}; desfirekey_t key = &defaultkey; Desfire_aes_key_new( keybytes, key); @@ -382,7 +445,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain if( MF_DBGLEVEL >= 4) { Dbprintf("AES context failed to init"); } - OnError(); + OnError(7); return; } @@ -390,10 +453,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain cmd[1] = 0x00; //keynumber len = DesfireAPDU(cmd, 2, resp); if ( !len ) { - if (MF_DBGLEVEL >= 1) { + if (MF_DBGLEVEL >= MF_DBG_ERROR) { DbpString("Authentication failed. Card timeout."); } - OnError(); + OnError(3); return; } @@ -411,10 +474,10 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain len = DesfireAPDU(cmd, 33, resp); // 1 + 32 == 33 if ( !len ) { - if (MF_DBGLEVEL >= 1) { + if (MF_DBGLEVEL >= MF_DBG_ERROR) { DbpString("Authentication failed. Card timeout."); } - OnError(); + OnError(3); return; } @@ -426,7 +489,7 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain print_result("SESSION : ", skey->data, 16); } else { DbpString("Authetication failed."); - OnError(); + OnError(7); return; } @@ -446,10 +509,10 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){ size_t len = 0; size_t wrappedLen = 0; - uint8_t wCmd[USB_CMD_DATA_SIZE] = {0}; + uint8_t wCmd[USB_CMD_DATA_SIZE] = {0x00}; - uint8_t *resp = ((uint8_t *)BigBuf) + RECV_RESP_OFFSET; - uint8_t *resp_par = ((uint8_t *)BigBuf) + RECV_RESP_PAR_OFFSET; + uint8_t resp[MAX_FRAME_SIZE]; + uint8_t par[MAX_PARITY_SIZE]; wrappedLen = CreateAPDU( cmd, cmd_len, wCmd); @@ -458,12 +521,10 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){ } ReaderTransmit( wCmd, wrappedLen, NULL); - len = ReaderReceive(resp, resp_par); + len = ReaderReceive(resp, par); if( len == 0x00 ){ - if (MF_DBGLEVEL >= 4) { - Dbprintf("fukked"); - } + 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 @@ -510,12 +571,10 @@ void OnSuccess(){ ReaderTransmit(deselect_cmd, 3 , NULL); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LEDsoff(); + set_tracing(FALSE); } -void OnError(){ - pcb_blocknum = 0; - ReaderTransmit(deselect_cmd, 3 , NULL); - FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); - cmd_send(CMD_ACK,0,0,0,0,0); - LEDsoff(); +void OnError(uint8_t reason){ + cmd_send(CMD_ACK,0,reason,0,0,0); + OnSuccess(); }