X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/cceabb79e6f1bc8e9c2cab766f6edb3a4200bb74..8258f409697ab41a6858ef9bdcdf406989223bbb:/armsrc/mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index cf36b95a..1f8f4ee8 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -17,7 +17,6 @@
 #include "apps.h"
 #include "util.h"
 
-#include "des.h"
 #include "crc.h"
 
 // the block number for the ISO14443-4 PCB
@@ -93,53 +92,28 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 	LEDsoff();
 }
 
-void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){
+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 
-	byte_t dataoutbuf[16] = {0x00};
-	uint8_t uid[10] = {0x00};
-	uint32_t cuid = 0x00;
+	bool turnOffField = (arg0 == 1);
 
 	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-    
 	clear_trace();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	if(!iso14443a_select_card(uid, NULL, &cuid)) {
+	if(!iso14443a_select_card(NULL, NULL, NULL)) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
 		OnError(0);
 		return;
 	};
 	
-	if(mifare_ultra_auth1(dataoutbuf)){
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+	if(mifare_ultra_auth(keybytes) == 1){
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");
 		OnError(1);
 		return;
 	}
+	cmd_send(CMD_ACK,1,0,0,0,0);
 
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
-    
-    cmd_send(CMD_ACK,1,cuid,0,dataoutbuf,11);
-	LEDsoff();
-}
-void MifareUC_Auth2(uint8_t arg0, uint8_t *datain){
-
-	uint8_t key[16] = {0x00};
-	byte_t dataoutbuf[16] = {0x00};
-    
-	memcpy(key, datain, 16);
-    
-	LED_A_ON();	LED_B_OFF(); LED_C_OFF();
-	
-	if(mifare_ultra_auth2(key, dataoutbuf)){
-	    if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part2: Fail...");
-		OnError(1);
-		return;			
-	}
-	
-	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 2 FINISHED");
-    
-	cmd_send(CMD_ACK,1,0,0,dataoutbuf,11);
-	if (arg0) {
+	if (turnOffField) {
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		LEDsoff();
 	}
@@ -152,125 +126,56 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 {
 	uint8_t blockNo = arg0;
 	byte_t dataout[16] = {0x00};
-	uint8_t uid[10] = {0x00};
-	uint8_t key[16] = {0x00};
-	bool usePwd = (arg1 == 1);
+	bool useKey = (arg1 == 1); //UL_C
+	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
 
 	LEDsoff();
 	LED_A_ON();
 	clear_trace();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	int len = iso14443a_select_card(uid, NULL, NULL);
+	int len = iso14443a_select_card(NULL, NULL, NULL);
 	if(!len) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);
 		OnError(1);
 		return;
 	}
 
-	 // authenticate here.
-	if ( usePwd ) {
-
-		memcpy(key, datain, 16);
-
-		// Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[0],key[1],key[2],key[3],key[4],key[5],key[6],key[7] );
-		// Dbprintf("KEY: %02x %02x %02x %02x %02x %02x %02x %02x", key[8],key[9],key[10],key[11],key[12],key[13],key[14],key[15] );
-
-		uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };
-		uint8_t random_b[8] = {0x00};
-		uint8_t enc_random_b[8] = {0x00};
-		uint8_t rnd_ab[16] = {0x00};
-		uint8_t IV[8] = {0x00};
-
-		uint16_t len;
-		uint8_t receivedAnswer[MAX_FRAME_SIZE];
-		uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
+	// UL-C authentication
+	if ( useKey ) {
+		uint8_t key[16] = {0x00};
+		memcpy(key, datain, sizeof(key) );
 
-		len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);
-		if (len != 11) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+		if ( mifare_ultra_auth(key) == 1 ) {
 			OnError(1);
 			return;
 		}
-	
-		// tag nonce.
-		memcpy(enc_random_b,receivedAnswer+1,8);
-
-		// decrypt nonce.
-		tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );
-		rol(random_b,8);
-		memcpy(rnd_ab  ,random_a,8);
-		memcpy(rnd_ab+8,random_b,8);
-
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-			Dbprintf("enc_B: %02x %02x %02x %02x %02x %02x %02x %02x",
-				enc_random_b[0],enc_random_b[1],enc_random_b[2],enc_random_b[3],
-				enc_random_b[4],enc_random_b[5],enc_random_b[6],enc_random_b[7]);
-				
-			Dbprintf("    B: %02x %02x %02x %02x %02x %02x %02x %02x",
-				random_b[0],random_b[1],random_b[2],random_b[3],
-				random_b[4],random_b[5],random_b[6],random_b[7]);
-
-			Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-					rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
-					rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
-					
-			Dbprintf("rnd_ab: %02x %02x %02x %02x %02x %02x %02x %02x",
-					rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
-					rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15] );
-		}
-		
-		// encrypt    out, in, length, key, iv
-		tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
+	}
 
-		len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);
-		if (len != 11) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+	// UL-EV1 / NTAG authentication
+	if ( usePwd ) {
+		uint8_t pwd[4] = {0x00};
+		memcpy(pwd, datain, 4);
+		uint8_t pack[4] = {0,0,0,0};
+		if (mifare_ul_ev1_auth(pwd, pack) == 1) {
 			OnError(1);
 			return;
 		}
+	}	
 
