X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bf5d7992ce29e9fb006a5b6770bd3457b9b0f18b..a32e8034e04c7f78de2d3345c4ad3d2ce56d38fc:/armsrc/iso14443a.c

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index d0695501..9e860b04 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -850,6 +850,8 @@ bool prepare_allocated_tag_modulation(tag_response_info_t* response_info) {
 void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 
 	#define ATTACK_KEY_COUNT 8 // keep same as define in cmdhfmf.c -> readerAttack()
+	// init pseudorand
+	fast_prand();
 	
 	uint8_t sak = 0;
 	uint32_t cuid = 0;			
@@ -869,17 +871,9 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 	uint8_t cardAUTHKEY = 0xff;  // no authentication
 	// allow collecting up to 8 sets of nonces to allow recovery of up to 8 keys
 
-	nonces_t ar_nr_resp[ATTACK_KEY_COUNT*2]; // for 2 separate attack types (nml, moebius)
-	memset(ar_nr_resp, 0x00, sizeof(ar_nr_resp));
-
-	uint8_t ar_nr_collected[ATTACK_KEY_COUNT*2]; // for 2nd attack type (moebius)
-	memset(ar_nr_collected, 0x00, sizeof(ar_nr_collected));
-	uint8_t	nonce1_count = 0;
-	uint8_t	nonce2_count = 0;
-	uint8_t	moebius_n_count = 0;
-	bool gettingMoebius = false;
-	uint8_t	mM = 0; // moebius_modifier for collection storage
-
+	nonces_t ar_nr_nonces[ATTACK_KEY_COUNT]; // for attack types moebius
+	memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
+	uint8_t	moebius_count = 0;
 	
 	switch (tagType) {
 		case 1: { // MIFARE Classic 1k 
@@ -924,7 +918,11 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 				memcpy(data+3, emdata+4, 4); // uid bytes 3-7
 				flags |= FLAG_7B_UID_IN_DATA;
 			}
-		} break;		
+		} break;	
+		case 8: { // MIFARE Classic 4k
+			response1[0] = 0x02;
+			sak = 0x18;
+		} break;
 		default: {
 			Dbprintf("Error: unkown tagtype (%d)",tagType);
 			return;
@@ -976,8 +974,6 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 
 	// Tag NONCE.
 	uint8_t response5[4]; 
-	nonce = prand();
-	num_to_bytes(nonce, 4, response5);
 	
 	uint8_t response6[] = { 0x04, 0x58, 0x80, 0x02, 0x00, 0x00 }; 	// dummy ATS (pseudo-ATR), answer to RATS: 
 	// Format byte = 0x58: FSCI=0x08 (FSC=256), TA(1) and TC(1) present, 
@@ -1056,14 +1052,9 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 		
 		// Clean receive command buffer
 		if(!GetIso14443aCommandFromReader(receivedCmd, receivedCmdPar, &len)) {
-			DbpString("Button press");
+			Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", tracing, BigBuf_get_traceLen());
 			break;
-		}
-		
-		// incease nonce at every command recieved
-		nonce = prand();
-		num_to_bytes(nonce, 4, response5);
-		
+		}	
 		p_response = NULL;
 		
 		// Okay, look at the command now.
