X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/930763e86d35df9e1cdd88b0ab6f034c3428c4a1..3458bb279b00048892e56cec6f0a13e8c03f97db:/armsrc/mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index fdead5ee..93df109c 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -9,60 +9,71 @@
 // Work with mifare cards.
 //-----------------------------------------------------------------------------
 
-#include <string.h>
 #include "mifareutil.h"
+
+#include <string.h>
+#include <stdbool.h>
+
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "parity.h"
-
 #include "iso14443crc.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
-#include "polarssl/des.h"
+#include "mbedtls/des.h"
+#include "protocols.h"
 
-int MF_DBGLEVEL = MF_DBG_ALL;
+int MF_DBGLEVEL = MF_DBG_INFO;
 
 // crypto1 helpers
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
-	uint8_t	bt = 0;
+void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out){
+	uint8_t bt = 0;
 	int i;
-	
+
 	if (len != 1) {
 		for (i = 0; i < len; i++)
-			data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
+			data_out[i] = crypto1_byte(pcs, 0x00, 0) ^ data_in[i];
 	} else {
 		bt = 0;
 		for (i = 0; i < 4; i++)
-			bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data[0], i)) << i;
-				
-		data[0] = bt;
+			bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data_in[0], i)) << i;
+
+		data_out[0] = bt;
 	}
 	return;
 }
 
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len){
+	mf_crypto1_decryptEx(pcs, data, len, data);
+}
+
+void mf_crypto1_encryptEx(struct Crypto1State *pcs, uint8_t *data, uint8_t *in, uint16_t len, uint8_t *par) {
 	uint8_t bt = 0;
 	int i;
 	par[0] = 0;
-	
+
 	for (i = 0; i < len; i++) {
 		bt = data[i];
-		data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];
-		if((i&0x0007) == 0) 
+		data[i] = crypto1_byte(pcs, in==NULL?0x00:in[i], 0) ^ data[i];
+		if((i&0x0007) == 0)
 			par[i>>3] = 0;
 		par[i>>3] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));
-	}	
+	}
 	return;
 }
 
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par) {
+	mf_crypto1_encryptEx(pcs, data, NULL, len, par);
+}
+
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {
 	uint8_t bt = 0;
 	int i;
 
 	for (i = 0; i < 4; i++)
 		bt |= (crypto1_bit(pcs, 0, 0) ^ BIT(data, i)) << i;
-		
+
 	return bt;
 }
 
@@ -88,39 +99,37 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 {
 	uint8_t dcmd[4], ecmd[4];
 	uint16_t pos, res;
-	uint8_t par[1];			// 1 Byte parity is enough here
+	uint8_t par[1];         // 1 Byte parity is enough here
 	dcmd[0] = cmd;
 	dcmd[1] = data;
 	AppendCrc14443a(dcmd, 2);
-	
+
 	memcpy(ecmd, dcmd, sizeof(dcmd));
-	
+
 	if (crypted) {
 		par[0] = 0;
 		for (pos = 0; pos < 4; pos++)
 		{
 			ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];
 			par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));
-		}	
-
+		}
 		ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);
-
 	} else {
 		ReaderTransmit(dcmd, sizeof(dcmd), timing);
 	}
 
 	int len = ReaderReceive(answer, par);
-	
+
 	if (answer_parity) *answer_parity = par[0];
-	
+
 	if (crypted == CRYPT_ALL) {
 		if (len == 1) {
 			res = 0;
 			for (pos = 0; pos < 4; pos++)
 				res |= (crypto1_bit(pcs, 0, 0) ^ BIT(answer[0], pos)) << pos;
-				
+
 			answer[0] = res;
-			
+
 		} else {
 			for (pos = 0; pos < len; pos++)
 			{
@@ -128,41 +137,41 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 			}
 		}
 	}
-	
+
 	return len;
 }
 
