From 46e14b0f960dcd84fc41df32c74fb3fd89c0ac5c Mon Sep 17 00:00:00 2001 From: Blaine Forbort Date: Sun, 21 Dec 2014 23:54:29 -0800 Subject: [PATCH] Minor formatting change --- armsrc/mifaredesfire.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c index 13262991..b7c1bc5b 100644 --- a/armsrc/mifaredesfire.c +++ b/armsrc/mifaredesfire.c @@ -306,16 +306,15 @@ 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 first, second; uint8_t buff1[8] = {0x00}; uint8_t buff2[8] = {0x00}; uint8_t buff3[8] = {0x00}; @@ -324,24 +323,22 @@ void MifareDES_Auth1(uint8_t mode, uint8_t algo, uint8_t keyno, uint8_t *datain 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+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 -- 2.39.5