-		uint8_t enc_resp[8] = { 0 };
-		uint8_t resp_random_a[8] = { 0 };
-		memcpy(enc_resp, receivedAnswer+1, 8);
-	
-		// decrypt    out, in, length, key, iv 
-		tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
-		if ( memcmp(resp_random_a, random_a, 8) != 0 )
-			Dbprintf("failed authentication");
-
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-			Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", 
-					rnd_ab[0],rnd_ab[1],rnd_ab[2],rnd_ab[3],
-					rnd_ab[4],rnd_ab[5],rnd_ab[6],rnd_ab[7]);
-
-			Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x",
-					rnd_ab[8],rnd_ab[9],rnd_ab[10],rnd_ab[11],
-					rnd_ab[12],rnd_ab[13],rnd_ab[14],rnd_ab[15]);
-
-			Dbprintf("a: %02x %02x %02x %02x %02x %02x %02x %02x",
-					random_a[0],random_a[1],random_a[2],random_a[3],
-					random_a[4],random_a[5],random_a[6],random_a[7]);
-					
-			Dbprintf("b: %02x %02x %02x %02x %02x %02x %02x %02x",
-					resp_random_a[0],resp_random_a[1],resp_random_a[2],resp_random_a[3],
-					resp_random_a[4],resp_random_a[5],resp_random_a[6],resp_random_a[7]);
-		}
-	}
-		
 	if( mifare_ultra_readblock(blockNo, dataout) ) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");
 		OnError(2);
 		return;
 	}
-        
+
 	if( mifare_ultra_halt() ) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
 		OnError(3);
 		return;
 	}
-		
-    cmd_send(CMD_ACK,1,0,0,dataout,16);
+
+	cmd_send(CMD_ACK,1,0,0,dataout,16);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 }
@@ -365,64 +270,25 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 		return;
 	}
 
-	// authenticate
+	// UL-C authentication
 	if ( useKey ) {
 		uint8_t key[16] = {0x00};
-		memcpy(key, datain, 16);
-
-		uint8_t random_a[8] = {1,1,1,1,1,1,1,1 };
-		uint8_t random_b[8] = {0x00};
-		uint8_t enc_random_b[8] = {0x00};
-		uint8_t rnd_ab[16] = {0x00};
-		uint8_t IV[8] = {0x00};
-
-		uint16_t len2;
-		uint8_t receivedAnswer[MAX_FRAME_SIZE];
-		uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
-
-		len2 = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, receivedAnswer,receivedAnswerPar ,NULL);
-		if (len2 != 11) {
-			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-			OnError(1);
-			return;
-		}
-
-		// tag nonce.
-		memcpy(enc_random_b,receivedAnswer+1,8);
-
-		// decrypt nonce.
-		tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );
-		rol(random_b,8);
-		memcpy(rnd_ab  ,random_a,8);
-		memcpy(rnd_ab+8,random_b,8);
+		memcpy(key, datain, sizeof(key) );
 
-		// encrypt    out, in, length, key, iv
-		tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
-
-		len2 = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, receivedAnswer, receivedAnswerPar, NULL);
-		if (len2 != 11) {
+		if ( mifare_ultra_auth(key) == 1 ) {
 			OnError(1);
 			return;
 		}
-
-		uint8_t enc_resp[8] = { 0 };
-		uint8_t resp_random_a[8] = { 0 };
-		memcpy(enc_resp, receivedAnswer+1, 8);
-
-		// decrypt    out, in, length, key, iv 
-		tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
-		if ( memcmp(resp_random_a, random_a, 8) != 0 )
-			Dbprintf("failed authentication");	
 	}
 
-	if (usePwd) { //ev1 or ntag auth
-		uint8_t Pwd[4] = {0x00};
-		memcpy(Pwd, datain, 4);
+	// UL-EV1 / NTAG authentication
+	if (usePwd) {
+		uint8_t pwd[4] = {0x00};
+		memcpy(pwd, datain, sizeof(pwd));
 		uint8_t pack[4] = {0,0,0,0};
 
-		if (mifare_ul_ev1_auth(Pwd, pack)){
+		if (mifare_ul_ev1_auth(pwd, pack) == 1){
 			OnError(1);
-			Dbprintf("failed authentication");
 			return;			
 		}
 	}
@@ -569,16 +435,15 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)
 {
 	uint8_t blockNo = arg0;
 	byte_t blockdata[4] = {0x00};
-	
-	memcpy(blockdata, datain,4);
 
-	uint8_t uid[10] = {0x00};
+	memcpy(blockdata, datain,4);
 	
-	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
+	LEDsoff();
+	LED_A_ON();
 	clear_trace();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
-	if(!iso14443a_select_card(uid, NULL, NULL)) {
+	if(!iso14443a_select_card(NULL, NULL, NULL)) {
 		if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");
 		OnError(0);
 		return;
@@ -1320,21 +1185,18 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){
 
 	int len = iso14443a_select_card(uid, NULL, &cuid);
 	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)	
-			Dbprintf("Can't select card");
-		//OnError(1);
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");
+		OnError(1);
 		return;
 	};
 
 	if(mifare_desfire_des_auth1(cuid, dataout)){
-		if (MF_DBGLEVEL >= MF_DBG_ERROR)	
-			Dbprintf("Authentication part1: Fail.");
-		//OnError(4);
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");
+		OnError(4);
 		return;
 	}
 
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");
-    
     cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));
 }