+
 // mifare classic commands
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested) 
-{
-	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL);
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *auth_timeout) {
+
+	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL, NULL, auth_timeout);
 }
 
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing) 
-{
-	// variables
-	int len;	
+
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *ntptr, uint32_t *timing, uint32_t *auth_timeout) {
+
+	int len;
 	uint32_t pos;
-	uint8_t tmp4[4];
 	uint8_t par[1] = {0x00};
 	byte_t nr[4];
 	uint32_t nt, ntpp; // Supplied tag nonce
-	
+
 	uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
-	
+
 	// Transmit MIFARE_CLASSIC_AUTH
-	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer, receivedAnswerPar, timing);
-	if (MF_DBGLEVEL >= 4)	Dbprintf("rand tag nonce len: %x", len);  
+	len = mifare_sendcmd_short(pcs, isNested, keyType & 0x01 ? MIFARE_AUTH_KEYB : MIFARE_AUTH_KEYA, blockNo, receivedAnswer, receivedAnswerPar, timing);
+	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; 
-	
+	nr[3] = 0x92;
+
 	// Save the tag nonce (nt)
 	nt = bytes_to_num(receivedAnswer, 4);
 
@@ -174,7 +183,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	crypto1_create(pcs, ui64Key);
 
 	if (isNested == AUTH_NESTED) {
-		// decrypt nt with help of new key 
+		// decrypt nt with help of new key
 		nt = crypto1_word(pcs, nt ^ uid, 1) ^ nt;
 	} else {
 		// Load (plain) uid^nt into the cipher
@@ -183,80 +192,85 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 
 	// some statistic
 	if (!ntptr && (MF_DBGLEVEL >= 3))
-		Dbprintf("auth uid: %08x nt: %08x", uid, nt);  
-	
+		Dbprintf("auth uid: %08x nt: %08x", uid, nt);
+
 	// save Nt
 	if (ntptr)
 		*ntptr = nt;
 
 	// Generate (encrypted) nr+parity by loading it into the cipher (Nr)
 	par[0] = 0;
-	for (pos = 0; pos < 4; pos++)
-	{
+	for (pos = 0; pos < 4; pos++) {
 		mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];
 		par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));
-	}	
-		
+	}
+
 	// Skip 32 bits in pseudo random generator
 	nt = prng_successor(nt,32);
 
 	//  ar+parity
-	for (pos = 4; pos < 8; pos++)
-	{
+	for (pos = 4; pos < 8; pos++) {
 		nt = prng_successor(nt,8);
 		mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);
 		par[0] |= (((filter(pcs->odd) ^ oddparity8(nt)) & 0x01) << (7-pos));
-	}	
-		
+	}
+
 	// Transmit reader nonce and reader answer
 	ReaderTransmitPar(mf_nr_ar, sizeof(mf_nr_ar), par, NULL);
 
 	// Receive 4 byte tag answer
+	uint32_t save_timeout = iso14a_get_timeout(); // save standard timeout
+	if (auth_timeout && *auth_timeout) {
+		iso14a_set_timeout(*auth_timeout);        // set timeout for authentication response
+	}
+	uint32_t auth_timeout_start = GetCountSspClk();
 	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
-	if (!len)
-	{
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Authentication failed. Card timeout.");
+	iso14a_set_timeout(save_timeout);             // restore standard timeout
+	if (!len) {
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Card timeout.");
 		return 2;
 	}
-	
-	memcpy(tmp4, receivedAnswer, 4);
-	ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
-	
-	if (ntpp != bytes_to_num(tmp4, 4)) {
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Authentication failed. Error card response.");
+	if (auth_timeout && !*auth_timeout) {         // measure time for future authentication response timeout
+		*auth_timeout = (GetCountSspClk() - auth_timeout_start - (len * 9 + 2) * 8) / 8 + 1;
+	}
+
+	ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0, 0);
+
+	if (ntpp != bytes_to_num(receivedAnswer, 4)) {
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Authentication failed. Error card response.");
 		return 3;
 	}
 
 	return 0;
 }
 
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) 
-{
+
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) {
 	// variables
-	int len;	
-	uint8_t	bt[2];
-	
+	int len;
+	uint8_t bt[2];
+
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
-	
+
 	// command MIFARE_CLASSIC_READBLOCK
-	len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+	len = mifare_sendcmd_short(pcs, 1, MIFARE_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 	if (len == 1) {
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
 		return 1;
 	}
 	if (len != 18) {
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd Error: card timeout. len: %x", len);  
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: card timeout. len: %x", len);
 		return 2;
 	}
 
 	memcpy(bt, receivedAnswer + 16, 2);
 	AppendCrc14443a(receivedAnswer, 16);
 	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd CRC response error.");  
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd CRC response error.");
 		return 3;
 	}
-	
+
 	memcpy(blockData, receivedAnswer, 16);
 	return 0;
 }