@@ -1121,12 +1112,12 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 			p_response = NULL;					
 		} else if (receivedCmd[0] == MIFARE_ULEV1_READ_CNT && tagType == 7) {	// Received a READ COUNTER -- 
 			uint8_t index = receivedCmd[1];
-			uint8_t data[] =  {0x00,0x00,0x00,0x14,0xa5};
+			uint8_t cmd[] =  {0x00,0x00,0x00,0x14,0xa5};
 			if ( counters[index] > 0) {
-				num_to_bytes(counters[index], 3, data);
-				AppendCrc14443a(data, sizeof(data)-2);
+				num_to_bytes(counters[index], 3, cmd);
+				AppendCrc14443a(cmd, sizeof(cmd)-2);
 			}
-			EmSendCmdEx(data,sizeof(data),false);				
+			EmSendCmdEx(cmd,sizeof(cmd),false);				
 			p_response = NULL;
 		} else if (receivedCmd[0] == MIFARE_ULEV1_INCR_CNT && tagType == 7) {	// Received a INC COUNTER -- 
 			// number of counter
@@ -1158,9 +1149,21 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 				EmSendCmdEx(emdata, sizeof(emdata), false);
 				p_response = NULL;
 			} else {
-				cardAUTHSC = receivedCmd[1] / 4; // received block num
+								
 				cardAUTHKEY = receivedCmd[0] - 0x60;
-				p_response = &responses[5]; order = 7;
+				cardAUTHSC = receivedCmd[1] / 4; // received block num
+				
+				// incease nonce at AUTH requests. this is time consuming.
+				nonce = prand();
+				//num_to_bytes(nonce, 4, response5);
+				num_to_bytes(nonce, 4, dynamic_response_info.response);				
+				dynamic_response_info.response_n = 4;
+
+				//prepare_tag_modulation(&responses[5], DYNAMIC_MODULATION_BUFFER_SIZE);
+				prepare_tag_modulation(&dynamic_response_info, DYNAMIC_MODULATION_BUFFER_SIZE);
+				p_response = &dynamic_response_info;
+				//p_response = &responses[5]; 
+				order = 7;
 			}
 		} else if(receivedCmd[0] == ISO14443A_CMD_RATS) {	// Received a RATS request
 			if (tagType == 1 || tagType == 2) {	// RATS not supported
@@ -1173,77 +1176,64 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 			LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
 			uint32_t nr = bytes_to_num(receivedCmd,4);
 			uint32_t ar = bytes_to_num(receivedCmd+4,4);
-
+		 
 			// Collect AR/NR per keytype & sector
 			if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
 				
-					for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+				int8_t index = -1;
+				int8_t empty = -1;
+				for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+					// find which index to use
+					if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype)) 
+						index = i;
+
+					// keep track of empty slots.
+					if ( ar_nr_nonces[i].state == EMPTY)
+						empty = i;
+				}
+				// if no empty slots.  Choose first and overwrite.
+				if ( index == -1 ) {
+					if ( empty == -1 ) {
+						index = 0;
+						ar_nr_nonces[index].state = EMPTY;
+					} else {
+						index = empty;
+					}
+				}
+
+				switch(ar_nr_nonces[index].state) {
+					case EMPTY: {
+						// first nonce collect
+						ar_nr_nonces[index].cuid = cuid;
+						ar_nr_nonces[index].sector = cardAUTHSC;
+						ar_nr_nonces[index].keytype = cardAUTHKEY;
+						ar_nr_nonces[index].nonce = nonce;
+						ar_nr_nonces[index].nr = nr;
+						ar_nr_nonces[index].ar = ar;
+						ar_nr_nonces[index].state = FIRST;
+						break;
+					} 
+					case FIRST : { 
+						// second nonce collect
+						ar_nr_nonces[index].nonce2 = nonce;
+						ar_nr_nonces[index].nr2 = nr;
+						ar_nr_nonces[index].ar2 = ar;
+						ar_nr_nonces[index].state = SECOND;
+
+						// send to client
+						cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
 						
-						if ( ar_nr_collected[i+mM] == 0 || (
-									(cardAUTHSC == ar_nr_resp[i+mM].sector) && 
-									(cardAUTHKEY == ar_nr_resp[i+mM].keytype) &&
-									(ar_nr_collected[i+mM] > 0)
-								)
-							) {
-								
-							// if first auth for sector, or matches sector and keytype of previous auth
-							if (ar_nr_collected[i+mM] < 2) {
-								// if we haven't already collected 2 nonces for this sector
-								if (ar_nr_resp[ar_nr_collected[i+mM]].ar != ar) {
-									// Avoid duplicates... probably not necessary, ar should vary. 
-									if (ar_nr_collected[i+mM]==0) {
-										// first nonce collect
-										ar_nr_resp[i+mM].cuid = cuid;
-										ar_nr_resp[i+mM].sector = cardAUTHSC;
-										ar_nr_resp[i+mM].keytype = cardAUTHKEY;
-										ar_nr_resp[i+mM].nonce = nonce;
-										ar_nr_resp[i+mM].nr = nr;
-										ar_nr_resp[i+mM].ar = ar;
-										nonce1_count++;
-										// add this nonce to first moebius nonce
-										ar_nr_resp[i+ATTACK_KEY_COUNT].cuid = cuid;
-										ar_nr_resp[i+ATTACK_KEY_COUNT].sector = cardAUTHSC;
-										ar_nr_resp[i+ATTACK_KEY_COUNT].keytype = cardAUTHKEY;
-										ar_nr_resp[i+ATTACK_KEY_COUNT].nonce = nonce;
-										ar_nr_resp[i+ATTACK_KEY_COUNT].nr = nr;
-										ar_nr_resp[i+ATTACK_KEY_COUNT].ar = ar;
-										ar_nr_collected[i+ATTACK_KEY_COUNT]++;
-									} else { // second nonce collect (std and moebius)
-										ar_nr_resp[i+mM].nonce2 = nonce;
-										ar_nr_resp[i+mM].nr2 = nr;
-										ar_nr_resp[i+mM].ar2 = ar;
-										if (!gettingMoebius) {
-											nonce2_count++;
-											// check if this was the last second nonce we need for std attack
-											if ( nonce2_count == nonce1_count ) {
-												// done collecting std test switch to moebius
-												// first finish incrementing last sample
-												ar_nr_collected[i+mM]++; 
-												// switch to moebius collection
-												gettingMoebius = true;
-												mM = ATTACK_KEY_COUNT;
-												break;
-											}
-										} else {
-											moebius_n_count++;
-											// if we've collected all the nonces we need - finish.
-											if (nonce1_count == moebius_n_count) {
-												cmd_send(CMD_ACK,CMD_SIMULATE_MIFARE_CARD,0,0,&ar_nr_resp,sizeof(ar_nr_resp));
-												nonce1_count = 0;
-												nonce2_count = 0;
-												moebius_n_count = 0;
-												gettingMoebius = false;
-											}
-										}
-									}
-									ar_nr_collected[i+mM]++;
-								}
-							}
-							// we found right spot for this nonce stop looking
-							break;
-						}
+						ar_nr_nonces[index].state = EMPTY;
+						ar_nr_nonces[index].sector = 0;
+						ar_nr_nonces[index].keytype = 0;
+						
+						moebius_count++;
+						break;
 					}
+					default: break;
 				}
