From 4e2e4bcf9b4399d8de4e7291298a9be5b0f9ef5d Mon Sep 17 00:00:00 2001 From: Blaine Forbort Date: Sun, 21 Dec 2014 22:59:24 -0800 Subject: [PATCH] Tested by changing the master key from the default to a custom value --- armsrc/mifaredesfire.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c index e5a2289b..13262991 100644 --- a/armsrc/mifaredesfire.c +++ b/armsrc/mifaredesfire.c @@ -306,6 +306,52 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain } } + /* + //Change the selected key to a new value. + + cmd[0] = 0xc4; + cmd[1] = keyno; + + uint8_t first,second; + + uint8_t newKey[16] = {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77}; + + 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); + + for (int x = 0; x < 8; x++) { + buff2[x] = buff2[x] ^ buff1[x]; + } + des_dec(&buff2, &buff2, skey->data); + + for (int x = 0; x < 8; x++) { + buff3[x] = buff3[x] ^ buff2[x]; + } + des_dec(&buff3, &buff3, skey->data); + + memcpy(cmd+2,buff1,8); + memcpy(cmd+10,buff2,8); + 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); -- 2.39.5