@@ -271,8 +285,8 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 	memcpy(key, keybytes, 4);
 
 	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);
+		Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);
+	len = mifare_sendcmd(MIFARE_ULEV1_AUTH, 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);
@@ -290,7 +304,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 
 	/// 3des2k
 
-	des3_context ctx = { 0x00 };
+	mbedtls_des3_context ctx = { {0} };
 	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};
@@ -304,7 +318,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	uint8_t respPar[3] = {0,0,0};
 
 	// REQUEST AUTHENTICATION
-	len = mifare_sendcmd_short(NULL, 1, 0x1A, 0x00, resp, respPar ,NULL);
+	len = mifare_sendcmd_short(NULL, 1, MIFARE_ULC_AUTH_1, 0x00, resp, respPar ,NULL);
 	if (len != 11) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
 		return 0;
@@ -315,13 +329,13 @@ int mifare_ultra_auth(uint8_t *keybytes){
 
 	// decrypt nonce.
 	// tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );
-	des3_set2key_dec(&ctx, key);
-	des3_crypt_cbc(&ctx  	// des3_context
-		, DES_DECRYPT    	// int mode
-		, sizeof(random_b)	// length
-		, IV            	// iv[8]
-		, enc_random_b		// input
-		, random_b			// output
+	mbedtls_des3_set2key_dec(&ctx, key);
+	mbedtls_des3_crypt_cbc(&ctx     // des3_context
+		, MBEDTLS_DES_DECRYPT       // int mode
+		, sizeof(random_b)  // length
+		, IV                // iv[8]
+		, enc_random_b      // input
+		, random_b          // output
 		);
 
 	rol(random_b,8);
@@ -344,17 +358,17 @@ int mifare_ultra_auth(uint8_t *keybytes){
 
 	// encrypt    out, in, length, key, iv
 	//tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
-	des3_set2key_enc(&ctx, key);
-	des3_crypt_cbc(&ctx  	// des3_context
-		, DES_ENCRYPT    	// int mode
-		, sizeof(rnd_ab)	// length
-		, enc_random_b     	// iv[8]
-		, rnd_ab			// input
-		, rnd_ab			// output
+	mbedtls_des3_set2key_enc(&ctx, key);
+	mbedtls_des3_crypt_cbc(&ctx     // des3_context
+		, MBEDTLS_DES_ENCRYPT       // int mode
+		, sizeof(rnd_ab)    // length
+		, enc_random_b      // iv[8]
+		, rnd_ab            // input
+		, rnd_ab            // output
 		);
 
 	//len = mifare_sendcmd_short_mfucauth(NULL, 1, 0xAF, rnd_ab, resp, respPar, NULL);
-	len = mifare_sendcmd(0xAF, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);
+	len = mifare_sendcmd(MIFARE_ULC_AUTH_2, rnd_ab, sizeof(rnd_ab), resp, respPar, NULL);
 	if (len != 11) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
 		return 0;
@@ -364,15 +378,15 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	uint8_t resp_random_a[8] = { 0,0,0,0,0,0,0,0 };
 	memcpy(enc_resp, resp+1, 8);
 
-	// decrypt    out, in, length, key, iv 
+	// decrypt    out, in, length, key, iv
 	// tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
-	des3_set2key_dec(&ctx, key);
-	des3_crypt_cbc(&ctx  	// des3_context
-		, DES_DECRYPT    	// int mode
-		, 8					// length
-		, enc_random_b     	// iv[8]
-		, enc_resp			// input
-		, resp_random_a		// output
+	mbedtls_des3_set2key_dec(&ctx, key);
+	mbedtls_des3_crypt_cbc(&ctx     // des3_context
+		, MBEDTLS_DES_DECRYPT       // int mode
+		, 8                 // length
+		, enc_random_b      // iv[8]
+		, enc_resp          // input
+		, resp_random_a     // output
 		);
 	if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
@@ -380,7 +394,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	}
 
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
-		Dbprintf("e_AB: %02x %02x %02x %02x %02x %02x %02x %02x", 
+		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]);
 
@@ -399,84 +413,101 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	return 1;
 }
 
+
+#define MFU_MAX_RETRIES 5
 int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData)
 {
 	uint16_t len;
-	uint8_t	bt[2];
+	uint8_t bt[2];
 	uint8_t receivedAnswer[MAX_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
-	
+	uint8_t retries;
+	int result = 0;
 
-	len = mifare_sendcmd_short(NULL, 1, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL);
-	if (len == 1) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
-		return 1;
-	}
-	if (len != 18) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
-		return 2;
+	for (retries = 0; retries < MFU_MAX_RETRIES; retries++) {
+		len = mifare_sendcmd_short(NULL, 1, MIFARE_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+		if (len == 1) {
+			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
+			result = 1;
+			continue;
+		}
+		if (len != 18) {
+			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: card timeout. len: %x", len);
+			result = 2;
+			continue;
+		}
+
+		memcpy(bt, receivedAnswer + 16, 2);
+		AppendCrc14443a(receivedAnswer, 16);
+		if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
+			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
+			result = 3;
+			continue;
+		}
+
+		// No errors encountered; don't retry
+		result = 0;
+		break;
 	}
-    
-	memcpy(bt, receivedAnswer + 16, 2);
-	AppendCrc14443a(receivedAnswer, 16);
-	if (bt[0] != receivedAnswer[16] || bt[1] != receivedAnswer[17]) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd CRC response error.");
-		return 3;
+
+	if (result != 0) {
+		Dbprintf("Cmd Error: too many retries; read failed");
+		return result;
 	}
-	
-	memcpy(blockData, receivedAnswer, 14);
+
+	memcpy(blockData, receivedAnswer, 16);
 	return 0;
 }
 
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData) 
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData)
 {
 	// variables
-	uint16_t len, i;	
+	uint16_t len, i;
 	uint32_t pos;
-	uint8_t par[3] = {0};		// enough for 18 Bytes to send
+	uint8_t par[3] = {0};       // enough for 18 Bytes to send
 	byte_t res;
-	
+
 	uint8_t d_block[18], d_block_enc[18];
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
-	
+
 	// command MIFARE_CLASSIC_WRITEBLOCK
-	len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);
+	len = mifare_sendcmd_short(pcs, 1, MIFARE_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
 	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
 		return 1;
 	}
