X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4973f23d3c2d2086ec694a13602b21a19726ab49..704d552a776c35f4792971c739737047c0396205:/armsrc/mifareutil.c?ds=sidebyside

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index c706e78a..84477a2b 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -18,6 +18,7 @@
 #include "iso14443a.h"
 #include "crapto1.h"
 #include "mifareutil.h"
+#include "parity.h"
 #include "des.h"
 
 int MF_DBGLEVEL = MF_DBG_ALL;
@@ -50,7 +51,7 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
 		data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
 		if((i&0x0007) == 0) 
 			par[i>>3] = 0;
-		par[i>>3] |= (((filter(pcs->odd) ^ oddparity(bt)) & 0x01)<<(7-(i&0x0007)));
+		par[i>>3] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
 	}	
 	return;
 }
@@ -65,17 +66,11 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
 	return bt;
 }
 
-// send 2 byte commands
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)
-{
-	return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, answer_parity, timing);
-}
-
 // send X byte basic commands
 int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)
 {
 	uint8_t dcmd[data_size+3];
-	dcmd[0] = cmd;
+    dcmd[0] = cmd;
 	memcpy(dcmd+1,data,data_size);
 	AppendCrc14443a(dcmd, data_size+1);
 	ReaderTransmit(dcmd, sizeof(dcmd), timing);
@@ -84,56 +79,12 @@ int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answe
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("%02X Cmd failed. Card timeout.", cmd);
 			len = ReaderReceive(answer,answer_parity);
 		//return 0;
-	}
-	return len;
-}
-
-/*
-int mifare_sendcmd_short_mfucauth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
-{
-	uint8_t dcmd[19];
-	int len; 
-	dcmd[0] = cmd;
-	memcpy(dcmd+1,data,16);
-	AppendCrc14443a(dcmd, 17);
-	
-	ReaderTransmit(dcmd, sizeof(dcmd), timing);
-	len = ReaderReceive(answer, answer_parity);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("Authentication failed. Card timeout.");
-			len = ReaderReceive(answer,answer_parity);
-	}
-	if(len==1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("NAK - Authentication failed.");
-		return 1;
-	}
-	return len;
-}
-
-int mifare_sendcmd_short_mfuev1auth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
-{
-	uint8_t dcmd[7];
-	int len; 
-	dcmd[0] = cmd;
-	memcpy(dcmd+1,data,4);
-	AppendCrc14443a(dcmd, 5);
-
-	ReaderTransmit(dcmd, sizeof(dcmd), timing);
-	len = ReaderReceive(answer, answer_parity);
-	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("Authentication failed. Card timeout.");
-		len = ReaderReceive(answer,answer_parity);
-	}
-	if(len==1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)   Dbprintf("NAK - Authentication failed.");
-		return 1;
-	}
+    }
 	return len;
 }
-*/
 
 // send 2 byte commands
