X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4e2e4bcf9b4399d8de4e7291298a9be5b0f9ef5d..23b80a733436e88426c2b857950674768eb2b8a2:/armsrc/mifaredesfire.c

diff --git a/armsrc/mifaredesfire.c b/armsrc/mifaredesfire.c
index 13262991..3e03ee47 100644
--- a/armsrc/mifaredesfire.c
+++ b/armsrc/mifaredesfire.c
@@ -3,9 +3,10 @@
 
 #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 +60,7 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
 	*/
 	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 +79,9 @@ void MifareSendCommand(uint8_t arg0, uint8_t arg1, uint8_t *datain){
 	}
 	
 	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 +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");
 		}
@@ -192,7 +193,7 @@ 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 = mifare_get_bigbufptr();
+	//uint8_t* bigbuffer = get_bigbufptr_recvrespbuf();
 	uint8_t resp[256] = {0x00};
 	uint8_t IV[16] = {0x00};
 
@@ -306,16 +307,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[0] = CHANGE_KEY;
                 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 +324,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
@@ -448,10 +446,13 @@ 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){
 
-	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) {
@@ -459,9 +460,9 @@ int DesfireAPDU(uint8_t *cmd, size_t cmd_len, uint8_t *dataout){
 	}
 	ReaderTransmit( wCmd, wrappedLen, NULL);
 
-	status = ReaderReceive(dataout);
+	len = ReaderReceive(resp, resp_par);
 	
-	if( status == 0x00){
+	if( len == 0x00 ){
 		if (MF_DBGLEVEL >= 4) {
 			Dbprintf("fukked");
 		}
@@ -469,14 +470,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
-	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