+			}
+			p_response = NULL;
 			
 		} else if (receivedCmd[0] == MIFARE_ULC_AUTH_1 ) { // ULC authentication, or Desfire Authentication
 		} else if (receivedCmd[0] == MIFARE_ULEV1_AUTH) { // NTAG / EV-1 authentication
@@ -1283,8 +1273,8 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 				  dynamic_response_info.response_n = 2;
 				} break;
 
-				case 0xaa:
-				case 0xbb: {
+				case 0xAA:
+				case 0xBB: {
 				  dynamic_response_info.response[0] = receivedCmd[0] ^ 0x11;
 				  dynamic_response_info.response_n = 2;
 				} break;
@@ -1317,11 +1307,11 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 				dynamic_response_info.response[1] = receivedCmd[1];
 
 				// Add CRC bytes, always used in ISO 14443A-4 compliant cards
-				AppendCrc14443a(dynamic_response_info.response,dynamic_response_info.response_n);
+				AppendCrc14443a(dynamic_response_info.response, dynamic_response_info.response_n);
 				dynamic_response_info.response_n += 2;
         
 				if (prepare_tag_modulation(&dynamic_response_info,DYNAMIC_MODULATION_BUFFER_SIZE) == false) {
-					Dbprintf("Error preparing tag response");
+					DbpString("Error preparing tag response");
 					LogTrace(receivedCmd, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.endTime*16 - DELAY_AIR2ARM_AS_TAG, Uart.parity, TRUE);
 					break;
 				}
@@ -1337,7 +1327,7 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 
 		// comment this limit if you want to simulation longer		
 		if (!tracing) {
-			Dbprintf("Trace Full. Simulation stopped.");
+			DbpString("Trace Full. Simulation stopped.");
 			break;
 		}
 		// comment this limit if you want to simulation longer
@@ -1370,8 +1360,10 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 	set_tracing(FALSE);
 	BigBuf_free_keep_EM();
 	LED_A_OFF();
-	
+
+	/*	
 	if(flags & FLAG_NR_AR_ATTACK && MF_DBGLEVEL >= 1) {
+
 		for ( uint8_t	i = 0; i < ATTACK_KEY_COUNT; i++) {
 			if (ar_nr_collected[i] == 2) {
 				Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i<ATTACK_KEY_COUNT/2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
@@ -1385,6 +1377,7 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 						);
 			}
 		}	
+
 		for ( uint8_t	i = ATTACK_KEY_COUNT; i < ATTACK_KEY_COUNT*2; i++) {
 			if (ar_nr_collected[i] == 2) {
 				Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i<ATTACK_KEY_COUNT/2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
@@ -1400,12 +1393,16 @@ void SimulateIso14443aTag(int tagType, int flags, byte_t* data) {
 			}
 		}
 	}
-	
+	*/
+		
 	if (MF_DBGLEVEL >= 4){
-		Dbprintf("-[ Wake ups after halt [%d]", happened);
-		Dbprintf("-[ Messages after halt [%d]", happened2);
-		Dbprintf("-[ Num of received cmd [%d]", cmdsRecvd);
+		Dbprintf("-[ Wake ups after halt  [%d]", happened);
+		Dbprintf("-[ Messages after halt  [%d]", happened2);
+		Dbprintf("-[ Num of received cmd  [%d]", cmdsRecvd);
+		Dbprintf("-[ Num of moebius tries [%d]", moebius_count);
 	}
+	
+	cmd_send(CMD_ACK,1,0,0,0,0);
 }
 
 // prepare a delayed transfer. This simply shifts ToSend[] by a number
