X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6b23be6b7ecd1660922d53c8c1c0522f69389dc6..be67483e63430608982f1c92e02b59d7b4dc65b3:/armsrc/mifarecmd.c

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 269f36c4..4bb01a4c 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -14,11 +14,6 @@
 //-----------------------------------------------------------------------------
 
 #include "mifarecmd.h"
-#include "apps.h"
-#include "util.h"
-#include "crc.h"
-#include "protocols.h"
-#include "parity.h"
 
 //-----------------------------------------------------------------------------
 // Select, Authenticate, Read a MIFARE tag. 
@@ -379,7 +374,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 	LED_C_OFF();
 
 	while (true) {
-			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {
+		if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {
 			if (MF_DBGLEVEL >= 1)	Dbprintf("Can't select card");
 			break;
 		};
@@ -403,14 +398,11 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 		break;
 	}
 	
-	//  ----------------------------- crypto1 destroy
 	crypto1_destroy(pcs);
 	
 	if (MF_DBGLEVEL >= 2)	DbpString("WRITE BLOCK FINISHED");
 
-	LED_B_ON();
 	cmd_send(CMD_ACK,isOK,0,0,0,0);
-	LED_B_OFF();
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
@@ -613,7 +605,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {
 // Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on 
 // Computer and Communications Security, 2015
 //-----------------------------------------------------------------------------
-#define AUTHENTICATION_TIMEOUT 848			// card times out 1ms after wrong authentication (according to NXP documentation)
+#define AUTHENTICATION_TIMEOUT  848 //848			// card times out 1ms after wrong authentication (according to NXP documentation)
 #define PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication 
 
 void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)
@@ -644,14 +636,17 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 	LED_A_ON();
 	LED_C_OFF();
 
+	BigBuf_free(); BigBuf_Clear_ext(false);	
+	clear_trace();
+	set_tracing(FALSE);
+	
 	if (initialize) {
 		iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-		clear_trace();
-		set_tracing(true);
 	}
 	
 	LED_C_ON();
 	
+	uint8_t dummy_answer = 0;	
 	uint16_t num_nonces = 0;
 	bool have_uid = false;
 	for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {
@@ -702,7 +697,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 		}
 	
 		// send a dummy byte as reader response in order to trigger the cards authentication timeout
-		uint8_t dummy_answer = 0;
 		ReaderTransmit(&dummy_answer, 1, NULL);
 		timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;
 		
@@ -711,7 +705,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 			memcpy(buf+i, receivedAnswer, 4);
 			nt_par_enc = par_enc[0] & 0xf0;
 		} else {
-			nt_par_enc |= par_enc[0] >> 4;
+			nt_par_enc |= par_enc[0]  >> 4;
 			memcpy(buf+i+4, receivedAnswer, 4);
 			memcpy(buf+i+8, &nt_par_enc, 1);
 			i += 9;
@@ -721,9 +715,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,
 	}
 
 	LED_C_OFF();
-	
-	crypto1_destroy(pcs);
-	
+	crypto1_destroy(pcs);	
 	LED_B_ON();
 	cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));
 	LED_B_OFF();
@@ -964,9 +956,13 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
 // 
 //-----------------------------------------------------------------------------
 void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
-	uint8_t blockNo = arg0 & 0xff;
-	uint8_t keyType = (arg0 >> 8) & 0xff;
-	bool clearTrace = arg1;
+#define STD_SEARCH 1
+#define EXT_SEARCH 2
+
+	uint8_t blockNo = arg0 & 0xFF;
+	uint8_t keyType = (arg0 >> 8) & 0xFF;
+	//uint8_t searchType = (arg1 >> 8 ) & 0xFF;
+	bool clearTrace = arg1 & 0xFF;
 	uint8_t keyCount = arg2;
 	uint64_t ui64Key = 0;
 	
@@ -1034,8 +1030,16 @@ void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) {
 			
 			continue;
 		}
-		isOK = 1;
-		break;
+		
+		// found a key.
+		//
+		//if ( searchType == EXT_SEARCH) {
+			
+		//}
+		//else {
+			isOK = 1;
+			break;
+		//}
 	}
 	
 	LED_B_ON();
@@ -1220,10 +1224,9 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 			if(!iso14443a_select_card(uid, NULL, &cuid, true, 0)) {
 				if (MF_DBGLEVEL >= MF_DBG_ERROR)	Dbprintf("Can't select card");
 				errormsg = MAGIC_UID;
-				// break;
 			}
-			
-			if ( mifare_classic_halt_ex(NULL) ) break;
+			mifare_classic_halt_ex(NULL);
+			break;
 		}
 	
 		// wipe tag, fill it with zeros
@@ -1242,7 +1245,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 				break;
 			}
 
-			if ( mifare_classic_halt_ex(NULL) ) break;
+			mifare_classic_halt_ex(NULL);
 		}	
 
 		// write block
@@ -1279,7 +1282,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 		}	
 	
 		if (workFlags & MAGIC_OFF) 
-			if ( mifare_classic_halt_ex(NULL) ) break;
+			mifare_classic_halt_ex(NULL);
 		
 		isOK = true;
 		break;
@@ -1367,25 +1370,53 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){
 }
 
 void MifareCIdent(){
-	
+	#define GEN_1A 1
+	#define GEN_1B 2
+	#define GEN_2  4
 	// variables
-	bool isOK = true;	
-	uint8_t receivedAnswer[1] = {0x00};
-	uint8_t receivedAnswerPar[1] = {0x00};
-
+	uint8_t isGen = 0;
+	uint8_t rec[1] = {0x00};
+	uint8_t recpar[1] = {0x00};
+	
+	// Generation 1 test
 	ReaderTransmitBitsPar(wupC1, 7, NULL, NULL);
-	if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-		isOK = false;
-	}
-
+	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+		goto TEST2;
+	};
+	isGen = GEN_1B;
+	
 	ReaderTransmit(wupC2, sizeof(wupC2), NULL);
-	if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {
-		isOK = false;
-	}
+	if(!ReaderReceive(rec, recpar) || (rec[0] != 0x0a)) {
+		goto OUT;
+	};	
+	isGen = GEN_1A;
+	goto OUT;
 
+TEST2:;
+/*
+	// Generation 2 test
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs = &mpcs;
+
+	// halt previous.
+	mifare_classic_halt(NULL, 0);
+	
+	//select
+	if (!iso14443a_select_card(NULL, NULL, NULL, true, 0)) {
+		goto OUT;
+	};
+	
+	// MIFARE_CLASSIC_WRITEBLOCK 0xA0
+	// ACK 0x0a
+	uint16_t len = mifare_sendcmd_short(pcs, 1, 0xA0, 0, rec, recpar, NULL);
+	if ((len != 1) || (rec[0] != 0x0A)) {   
+		isGen = GEN_2;	
+	};
+	*/
+OUT:;
 	// removed the if,  since some magic tags misbehavies and send an answer to it.
 	mifare_classic_halt(NULL, 0);
-	cmd_send(CMD_ACK,isOK,0,0,0,0);
+	cmd_send(CMD_ACK,isGen, 0, 0, 0, 0);
 }
 
 void OnSuccessMagic(){