-int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)
 {
 	uint8_t dcmd[4], ecmd[4];
 	uint16_t pos, res;
@@ -149,7 +100,7 @@ int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm
 		for (pos = 0; pos < 4; pos++)
 		{
 			ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
-			par[0] |= (((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) << (7-pos));
+			par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
 		}	
 
 		ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
@@ -194,7 +145,11 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	uint32_t pos;
 	uint8_t tmp4[4];
 	uint8_t par[1] = {0x00};
-	byte_t nr[4];
+
+	// "random" reader nonce:
+	byte_t nr[4] = {0x55, 0x41, 0x49, 0x92};
+	//byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};
+	
 	uint32_t nt, ntpp; // Supplied tag nonce
 	
 	uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
@@ -206,12 +161,6 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	if (MF_DBGLEVEL >= 4)	Dbprintf("rand tag nonce len: %x", len);  
 	if (len != 4) return 1;
 	
-	// "random" reader nonce:
-	nr[0] = 0x55;
-	nr[1] = 0x41;
-	nr[2] = 0x49;
-	nr[3] = 0x92; 
-	
 	// Save the tag nonce (nt)
 	nt = bytes_to_num(receivedAnswer, 4);
 
@@ -243,7 +192,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	for (pos = 0; pos < 4; pos++)
 	{
 		mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
-		par[0] |= (((filter(pcs->odd) ^ oddparity(nr[pos])) & 0x01) << (7-pos));
+		par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
 	}	
 		
 	// Skip 32 bits in pseudo random generator
@@ -254,7 +203,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	{
 		nt = prng_successor(nt,8);
 		mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
-		par[0] |= (((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) << (7-pos));
+		par[0] |= (((filter(pcs->odd) ^ oddparity8(nt & 0xff)) & 0x01) << (7-pos));
 	}	
 		
 	// Transmit reader nonce and reader answer
@@ -319,9 +268,10 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 	uint8_t key[4] = {0x00};
 	memcpy(key, keybytes, 4);
 
-	Dbprintf("EV1 Auth : %02x%02x%02x%02x",	key[0], key[1], key[2], key[3]);
+	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
+		Dbprintf("EV1 Auth : %02x%02x%02x%02x",	key[0], key[1], key[2], key[3]);
 	len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);
-	//len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);
+
 	if (len != 4) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x %u", resp[0], len);
 		return 0;
@@ -453,9 +403,9 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 {
 	// variables
 	uint16_t len, i;	
-	uint32_t pos;
-	uint8_t par[3] = {0};		// enough for 18 Bytes to send
-	byte_t res;
+	uint32_t pos = 0;
+	uint8_t par[3] = {0x00};		// enough for 18 Bytes to send
+	byte_t res = 0;
 	
 	uint8_t d_block[18], d_block_enc[18];
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
@@ -476,7 +426,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 	for (pos = 0; pos < 18; pos++)
 	{
 		d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
-		par[pos>>3] |= (((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
+		par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
 	}	
 
 	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
@@ -500,21 +450,21 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) 
 {
 	uint16_t len;
-	uint8_t par[3] = {0};  // enough for 18 parity bits
+    uint8_t par[3] = {0};  // enough for 18 parity bits
 	uint8_t d_block[18] = {0x00};
 	uint8_t receivedAnswer[MAX_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
 
-	len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+    len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
-	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
+    if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
+        return 1;
+    }
 
 	memcpy(d_block, blockData, 16);
-	AppendCrc14443a(d_block, 16);
+    AppendCrc14443a(d_block, 16);
 
 	ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
 
@@ -523,49 +473,48 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData)
 	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Data Error: %02x %d", receivedAnswer[0],len);
-		return 2;
+        return 2;
 	}
-	return 0;
+    return 0;
 }
 */
 
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
 {
-	uint16_t len;
+    uint16_t len;
 	uint8_t d_block[5] = {0x00};
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 
-	// command MIFARE_CLASSIC_WRITEBLOCK
+    // command MIFARE_CLASSIC_WRITEBLOCK
 	d_block[0]= blockNo;
 	memcpy(d_block+1,blockData,4);
 	//AppendCrc14443a(d_block, 6);
 
 	len = mifare_sendcmd(0xA2, d_block, sizeof(d_block), receivedAnswer, receivedAnswerPar, NULL);
 
-	if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
+    if (receivedAnswer[0] != 0x0A) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len);
-		return 1;
-	}
-	return 0;
+        return 1;
+    }
+    return 0;
 }
-
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) 
-{
+int mifare_classic_halt_ex(struct Crypto1State *pcs) {
 	uint16_t len;	
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
+	uint8_t receivedAnswer[4];
+	uint8_t receivedAnswerPar[4];
 
 	len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);
 	if (len != 0) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("halt error. response len: %x", len);  
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("halt error. response len: %x", len);  
 		return 1;
 	}
-
 	return 0;
 }
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {
+	return mifare_classic_halt_ex(pcs);
+}
 
 int mifare_ultra_halt()
 {
@@ -605,8 +554,12 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
 
 // work with emulator memory
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
+	emlSetMem_xt(data, blockNum, blocksCount, 16);
+}
+
+void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
 	uint8_t* emCARD = BigBuf_get_EM_addr();
-	memcpy(emCARD + blockNum * 16, data, blocksCount * 16);
+	memcpy(emCARD + blockNum * blockBtWidth, data, blocksCount * blockBtWidth);
 }
 
 void emlGetMem(uint8_t *data, int blockNum, int blocksCount) {
@@ -762,8 +715,8 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 	data[0] = 0xAF;
 	memcpy(data+1,key,16);
 	
-	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
-	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
+	uint8_t receivedAnswer[MAX_FRAME_SIZE];
+	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
 	
 	len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);