@@ -2450,6 +2447,10 @@ void ReaderMifare(bool first_try, uint8_t block, uint8_t keytype ) {
   *@param exitAfterNReads, exit simulation after n blocks have been read, 0 is inifite
   */
 void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain) {
+
+	// init pseudorand
+	fast_prand( GetTickCount() );
+	
 	int cardSTATE = MFEMUL_NOFIELD;
 	int _UID_LEN = 0;  // 4, 7, 10
 	int vHf = 0;	// in mV
@@ -2493,17 +2494,8 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 	
 	// Here, we collect CUID, NT, NR, AR, CUID2, NT2, NR2, AR2
 	// This can be used in a reader-only attack.
-	nonces_t ar_nr_resp[ATTACK_KEY_COUNT*2]; // for 2 separate attack types (nml, moebius)
-	memset(ar_nr_resp, 0x00, sizeof(ar_nr_resp));
-
-	uint8_t ar_nr_collected[ATTACK_KEY_COUNT*2]; // for 2nd attack type (moebius)
-	memset(ar_nr_collected, 0x00, sizeof(ar_nr_collected));
-	uint8_t	nonce1_count = 0;
-	uint8_t	nonce2_count = 0;
-	uint8_t	moebius_n_count = 0;
-	bool gettingMoebius = false;
-	uint8_t	mM = 0; // moebius_modifier for collection storage
-	bool doBufResetNext = false;
+	nonces_t ar_nr_nonces[ATTACK_KEY_COUNT];
+	memset(ar_nr_nonces, 0x00, sizeof(ar_nr_nonces));
 
 	// -- Determine the UID
 	// Can be set from emulator memory or incoming data
@@ -2745,101 +2737,63 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 				uint32_t nr = bytes_to_num(receivedCmd, 4);
 				uint32_t ar = bytes_to_num(&receivedCmd[4], 4);
 
-				if (doBufResetNext) {
-					// Reset, lets try again!
-					Dbprintf("Re-read after previous NR_AR_ATTACK, resetting buffer");
-					memset(ar_nr_resp, 0x00, sizeof(ar_nr_resp));
-					memset(ar_nr_collected, 0x00, sizeof(ar_nr_collected));
-					mM = 0;
-					doBufResetNext = false;
-				}
-
-				for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+				// Collect AR/NR per keytype & sector
+				if ( (flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) {
 					
-					if ( ar_nr_collected[i+mM] == 0 || (
-								(cardAUTHSC == ar_nr_resp[i+mM].sector) && 
-								(cardAUTHKEY == ar_nr_resp[i+mM].keytype) && 
-								(ar_nr_collected[i+mM] > 0)
-							)
-						) {
-
-						// if first auth for sector, or matches sector and keytype of previous auth
-						if (ar_nr_collected[i+mM] < 2) {
-							// if we haven't already collected 2 nonces for this sector
-							if (ar_nr_resp[ar_nr_collected[i+mM]].ar != ar) {
-								// Avoid duplicates... probably not necessary, ar should vary.
-								if (ar_nr_collected[i+mM]==0) {
-									// first nonce collect
-									ar_nr_resp[i+mM].cuid = cuid;
-									ar_nr_resp[i+mM].sector = cardAUTHSC;
-									ar_nr_resp[i+mM].keytype = cardAUTHKEY;
-									ar_nr_resp[i+mM].nonce = nonce;
-									ar_nr_resp[i+mM].nr = nr;
-									ar_nr_resp[i+mM].ar = ar;
-									nonce1_count++;
-									// add this nonce to first moebius nonce
-									ar_nr_resp[i+ATTACK_KEY_COUNT].cuid = cuid;
-									ar_nr_resp[i+ATTACK_KEY_COUNT].sector = cardAUTHSC;
-									ar_nr_resp[i+ATTACK_KEY_COUNT].keytype = cardAUTHKEY;
-									ar_nr_resp[i+ATTACK_KEY_COUNT].nonce = nonce;
-									ar_nr_resp[i+ATTACK_KEY_COUNT].nr = nr;
-									ar_nr_resp[i+ATTACK_KEY_COUNT].ar = ar;
-									ar_nr_collected[i+ATTACK_KEY_COUNT]++;
-								} else { // second nonce collect (std and moebius)
-									ar_nr_resp[i+mM].nonce2 = nonce;
-									ar_nr_resp[i+mM].nr2 = nr;
-									ar_nr_resp[i+mM].ar2 = ar;
-									if (!gettingMoebius) {
-										nonce2_count++;
-										// check if this was the last second nonce we need for std attack
-										if ( nonce2_count == nonce1_count ) {
-											// done collecting std test switch to moebius
-											// first finish incrementing last sample
-											ar_nr_collected[i+mM]++; 
-											// switch to moebius collection
-											gettingMoebius = true;
-											mM = ATTACK_KEY_COUNT;
-											break;
-										}
-									} else {
-										moebius_n_count++;
-										// if we've collected all the nonces we need - finish.
-
-										if (nonce1_count == moebius_n_count) {
-											cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_resp, sizeof(ar_nr_resp));
-											nonce1_count = 0;
-											nonce2_count = 0;
-											moebius_n_count = 0;
-											gettingMoebius = false;
-											doBufResetNext = true;
-											finished = ( ((flags & FLAG_INTERACTIVE) == FLAG_INTERACTIVE));
-										}
-									}
-								}
-								ar_nr_collected[i+mM]++;
-							}
+					int8_t index = -1;
+					int8_t empty = -1;
+					for (uint8_t i = 0; i < ATTACK_KEY_COUNT; i++) {
+						// find which index to use
+						if ( (cardAUTHSC == ar_nr_nonces[i].sector) &&  (cardAUTHKEY == ar_nr_nonces[i].keytype)) 
+							index = i;
+
+						// keep track of empty slots.
+						if ( ar_nr_nonces[i].state == EMPTY)
+							empty = i;
+					}
+					// if no empty slots.  Choose first and overwrite.
+					if ( index == -1 ) {
+						if ( empty == -1 ) {
+							index = 0;
+							ar_nr_nonces[index].state = EMPTY;
+						} else {
+							index = empty;
 						}
-						// we found right spot for this nonce stop looking
-						break;
 					}
-				}
 
+					switch(ar_nr_nonces[index].state) {
+						case EMPTY: {
+							// first nonce collect
+							ar_nr_nonces[index].cuid = cuid;
+							ar_nr_nonces[index].sector = cardAUTHSC;
+							ar_nr_nonces[index].keytype = cardAUTHKEY;
+							ar_nr_nonces[index].nonce = nonce;
+							ar_nr_nonces[index].nr = nr;
+							ar_nr_nonces[index].ar = ar;
+							ar_nr_nonces[index].state = FIRST;
+							break;
+						} 
+						case FIRST : { 
+							// second nonce collect
+							ar_nr_nonces[index].nonce2 = nonce;
+							ar_nr_nonces[index].nr2 = nr;
+							ar_nr_nonces[index].ar2 = ar;
+							ar_nr_nonces[index].state = SECOND;
+
+							// send to client
+							cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, 0, 0, &ar_nr_nonces[index], sizeof(nonces_t));
+							
+							ar_nr_nonces[index].state = EMPTY;
+							ar_nr_nonces[index].sector = 0;
+							ar_nr_nonces[index].keytype = 0;
+							break;
+						}
+						default: break;
+					}
+				}
 
 				/*
-				// Collect AR/NR
-				// if(ar_nr_collected < 2 && cardAUTHSC == 2){
-				if(ar_nr_collected < 2) {					
-					// if(ar_nr_responses[2] != nr) {
-						ar_nr_responses[ar_nr_collected*4]   = cuid;
-						ar_nr_responses[ar_nr_collected*4+1] = nonce;
-						ar_nr_responses[ar_nr_collected*4+2] = nr;
-						ar_nr_responses[ar_nr_collected*4+3] = ar;
-						ar_nr_collected++;
-					// }					
-		
-					// Interactive mode flag, means we need to send ACK
-					finished = ( ((flags & FLAG_INTERACTIVE) == FLAG_INTERACTIVE)&& ar_nr_collected == 2);
-				}
+				// Interactive mode flag, means we need to send ACK
 				
 				crypto1_word(pcs, ar , 1);
 				cardRr = nr ^ crypto1_word(pcs, 0, 0);
@@ -3074,49 +3028,10 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
 		}
 	}
 
-	// Interactive mode flag, means we need to send ACK
-	/*
-	if((flags & FLAG_INTERACTIVE) == FLAG_INTERACTIVE && flags & FLAG_NR_AR_ATTACK == FLAG_NR_AR_ATTACK) {
-		// May just aswell send the collected ar_nr in the response aswell
-		uint8_t len = ar_nr_collected * 4 * 4;
-		cmd_send(CMD_ACK, CMD_SIMULATE_MIFARE_CARD, len, 0, &ar_nr_responses, len);
-	}
-	*/
-	
-	if( ((flags & FLAG_NR_AR_ATTACK) == FLAG_NR_AR_ATTACK ) && MF_DBGLEVEL >= 1 ) {
-		for ( uint8_t	i = 0; i < ATTACK_KEY_COUNT; i++) {
-			if (ar_nr_collected[i] == 2) {
-				Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i<ATTACK_KEY_COUNT/2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
-				Dbprintf("../tools/mfkey/mfkey32 %08x %08x %08x %08x %08x %08x",
-						ar_nr_resp[i].cuid,  //UID
-						ar_nr_resp[i].nonce, //NT
-						ar_nr_resp[i].nr,    //NR1
-						ar_nr_resp[i].ar,    //AR1
-						ar_nr_resp[i].nr2,   //NR2
-						ar_nr_resp[i].ar2    //AR2
-						);
-			}
-		}	
-		for ( uint8_t i = ATTACK_KEY_COUNT; i < ATTACK_KEY_COUNT*2; i++) {
-			if (ar_nr_collected[i] == 2) {
-				Dbprintf("Collected two pairs of AR/NR which can be used to extract %s from reader for sector %d:", (i<ATTACK_KEY_COUNT/2) ? "keyA" : "keyB", ar_nr_resp[i].sector);
-				Dbprintf("../tools/mfkey/mfkey32v2 %08x %08x %08x %08x %08x %08x %08x",
-						ar_nr_resp[i].cuid,  //UID
-						ar_nr_resp[i].nonce, //NT
-						ar_nr_resp[i].nr,    //NR1
-						ar_nr_resp[i].ar,    //AR1
-						ar_nr_resp[i].nonce2,//NT2
-						ar_nr_resp[i].nr2,   //NR2
-						ar_nr_resp[i].ar2    //AR2
-						);
-			}
-		}
-	}	
-	
 	if (MF_DBGLEVEL >= 1) 
 		Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ", tracing, BigBuf_get_traceLen());
 	
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	cmd_send(CMD_ACK,1,0,0,0,0);	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 	set_tracing(FALSE);
 }