-	
+
 	memcpy(d_block, blockData, 16);
 	AppendCrc14443a(d_block, 16);
-	
+
 	// crypto
 	for (pos = 0; pos < 18; pos++)
 	{
 		d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];
 		par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));
-	}	
+	}
 
 	ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);
 
 	// Receive the response
-	len = ReaderReceive(receivedAnswer, receivedAnswerPar);	
+	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
 
 	res = 0;
 	for (i = 0; i < 4; i++)
 		res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;
 
 	if ((len != 1) || (res != 0x0A)) {
-		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd send data2 Error: %02x", res);  
+		if (MF_DBGLEVEL >= 1)   Dbprintf("Cmd send data2 Error: %02x", res);
 		return 2;
 	}
-	
+
 	return 0;
 }
 
 /* // command not needed, but left for future testing
-int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData) 
+int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData)
 {
 	uint16_t len;
 	uint8_t par[3] = {0};  // enough for 18 parity bits
@@ -484,7 +515,7 @@ int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData)
 	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, MIFARE_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
 	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
@@ -530,16 +561,16 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
 	return 0;
 }
 
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) 
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)
 {
-	uint16_t len;	
+	uint16_t len;
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
 
-	len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);
+	len = mifare_sendcmd_short(pcs, pcs == NULL ? false:true, ISO14443A_CMD_HALT, 0x00, receivedAnswer, receivedAnswerPar, NULL);
 	if (len != 0) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("halt error. response len: %x", len);  
+			Dbprintf("halt error. response len: %x", len);
 		return 1;
 	}
 
@@ -551,8 +582,8 @@ int mifare_ultra_halt()
 	uint16_t len;
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
-    
-	len = mifare_sendcmd_short(NULL, true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL);
+
+	len = mifare_sendcmd_short(NULL, true, ISO14443A_CMD_HALT, 0x00, receivedAnswer, receivedAnswerPar, NULL);
 	if (len != 0) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("halt error. response len: %x", len);
@@ -564,23 +595,36 @@ int mifare_ultra_halt()
 
 // Mifare Memory Structure: up to 32 Sectors with 4 blocks each (1k and 2k cards),
 // plus evtl. 8 sectors with 16 blocks each (4k cards)
-uint8_t NumBlocksPerSector(uint8_t sectorNo) 
+uint8_t NumBlocksPerSector(uint8_t sectorNo)
 {
-	if (sectorNo < 32) 
+	if (sectorNo < 32)
 		return 4;
 	else
 		return 16;
 }
 
-uint8_t FirstBlockOfSector(uint8_t sectorNo) 
+uint8_t FirstBlockOfSector(uint8_t sectorNo)
 {
 	if (sectorNo < 32)
 		return sectorNo * 4;
 	else
 		return 32*4 + (sectorNo - 32) * 16;
-		
+
 }
 
+uint8_t SectorTrailer(uint8_t blockNo)
+{
+	if (blockNo < 32*4) {
+		return (blockNo | 0x03);
+	} else {
+		return (blockNo | 0x0f);
+	}
+}
+
+bool IsSectorTrailer(uint8_t blockNo)
+{
+	return (blockNo == SectorTrailer(blockNo));
+}
 
 // work with emulator memory
 void emlSetMem(uint8_t *data, int blockNum, int blocksCount) {
@@ -608,7 +652,7 @@ int emlCheckValBl(int blockNum) {
 			(data[3] != (data[7] ^ 0xff)) || (data[3] != data[11]) ||
 			(data[12] != (data[13] ^ 0xff)) || (data[12] != data[14]) ||
 			(data[12] != (data[15] ^ 0xff))
-		 ) 
+		 )
 		return 1;
 	return 0;
 }
@@ -616,11 +660,11 @@ int emlCheckValBl(int blockNum) {
 int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
 	uint8_t* emCARD = BigBuf_get_EM_addr();
 	uint8_t* data = emCARD + blockNum * 16;
-	
+
 	if (emlCheckValBl(blockNum)) {
 		return 1;
 	}
-	
+
 	memcpy(blReg, data, 4);
 	*blBlock = data[12];
 	return 0;
@@ -629,41 +673,41 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum) {
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
 	uint8_t* emCARD = BigBuf_get_EM_addr();
 	uint8_t* data = emCARD + blockNum * 16;
-	
+
 	memcpy(data + 0, &blReg, 4);
 	memcpy(data + 8, &blReg, 4);
 	blReg = blReg ^ 0xffffffff;
 	memcpy(data + 4, &blReg, 4);
-	
+
 	data[12] = blBlock;
 	data[13] = blBlock ^ 0xff;
 	data[14] = blBlock;
 	data[15] = blBlock ^ 0xff;
-	
+
 	return 0;
 }
 
 uint64_t emlGetKey(int sectorNum, int keyType) {
 	uint8_t key[6];
 	uint8_t* emCARD = BigBuf_get_EM_addr();
-	
+
 	memcpy(key, emCARD + 16 * (FirstBlockOfSector(sectorNum) + NumBlocksPerSector(sectorNum) - 1) + keyType * 10, 6);
 	return bytes_to_num(key, 6);
 }
 
 void emlClearMem(void) {
 	int b;
-	
+
 	const uint8_t trailer[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x80, 0x69, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 	const uint8_t uid[]   =   {0xe6, 0x84, 0x87, 0xf3, 0x16, 0x88, 0x04, 0x00, 0x46, 0x8e, 0x45, 0x55, 0x4d, 0x70, 0x41, 0x04};
 	uint8_t* emCARD = BigBuf_get_EM_addr();
-	
+
 	memset(emCARD, 0, CARD_MEMORY_SIZE);
-	
+
 	// fill sectors trailer data
 	for(b = 3; b < 256; b<127?(b+=4):(b+=16)) {
 		emlSetMem((uint8_t *)trailer, b , 1);
-	}	
+	}
 
 	// uid
 	emlSetMem((uint8_t *)uid, 0, 1);
@@ -674,35 +718,35 @@ void emlClearMem(void) {
 // Mifare desfire commands
 int mifare_sendcmd_special(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[5] = {0x00};
-    dcmd[0] = cmd;
-    memcpy(dcmd+1,data,2);
+	uint8_t dcmd[5] = {0x00};
+	dcmd[0] = cmd;
+	memcpy(dcmd+1,data,2);
 	AppendCrc14443a(dcmd, 3);
-	
+
 	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
 	int len = ReaderReceive(answer, answer_parity);
 	if(!len) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) 
+		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Authentication failed. Card timeout.");
 		return 1;
-    }
+	}
 	return len;
 }
 
 int mifare_sendcmd_special2(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[20] = {0x00};
-    dcmd[0] = cmd;
-    memcpy(dcmd+1,data,17);
+	uint8_t dcmd[20] = {0x00};
+	dcmd[0] = cmd;
+	memcpy(dcmd+1,data,17);
 	AppendCrc14443a(dcmd, 18);
 
 	ReaderTransmit(dcmd, sizeof(dcmd), NULL);
 	int len = ReaderReceive(answer, answer_parity);
 	if(!len){
-        if (MF_DBGLEVEL >= MF_DBG_ERROR)
+		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Authentication failed. Card timeout.");
 		return 1;
-    }
+	}
 	return len;
 }
 
@@ -713,23 +757,23 @@ int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData){
 	uint8_t data[2]={0x0a, 0x00};
 	uint8_t receivedAnswer[MAX_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_PARITY_SIZE];
-	
+
 	len = mifare_sendcmd_special(NULL, 1, 0x02, data, receivedAnswer,receivedAnswerPar,NULL);
 	if (len == 1) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Cmd Error: %02x", receivedAnswer[0]);
 		return 1;
 	}
-	
+
 	if (len == 12) {
-		if (MF_DBGLEVEL >= MF_DBG_EXTENDED)	{
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
 			Dbprintf("Auth1 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
 				receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3],receivedAnswer[4],
 				receivedAnswer[5],receivedAnswer[6],receivedAnswer[7],receivedAnswer[8],receivedAnswer[9],
 				receivedAnswer[10],receivedAnswer[11]);
 			}
 			memcpy(blockData, receivedAnswer, 12);
-	        return 0;
+			return 0;
 	}
 	return 1;
 }
@@ -740,18 +784,18 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 	uint8_t data[17] = {0x00};
 	data[0] = 0xAF;
 	memcpy(data+1,key,16);
-	
+
 	uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];
 	uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];
-	
+
 	len = mifare_sendcmd_special2(NULL, 1, 0x03, data, receivedAnswer, receivedAnswerPar ,NULL);
-	
+
 	if ((receivedAnswer[0] == 0x03) && (receivedAnswer[1] == 0xae)) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
 			Dbprintf("Auth Error: %02x %02x", receivedAnswer[0], receivedAnswer[1]);
 		return 1;
 	}
-	
+
 	if (len == 12){
 		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) {
 			Dbprintf("Auth2 Resp: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
@@ -764,3 +808,118 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData){
 	}
 	return 1;
 }
+
+//-----------------------------------------------------------------------------
+// MIFARE check keys
+//
+//-----------------------------------------------------------------------------
+// one key check
+int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {
+
+	struct Crypto1State mpcs = {0, 0};
+	struct Crypto1State *pcs;
+	pcs = &mpcs;
+
+	// Iceman: use piwi's faster nonce collecting part in hardnested.
+	if (*cascade_levels == 0) { // need a full select cycle to get the uid first
+		iso14a_card_select_t card_info;
+		if (!iso14443a_select_card(uid, &card_info, cuid, true, 0, true)) {
+			if (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card");
+			return  1;
+		}
+		switch (card_info.uidlen) {
+			case 4 : *cascade_levels = 1; break;
+			case 7 : *cascade_levels = 2; break;
+			case 10: *cascade_levels = 3; break;
+			default: break;
+		}
+	} else { // no need for anticollision. We can directly select the card
+		if (!iso14443a_select_card(uid, NULL, NULL, false, *cascade_levels, true)) {
+			if (debugLevel >= 1)    Dbprintf("ChkKeys: Can't select card (UID) lvl=%d", *cascade_levels);
+			return  1;
+		}
+	}
+
+	if (mifare_classic_auth(pcs, *cuid, blockNo, keyType, ui64Key, AUTH_FIRST, auth_timeout)) { // authentication failed
+		return 2;
+	} else {
+		mifare_classic_halt(pcs, *cuid);
+	}
+
+	return 0;
+}
+
+
+// multi key check
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel) {
+
+	uint8_t uid[10];
+	uint32_t cuid = 0;
+	uint8_t cascade_levels = 0;
+	uint64_t ui64Key = 0;
+
+	int retryCount = 0;
+	for (uint8_t i = 0; i < keyCount; i++) {
+
+		ui64Key = bytes_to_num(keys + i * 6, 6);
+		int res = MifareChkBlockKey(uid, &cuid, &cascade_levels, ui64Key, blockNo, keyType, auth_timeout, debugLevel);
+
+		// can't select
+		if (res == 1) {
+			retryCount++;
+			if (retryCount >= 5) {
+				Dbprintf("ChkKeys: block=%d key=%d. Can't select. Exit...", blockNo, keyType);
+				return -1;
+			}
+			--i; // try the same key once again
+
+			SpinDelay(20);
+//          Dbprintf("ChkKeys: block=%d key=%d. Try the same key once again...", blockNo, keyType);
+			continue;
+		}
+
+		// can't authenticate
+		if (res == 2) {
+			retryCount = 0;
+			continue; // can't auth. wrong key.
+		}
+
+		// successful authentication
+		return i + 1;
+	}
+
+	if (BUTTON_PRESS()) {
+		return -2;
+	}
+
+	return 0;
+}
+
+
+// multisector multikey check
+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, TKeyIndex *keyIndex) {
+	int res = 0;
+
+//  int clk = GetCountSspClk();
+
+	for(int sc = 0; sc < SectorCount; sc++){
+		WDT_HIT();
+
+		int keyAB = keyType;
+		do {
+			res = MifareChkBlockKeys(keys, keyCount, FirstBlockOfSector(sc), keyAB & 0x01, auth_timeout, debugLevel);
+			if (res < 0) {
+				return res;
+			}
+			if (res > 0) {
+				(*keyIndex)[keyAB & 0x01][sc] = res;
+			}
+		} while(--keyAB > 0);
+	}
+
+//  Dbprintf("%d %d", GetCountSspClk() - clk, (GetCountSspClk() - clk)/(SectorCount*keyCount*(keyType==2?2:1)));
+
+	return 1;
+}
+
+