From: iceman1001 <iceman@iuse.se>
Date: Sat, 23 May 2015 06:16:40 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/bcf61bd34ab2747580aabf648093e5854b7283ed?hp=a7e7cd419a820f5208c4920b4fd3ebd7222e5db3

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h
---

diff --git a/README.txt b/README.txt
index 05829dac..e510e792 100644
--- a/README.txt
+++ b/README.txt
@@ -36,7 +36,7 @@ For people with linux you will need to patch some source code and some small cha
 
 Common errors linux/macOS finds
 Error:
-	* loclass/fileutils.c:15:2: warning: implicit declaration of function ‘_stat’ [-Wimplicit-function-declaration]
+	* loclass/fileutils.c:15:2: warning: implicit declaration of function ‘_stat’ [-Wimplicit-function-declaration]
 Solution:
 	* Remove the "unscore" sign.   In linux you use without underscore, in windows you need a underscore. 
 	
@@ -62,6 +62,8 @@ Solution
 
 An old Qt4 version makefile is found here: http://www.icesql.se/proxmark3/code/linuxmakefile.txt  but this one doesn't have all new files in it. So I don't recommend it.
 
+The Proxmark 3 is available for purchase (assembled and tested) from the
+following locations:
 
 
 January 2015, Sweden
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b19e079b..04503a4f 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -736,7 +736,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
 			break;
 #endif
-            
+
 #ifdef WITH_ISO15693
 		case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:
 			AcquireRawAdcSamplesIso15693();
@@ -833,7 +833,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 		case CMD_MIFAREU_READCARD:
 			MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			break;		
+			break;
 		case CMD_MIFAREUC_SETPWD: 
 			MifareUSetPwd(c->arg[0], c->d.asBytes);
 			break;
@@ -845,8 +845,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 		case CMD_MIFAREU_WRITEBL_COMPAT:
 			MifareUWriteBlock(c->arg[0], c->d.asBytes);
-            break;
+			break;
 		case CMD_MIFAREU_WRITEBL:
+			MifareUWriteBlock_Special(c->arg[0], c->d.asBytes);
 			MifareUWriteBlock_Special(c->arg[0], c->arg[1], c->d.asBytes);
 			break;
 		case CMD_MIFARE_NESTED:
diff --git a/armsrc/des.h b/armsrc/des.h
index 880413e9..3379463a 100644
--- a/armsrc/des.h
+++ b/armsrc/des.h
@@ -100,6 +100,9 @@ void tdes_enc(void* out, const void* in, const void* key);
  void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
  void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
 
+ void tdes_2key_enc(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
+ void tdes_2key_dec(void* out, const void* in, size_t length, const void* key, unsigned char iv[8]);
+
 #endif /*DES_H_*/
 
 // Copied from des.h in desfire imp.
diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index c6628c07..e1943b26 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2960,4 +2960,4 @@ void RAMFUNC SniffMifare(uint8_t param) {
 	
 	Dbprintf("maxDataLen=%x, Uart.state=%x, Uart.len=%x", maxDataLen, Uart.state, Uart.len);
 	LEDsoff();
-}
\ No newline at end of file
+}
diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 5b0b4904..b9890ceb 100644
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -651,7 +651,7 @@ void CmdASKsimTag(uint16_t arg1, uint16_t arg2, size_t size, uint8_t *BitStream)
 	int ledcontrol = 1;
 	int n=0, i=0;
 	uint8_t clk = (arg1 >> 8) & 0xFF;
-	uint8_t encoding = arg1 & 1;
+	uint8_t encoding = arg1 & 0xFF;
 	uint8_t separator = arg2 & 1;
 	uint8_t invert = (arg2 >> 8) & 1;
 
diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index 03e15b3b..c56f2337 100644
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -19,6 +19,12 @@
 
 #include "crc.h"
 
+// the block number for the ISO14443-4 PCB
+uint8_t pcb_blocknum = 0;
+// Deselect card by sending a s-block. the crc is precalced for speed
+static  uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};
+
+
 //-----------------------------------------------------------------------------
 // Select, Authenticate, Read a MIFARE tag. 
 // read block
@@ -86,7 +92,6 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 	LEDsoff();
 }
 
-
 void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 
 	bool turnOffField = (arg0 == 1);
@@ -106,17 +111,19 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){
 		OnError(1);
 		return;
 	}
-    
+
 	if (turnOffField) {
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		LEDsoff();
+	}
+	cmd_send(CMD_ACK,1,0,0,0,0);
 	}	
 	cmd_send(CMD_ACK,1,0,0,0,0);
 }
 
 // Arg0 = BlockNo,
 // Arg1 = UsePwd bool
-// datain = PWD bytes,  
+// datain = PWD bytes,
 void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 {
 	uint8_t blockNo = arg0;
@@ -124,52 +131,52 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 	bool useKey = (arg1 == 1); //UL_C
 	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
 
-	LEDsoff();	
-	LED_A_ON();    
+	LEDsoff();
+	LED_A_ON();
 	clear_trace();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
-    
+
 	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;
 	}
-       
+
 	// UL-C authentication
 	if ( useKey ) {
-		uint8_t key[16] = {0x00};	
+		uint8_t key[16] = {0x00};
 		memcpy(key, datain, sizeof(key) );
 
 		if ( !mifare_ultra_auth(key) ) {
 			OnError(1);
-			return;			
+			return;
 		}
 	}
-	
+
 	// UL-EV1 / NTAG authentication
-	if (usePwd) { 
+	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)) {
 			OnError(1);
-			return;			
+			return;
 		}
-	}
-		
+	}	
+
 	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);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
@@ -268,7 +275,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 	}
 
 	LEDsoff();
-	LED_A_ON(); 
+	LED_A_ON();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
 	int len = iso14443a_select_card(NULL, NULL, NULL);
@@ -277,6 +284,35 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 		OnError(1);
 		return;
 	}
+
+	// UL-C authentication
+	if ( useKey ) {
+		uint8_t key[16] = {0x00};
+		memcpy(key, datain, sizeof(key) );
+
+		if ( !mifare_ultra_auth(key) ) {
+			OnError(1);
+			return;
+		}
+	}
+
+	// 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)){
+			OnError(1);
+			return;			
+		}
+	}
+
+	for (int i = 0; i < blocks; i++){
+		if ((i*4) + 4 > CARD_MEMORY_SIZE) {
+			Dbprintf("Data exceeds buffer!!");
+			break;
+		}
 	
 	 // UL-C authentication
 	if ( useKey ) {
@@ -313,7 +349,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 			if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);
 			// if no blocks read - error out
 			if (i==0){
-			OnError(2);
+				OnError(2);
 			return;
 			} else {
 				//stop at last successful read block and return what we got
@@ -323,14 +359,14 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
 			countblocks++;
 		}
 	}
-		
+
 	len = mifare_ultra_halt();
 	if (len) {
 		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");
 		OnError(3);
 		return;
 	}
-	
+
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
 
 	countblocks *= 4;
@@ -413,15 +449,15 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
 
 void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
 {
-    uint8_t blockNo = arg0;
+	uint8_t blockNo = arg0;
 	byte_t blockdata[16] = {0x00};
 
-    memcpy(blockdata, datain, 16);
-        
+	memcpy(blockdata, datain, 16);
+
 	uint8_t uid[10] = {0x00};
 
 	LED_A_ON(); LED_B_OFF(); LED_C_OFF();
-		
+
 	clear_trace();
 	iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
 
@@ -441,7 +477,7 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)
 		OnError(0);
 		return;
 	};
-		
+
 	if (MF_DBGLEVEL >= 2)   DbpString("WRITE BLOCK FINISHED");
 
 	cmd_send(CMD_ACK,1,0,0,0,0);
@@ -461,8 +497,8 @@ void MifareUWriteBlock_Special(uint8_t arg0, uint8_t arg1, uint8_t *datain)
 	bool useKey = (arg1 == 1); //UL_C
 	bool usePwd = (arg1 == 2); //UL_EV1/NTAG
 	byte_t blockdata[4] = {0x00};
-	
-	memcpy(blockdata, datain, 4);
+
+	memcpy(blockdata, datain,4);
 	
 	LEDsoff();
 	LED_A_ON();
@@ -1338,3 +1374,18 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LEDsoff();
 }
+
+void OnSuccess(){
+	pcb_blocknum = 0;
+	ReaderTransmit(deselect_cmd, 3 , NULL);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LEDsoff();
+}
+
+void OnError(uint8_t reason){
+	pcb_blocknum = 0;
+	ReaderTransmit(deselect_cmd, 3 , NULL);
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	cmd_send(CMD_ACK,0,reason,0,0,0);
+	LEDsoff();
+}
diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 8c44445f..109b91b0 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -315,34 +315,35 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){
 	uint16_t len;
 	uint8_t resp[4];
 	uint8_t respPar[1];
-	uint8_t key[4] = {0x00};	
+	uint8_t key[4] = {0x00};
 	memcpy(key, keybytes, 4);
-	
+
 	Dbprintf("EV1 Auth : %02x%02x%02x%02x",	key[0], key[1], key[2], key[3]);
 	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;
 	}
-	
+
 	if (MF_DBGLEVEL >= MF_DBG_EXTENDED)
-		Dbprintf("Auth Resp: %02x%02x%02x%02x",	resp[0],resp[1],resp[2],resp[3]);
-	
+		Dbprintf("Auth Resp: %02x%02x%02x%02x", resp[0],resp[1],resp[2],resp[3]);
+
 	memcpy(pack, resp, 4);
 	return 1;
 }
 
 int mifare_ultra_auth(uint8_t *keybytes){
 
-	// 3des2k
+	/// 3des2k
+
 	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};
-	uint8_t key[16] = {0x00};	
+	uint8_t key[16] = {0x00};
 	memcpy(key, keybytes, 16);
-	
+
 	uint16_t len;
 	uint8_t resp[19] = {0x00};
 	uint8_t respPar[3] = {0,0,0};
@@ -362,21 +363,41 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	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, resp, respPar, NULL);
+	if (len != 11) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Cmd Error: %02x", resp[0]);
+		return 0;
+	}
+
+	uint8_t enc_resp[8] = { 0,0,0,0,0,0,0,0 };
+	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 
+	tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);
+	if ( memcmp(resp_random_a, random_a, 8) != 0 ) {
+		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("failed authentication");
+		return 0;
+	}
+
 	// encrypt    out, in, length, key, iv
 	tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);
 
@@ -409,7 +430,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 		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]);
@@ -494,18 +515,18 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) 
 {
-    uint16_t len;     
+	uint16_t len;
     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];
-        
+
     // command MIFARE_CLASSIC_WRITEBLOCK
     len = mifare_sendcmd_short(NULL, true, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL);
 
     if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
 		if (MF_DBGLEVEL >= MF_DBG_ERROR)
-			Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);  
+			Dbprintf("Cmd Addr Error: %02x", receivedAnswer[0]);
         return 1;
     }
 
@@ -514,15 +535,15 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData)
 
 	ReaderTransmitPar(d_block, sizeof(d_block), par, NULL);
 
-    len = ReaderReceive(receivedAnswer, receivedAnswerPar);    
+	len = ReaderReceive(receivedAnswer, receivedAnswerPar);
 
 	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 0;
-} 
+}
 
 int mifare_ultra_special_writeblock(uint8_t blockNo, uint8_t *blockData)
 {
diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index f73814be..9575b9fc 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -62,10 +62,10 @@ int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm
 
 int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);
 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);
-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);
 int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack);
 int mifare_ultra_auth(uint8_t *key);
-int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
 int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData);
 int mifare_ultra_special_writeblock(uint8_t blockNo, uint8_t *blockData);
diff --git a/client/cmddata.c b/client/cmddata.c
index 7514e428..b9069bc1 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1892,8 +1892,7 @@ int getSamples(const char *Cmd, bool silent)
 		PrintAndLog("Unpacking...");
 		BitstreamOut bout = { got, bits_per_sample * n,  0};
 		int j =0;
-		//for (j = 0; j * bits_per_sample < n * 8 && j < sizeof(GraphBuffer); j++) {
-			for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
+		for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
 			uint8_t sample = getByte(bits_per_sample, &bout);
 			GraphBuffer[j] = ((int) sample )- 128;
 		}
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 1a088676..614dcdc4 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -677,7 +677,7 @@ int CmdHFSearch(const char *Cmd){
 
 	//14b has issues currently...
 	//ans = CmdHF14BRead(Cmd);
-	//if (ans > 0) return ans;	
+	//if (ans > 0) return ans;
 
 	return 0;
 }
@@ -692,11 +692,11 @@ static command_t CommandTable[] =
   {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
   {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
   {"mf",      		CmdHFMF,		1, "{ MIFARE RFIDs... }"},
-  {"mfu",			CmdHFMFUltra,	1, "{ MIFARE Ultralight RFIDs... }"},
+  {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs... }"},
   {"mfdes",			CmdHFMFDes,		1, "{ MIFARE Desfire RFIDs... }"},
   {"topaz",			CmdHFTopaz,		1, "{ TOPAZ (NFC Type 1) RFIDs... }"},
   {"tune",			CmdHFTune,      0, "Continuously measure HF antenna tuning"},
-  {"list",			CmdHFList,      1, "List protocol data in trace buffer"},
+  {"list",        CmdHFList,        1, "List protocol data in trace buffer"},
   {"search",      CmdHFSearch,      1, "Search for known HF tags [preliminary]"},
 	{NULL, NULL, 0, NULL}
 };
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index d6c79165..e8ba68f1 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -174,9 +174,9 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose)
 	SendCommand(&c);
 	UsbCommand resp;
 	while(!ukbhit()){
-		if (WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
+		if (WaitForResponseTimeout(CMD_ACK,&resp, 4500)) {
 			uint8_t readStatus    = resp.arg[0] & 0xff;
-			uint8_t * data  = resp.d.asBytes;
+			uint8_t *data = resp.d.asBytes;
 
 			if (verbose)
 			PrintAndLog("Readstatus:%02x", readStatus);
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1b815326..676a8884 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1592,6 +1592,7 @@ int CmdHF14AMfCLoad(const char *Cmd)
 			memset(buf, 0, sizeof(buf));
 			
 			if (fgets(buf, sizeof(buf), f) == NULL) {
+				fclose(f);
 				PrintAndLog("File reading error.");
 				fclose(f);
 				return 2;
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index ea381736..6ab24a43 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -16,16 +16,16 @@
 #include "../common/protocols.h"
 #include "data.h"
 
-#define MAX_UL_BLOCKS		0x0f
-#define MAX_ULC_BLOCKS		0x2b
-#define MAX_ULEV1a_BLOCKS	0x13
-#define MAX_ULEV1b_BLOCKS	0x28
-#define MAX_NTAG_203		0x29
-#define MAX_NTAG_210		0x13
-#define MAX_NTAG_212		0x28
-#define MAX_NTAG_213		0x2c
-#define MAX_NTAG_215		0x86
-#define MAX_NTAG_216        0xe6
+#define MAX_UL_BLOCKS     0x0f
+#define MAX_ULC_BLOCKS    0x2b
+#define MAX_ULEV1a_BLOCKS 0x13
+#define MAX_ULEV1b_BLOCKS 0x28
+#define MAX_NTAG_203      0x29
+#define MAX_NTAG_210      0x13
+#define MAX_NTAG_212      0x28
+#define MAX_NTAG_213      0x2c
+#define MAX_NTAG_215      0x86
+#define MAX_NTAG_216      0xe6
 
 #define KEYS_3DES_COUNT 7
 uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
@@ -35,25 +35,25 @@ uint8_t default_3des_keys[KEYS_3DES_COUNT][16] = {
 		{ 0x49,0x45,0x4D,0x4B,0x41,0x45,0x52,0x42,0x21,0x4E,0x41,0x43,0x55,0x4F,0x59,0x46 },// NFC-key
 		{ 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 },// all ones
 		{ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF },// all FF
-		{ 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF },// 11 22 33
-	};
+		{ 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF }	// 11 22 33
+};
 
 #define KEYS_PWD_COUNT 10
 uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
 	{0xFF,0xFF,0xFF,0xFF}, // PACK 0x00,0x00 -- factory default
-	
+
 	{0x4A,0xF8,0x4B,0x19}, // PACK 0xE5,0xBE -- italian bus (sniffed)
 	{0x33,0x6B,0xA1,0x19}, // PACK 0x9c,0x2d -- italian bus (sniffed)
 	{0xFF,0x90,0x6C,0xB2}, // PACK 0x12,0x9e -- italian bus (sniffed)	
 	{0x46,0x1c,0xA3,0x19}, // PACK 0xE9,0x5A -- italian bus (sniffed)
 	{0x35,0x1C,0xD0,0x19}, // PACK 0x9A,0x5a -- italian bus (sniffed)
-	
+
 	{0x05,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- Amiiboo (sniffed) pikachu-b UID:
 	{0x7E,0x22,0xE6,0xB4}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
 	{0x02,0xE1,0xEE,0x36}, // PACK 0x80,0x80 -- AMiiboo (sniffed) sonic UID:  04d257 7ae33e8027
 	{0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed) 
-};	
-	
+};
+
 #define MAX_UL_TYPES 16
 uint16_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128, NTAG, NTAG_203,
 	    NTAG_210, NTAG_212, NTAG_213, NTAG_215, NTAG_216, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC};
@@ -65,9 +65,9 @@ uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_B
 
 static int CmdHelp(const char *Cmd);
 
-char* getProductTypeStr( uint8_t id){
+char *getProductTypeStr( uint8_t id){
 
- 	static char buf[20];
+	static char buf[20];
 	char *retStr = buf;
 
 	switch(id) {
@@ -83,18 +83,18 @@ char* getProductTypeStr( uint8_t id){
   the LSBit is set to '0' if the size is exactly 2^n
   and set to '1' if the storage size is between 2^n and 2^(n+1). 
 */
-char* getUlev1CardSizeStr( uint8_t fsize ){
- 
- 	static char buf[40];
+char *getUlev1CardSizeStr( uint8_t fsize ){
+
+	static char buf[40];
 	char *retStr = buf;
-	memset(buf, 0, sizeof(buf));	
-	
+	memset(buf, 0, sizeof(buf));
+
 	uint16_t usize = 1 << ((fsize >>1) + 1);
 	uint16_t lsize = 1 << (fsize >>1);
 
 	// is  LSB set?
-	if ( fsize & 1 )
-		sprintf(retStr, "%02X, (%u <-> %u bytes)", fsize, usize, lsize);
+	if (  fsize & 1 )
+		sprintf(retStr, "%02X, (%u <-> %u bytes)",fsize, usize, lsize);
 	else 
 		sprintf(retStr, "%02X, (%u bytes)", fsize, lsize);		
 	return buf;
@@ -115,9 +115,9 @@ static int ul_send_cmd_raw( uint8_t *cmd, uint8_t cmdlen, uint8_t *response, uin
 	memcpy(c.d.asBytes, cmd, cmdlen);
 	SendCommand(&c);
 	UsbCommand resp;
-	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return -1;
-	if ( !resp.arg[0] && responseLength) return -1;
-	
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500)) return -1;
+	if (!resp.arg[0] && responseLength) return -1;
+
 	uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
 	memcpy(response, resp.d.asBytes, resplen);
 	return resplen;
@@ -127,7 +127,7 @@ static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response,
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_RAW | ISO14A_NO_DISCONNECT , cmdlen, 0}};
 	if (append_crc)
 		c.arg[0] |= ISO14A_APPEND_CRC;
-	
+
 	memcpy(c.d.asBytes, cmd, cmdlen);	
 	SendCommand(&c);
 	UsbCommand resp;
@@ -135,12 +135,12 @@ static int ul_send_cmd_raw_crc( uint8_t *cmd, uint8_t cmdlen, uint8_t *response,
 	if (!resp.arg[0] && responseLength) return -1;
 
 	uint16_t resplen = (resp.arg[0] < responseLength) ? resp.arg[0] : responseLength;
-		memcpy(response, resp.d.asBytes, resplen );
+	memcpy(response, resp.d.asBytes, resplen);
 	return resplen;
 }
 */
 static int ul_select( iso14a_card_select_t *card ){
-	
+
 	ul_switch_on_field();
 
 	UsbCommand resp;
@@ -151,6 +151,70 @@ static int ul_select( iso14a_card_select_t *card ){
 		ul_switch_off_field();
 		return 0;
 	}
+
+	memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
+	return 1;
+}
+
+// This read command will at least return 16bytes.
+static int ul_read( uint8_t page, uint8_t *response, uint16_t responseLength ){
+
+	uint8_t cmd[] = {ISO14443A_CMD_READBLOCK, page};
+	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
+	return len;
+}
+
+static int ul_comp_write( uint8_t page, uint8_t *data, uint8_t datalen ){
+
+	uint8_t cmd[18];
+	memset(cmd, 0x00, sizeof(cmd));
+	datalen = ( datalen > 16) ? 16 : datalen;
+
+	cmd[0] = ISO14443A_CMD_WRITEBLOCK;
+	cmd[1] = page;
+	memcpy(cmd+2, data, datalen);
+
+	uint8_t response[1] = {0xff};
+	ul_send_cmd_raw(cmd, 2+datalen, response, sizeof(response));
+	// ACK
+	if ( response[0] == 0x0a ) return 0;
+	// NACK
+	return -1;
+}
+
+static int ulc_requestAuthentication( uint8_t *nonce, uint16_t nonceLength ){
+
+	uint8_t cmd[] = {MIFARE_ULC_AUTH_1, 0x00};
+	int len = ul_send_cmd_raw(cmd, sizeof(cmd), nonce, nonceLength);
+	return len;
+}
+
+static int ulc_authentication( uint8_t *key, bool switch_off_field ){
+
+	UsbCommand c = {CMD_MIFAREUC_AUTH, {switch_off_field}};
+	memcpy(c.d.asBytes, key, 16);
+	SendCommand(&c);
+	UsbCommand resp;
+	if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) return 0;
+	if ( resp.arg[0] == 1 ) return 1;
+
+	return 0;
+}
+
+static int ulev1_requestAuthentication( uint8_t *pwd, uint8_t *pack, uint16_t packLength ){
+
+	uint8_t cmd[] = {MIFARE_ULEV1_AUTH, pwd[0], pwd[1], pwd[2], pwd[3]};
+	int len = ul_send_cmd_raw(cmd, sizeof(cmd), pack, packLength);
+	return len;
+}
+
+static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool hasAuthKey, uint8_t *authenticationkey, uint8_t *pack, uint8_t packSize){
+	if ( hasAuthKey && (tagtype & UL_C)) {
+		//will select card automatically and close connection on error
+		if (!ulc_authentication(authenticationkey, false)) {
+			PrintAndLog("Error: Authentication Failed UL-C");
+			return 0;
+	}
 	
 	memcpy(card, resp.d.asBytes, sizeof(iso14a_card_select_t));
 	return 1;
@@ -230,7 +294,7 @@ static int ul_auth_select( iso14a_card_select_t *card, TagTypeUL_t tagtype, bool
 }
 
 static int ulev1_getVersion( uint8_t *response, uint16_t responseLength ){
-	
+
 	uint8_t cmd[] = {MIFARE_ULEV1_VERSION};	
 	int len = ul_send_cmd_raw(cmd, sizeof(cmd), response, responseLength);
 	return len;
@@ -268,7 +332,7 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 }
 
 static int ul_print_default( uint8_t *data){
-	
+
 	uint8_t uid[7];
 	uid[0] = data[0];
 	uid[1] = data[1];
@@ -279,7 +343,7 @@ static int ul_print_default( uint8_t *data){
 	uid[6] = data[7];
 
 	PrintAndLog("       UID : %s ", sprint_hex(uid, 7));
-	PrintAndLog("    UID[0] : %02X, %s",  uid[0], getTagInfo(uid[0]) );
+	PrintAndLog("    UID[0] : %02X, Manufacturer: %s",  uid[0], getTagInfo(uid[0]) );
 	if ( uid[0] == 0x05 ) {
 		uint8_t chip = (data[8] & 0xC7); // 11000111  mask, bit 3,4,5 RFU
 		switch (chip){
@@ -294,13 +358,13 @@ static int ul_print_default( uint8_t *data){
 		PrintAndLog("      BCC0 : %02X, Ok", data[3]);
 	else
 		PrintAndLog("      BCC0 : %02X, crc should be %02X", data[3], crc0);
-	
+
 	int crc1 = data[4] ^ data[5] ^ data[6] ^data[7];
 	if ( data[8] == crc1 )
 		PrintAndLog("      BCC1 : %02X, Ok", data[8]);
 	else
 		PrintAndLog("      BCC1 : %02X, crc should be %02X", data[8], crc1 );
-	
+
 	PrintAndLog("  Internal : %02X, %sdefault", data[9], (data[9]==0x48)?"":"not " );
 
 	PrintAndLog("      Lock : %s - %s",
@@ -308,114 +372,544 @@ static int ul_print_default( uint8_t *data){
 				printBits(2, data+10)
 		);
 
-	PrintAndLog("OneTimePad : %s - %s\n",
-				sprint_hex(data + 12, 4),
-				printBits(4, data+12)
-		);
+	PrintAndLog("OneTimePad : %s - %s\n",
+				sprint_hex(data + 12, 4),
+				printBits(4, data+12)
+		);
+
+	return 0;
+}
+
+static int ndef_print_CC(uint8_t *data) {
+	// no NDEF message
+	if(data[0] != 0xe1)
+		return -1;
+
+	PrintAndLog("--- NDEF Message");
+	PrintAndLog("Capability Container: %s", sprint_hex(data,4) );
+	PrintAndLog("  %02X : NDEF Magic Number", data[0]); 
+	PrintAndLog("  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
+	PrintAndLog("  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
+	if ( data[2] == 0x12 )
+		PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 144);
+	else if ( data[2] == 0x3e )
+		PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 496);
+	else if ( data[2] == 0x6d )
+		PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 872);
+
+	PrintAndLog("  %02X : %s / %s", data[3], 
+				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security", 
+				(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
+	return 0;
+}
+
+int ul_print_type(uint32_t tagtype, uint8_t spaces){
+	char spc[11] = "          ";
+	spc[10]=0x00;
+	char *spacer = spc + (10-spaces);
+
+	if ( tagtype & UL )	
+		PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+	else if ( tagtype & UL_C)
+		PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
+	else if ( tagtype & UL_EV1_48)
+		PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
+	else if ( tagtype & UL_EV1_128)	
+		PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
+	else if ( tagtype & NTAG )
+		PrintAndLog("%sTYPE : NTAG UNKNOWN", spacer);
+	else if ( tagtype & NTAG_203 )
+		PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
+	else if ( tagtype & NTAG_210 )
+		PrintAndLog("%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
+	else if ( tagtype & NTAG_212 )
+		PrintAndLog("%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
+	else if ( tagtype & NTAG_213 )
+		PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
+	else if ( tagtype & NTAG_215 )
+		PrintAndLog("%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
+	else if ( tagtype & NTAG_216 )
+		PrintAndLog("%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
+	else if ( tagtype & NTAG_I2C_1K )
+		PrintAndLog("%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
+	else if ( tagtype & NTAG_I2C_2K )	
+		PrintAndLog("%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
+	else if ( tagtype & MY_D )
+		PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
+	else if ( tagtype & MY_D_NFC )
+		PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC", spacer);
+	else if ( tagtype & MY_D_MOVE )
+		PrintAndLog("%sTYPE : INFINEON my-d\x99 move", spacer);
+	else if ( tagtype & MY_D_MOVE_NFC )
+		PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);
+	else
+		PrintAndLog("%sTYPE : Unknown %06x", spacer, tagtype);
+	return 0;
+}
+
+static int ulc_print_3deskey( uint8_t *data){
+	PrintAndLog("         deskey1 [44/0x2C] : %s [%.4s]", sprint_hex(data   ,4),data);
+	PrintAndLog("         deskey1 [45/0x2D] : %s [%.4s]", sprint_hex(data+4 ,4),data+4);
+	PrintAndLog("         deskey2 [46/0x2E] : %s [%.4s]", sprint_hex(data+8 ,4),data+8);
+	PrintAndLog("         deskey2 [47/0x2F] : %s [%.4s]", sprint_hex(data+12,4),data+12);
+	PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
+	return 0;
+}
+
+static int ulc_print_configuration( uint8_t *data){
+
+	PrintAndLog("--- UL-C Configuration");
+	PrintAndLog(" Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), printBits(2, data));
+	PrintAndLog("         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), printBits(2, data+4));
+
+	bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
+	if ( validAuth )
+		PrintAndLog("           Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );
+	else{
+		if ( data[8] == 0){
+			PrintAndLog("           Auth0 [42/0x2A] : %s default", sprint_hex(data+8, 4) );
+		} else {
+			PrintAndLog("           Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data+8, 4) );
+		}
+	}
+	PrintAndLog("           Auth1 [43/0x2B] : %s %s",
+			sprint_hex(data+12, 4),
+			(data[12] & 1) ? "write access restricted": "read and write access restricted"
+			);
+	return 0;
+}
+
+static int ulev1_print_configuration( uint8_t *data, uint8_t startPage){
+
+	PrintAndLog("\n--- Tag Configuration");
+
+	bool strg_mod_en = (data[0] & 2);
+	uint8_t authlim = (data[4] & 0x07);
+	bool cfglck = (data[4] & 0x40);
+	bool prot = (data[4] & 0x80);
+	uint8_t vctid = data[5];
+
+	PrintAndLog("  cfg0 [%u/0x%02X] : %s", startPage, startPage, sprint_hex(data, 4));
+	if ( data[3] < 0xff )
+		PrintAndLog("                    - page %d and above need authentication",data[3]);
+	else 
+		PrintAndLog("                    - pages don't need authentication");
+	PrintAndLog("                    - strong modulation mode %s", (strg_mod_en) ? "enabled":"disabled");
+	PrintAndLog("  cfg1 [%u/0x%02X] : %s", startPage + 1, startPage + 1,  sprint_hex(data+4, 4) );
+	if ( authlim == 0)
+		PrintAndLog("                    - Unlimited password attempts");
+	else
+		PrintAndLog("                    - Max number of password attempts is %d", authlim);
+	PrintAndLog("                    - user configuration %s", cfglck ? "permanently locked":"writeable");
+	PrintAndLog("                    - %s access is protected with password", prot ? "read and write":"write");
+	PrintAndLog("                    - %02X, Virtual Card Type Identifier is %s default", vctid, (vctid==0x05)? "":"not");
+	PrintAndLog("  PWD  [%u/0x%02X] : %s- (cannot be read)", startPage + 2, startPage + 2,  sprint_hex(data+8, 4));
+	PrintAndLog("  PACK [%u/0x%02X] : %s      - (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
+	PrintAndLog("  RFU  [%u/0x%02X] :       %s- (cannot be read)", startPage + 3, startPage + 3,  sprint_hex(data+12, 2));
+	return 0;
+}
+
+static int ulev1_print_counters(){
+	PrintAndLog("--- Tag Counters");
+	uint8_t tear[1] = {0};
+	uint8_t counter[3] = {0,0,0};
+	uint16_t len = 0;
+	for ( uint8_t i = 0; i<3; ++i) {
+		ulev1_readTearing(i,tear,sizeof(tear));
+		len = ulev1_readCounter(i,counter, sizeof(counter) );
+		if (len == 3) {
+			PrintAndLog("       [%0d] : %s", i, sprint_hex(counter,3));
+			PrintAndLog("                    - %02X tearing %s", tear[0], ( tear[0]==0xBD)?"Ok":"failure");
+		}
+	}
+	return len;
+}
+
+static int ulev1_print_signature( uint8_t *data, uint8_t len){
+	PrintAndLog("\n--- Tag Signature");	
+	//PrintAndLog("IC signature public key name  : NXP NTAG21x 2013"); // don't know if there is other NXP public keys.. :(
+	PrintAndLog("IC signature public key value : 04494e1a386d3d3cfe3dc10e5de68a499b1c202db5b132393e89ed19fe5be8bc61");
+	PrintAndLog("    Elliptic curve parameters : secp128r1");
+	PrintAndLog("            Tag ECC Signature : %s", sprint_hex(data, len));
+	//to do:  verify if signature is valid
+	//PrintAndLog("IC signature status: %s valid", (iseccvalid() )?"":"not");
+	return 0;
+}
+
+static int ulev1_print_version(uint8_t *data){
+	PrintAndLog("\n--- Tag Version");
+	PrintAndLog("       Raw bytes : %s",sprint_hex(data, 8) );
+	PrintAndLog("       Vendor ID : %02X, %s", data[1], getTagInfo(data[1]));
+	PrintAndLog("    Product type : %s", getProductTypeStr(data[2]));
+	PrintAndLog(" Product subtype : %02X, %s", data[3], (data[3]==1) ?"17 pF":"50pF");
+	PrintAndLog("   Major version : %02X", data[4]);
+	PrintAndLog("   Minor version : %02X", data[5]);
+	PrintAndLog("            Size : %s", getUlev1CardSizeStr(data[6]));
+	PrintAndLog("   Protocol type : %02X", data[7]);
+	return 0;
+}
+
+/*
+static int ulc_magic_test(){
+	// Magic Ultralight test
+		// Magic UL-C, by observation,
+	// 1) it seems to have a static nonce response to 0x1A command.
+	// 2) the deskey bytes is not-zero:d out on as datasheet states.
+	// 3) UID - changeable, not only, but pages 0-1-2-3.
+	// 4) use the ul_magic_test !  magic tags answers specially!
+	int returnValue = UL_ERROR;
+	iso14a_card_select_t card;
+	uint8_t nonce1[11] = {0x00};
+	uint8_t nonce2[11] = {0x00};
+	int status = ul_select(&card);
+	if ( !status ){
+		return UL_ERROR;
+	}
+	status = ulc_requestAuthentication(nonce1, sizeof(nonce1));
+	if ( status > 0 ) {
+		status = ulc_requestAuthentication(nonce2, sizeof(nonce2));
+		returnValue =  ( !memcmp(nonce1, nonce2, 11) ) ? UL_C_MAGIC : UL_C;
+	} else {
+		returnValue = UL;
+	}	
+	ul_switch_off_field();
+	return returnValue;
+}
+*/
+static int ul_magic_test(){
+
+	// Magic Ultralight tests
+	// 1) take present UID, and try to write it back. OBSOLETE 
+	// 2) make a wrong length write to page0, and see if tag answers with ACK/NACK:
+	iso14a_card_select_t card;
+	if ( !ul_select(&card) ) 
+		return UL_ERROR;
+	int status = ul_comp_write(0, NULL, 0);
+	ul_switch_off_field();
+	if ( status == 0 ) 
+		return MAGIC;
+	return 0;
+}
+
+uint32_t GetHF14AMfU_Type(void){
+
+	TagTypeUL_t tagtype = UNKNOWN;
+	iso14a_card_select_t card;
+	uint8_t version[10] = {0x00};
+	int status = 0;
+	int len;
+
+	if (!ul_select(&card)) return UL_ERROR;
+
+	// Ultralight - ATQA / SAK 
+	if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
+		PrintAndLog("Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
+		ul_switch_off_field();
+		return UL_ERROR;
+	}
+
+	if ( card.uid[0] != 0x05) {
+
+		len  = ulev1_getVersion(version, sizeof(version));
+		ul_switch_off_field();
+
+		switch (len) {
+			case 0x0A: {
+
+				if ( version[2] == 0x03 && version[6] == 0x0B )
+					tagtype = UL_EV1_48;
+				else if ( version[2] == 0x03 && version[6] != 0x0B )
+					tagtype = UL_EV1_128;
+				else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0B )
+					tagtype = NTAG_210;
+				else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0E )
+					tagtype = NTAG_212;
+				else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x0F )
+					tagtype = NTAG_213;
+				else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x11 )
+					tagtype = NTAG_215;
+				else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x13 )
+					tagtype = NTAG_216;
+				else if ( version[2] == 0x04 && version[3] == 0x05 && version[6] == 0x13 )
+					tagtype = NTAG_I2C_1K;
+				else if ( version[2] == 0x04 && version[3] == 0x05 && version[6] == 0x15 )
+					tagtype = NTAG_I2C_2K;
+				else if ( version[2] == 0x04 )
+					tagtype = NTAG;
+
+				break;
+			}
+			case 0x01: tagtype = UL_C; break;
+			case 0x00: tagtype = UL; break;
+			case -1  : tagtype = (UL | UL_C | NTAG_203); break;  // could be UL | UL_C magic tags
+			default  : tagtype = UNKNOWN; break;
+		}
+		// UL vs UL-C vs ntag203 test
+		if (tagtype & (UL | UL_C | NTAG_203)) {
+			if ( !ul_select(&card) ) return UL_ERROR;
+
+			// do UL_C check first...
+			uint8_t nonce[11] = {0x00};
+			status = ulc_requestAuthentication(nonce, sizeof(nonce));
+			ul_switch_off_field();
+			if (status > 1) {
+				tagtype = UL_C;
+			} else { 
+				// need to re-select after authentication error
+				if ( !ul_select(&card) ) return UL_ERROR;
+
+				uint8_t data[16] = {0x00};
+				// read page 0x26-0x29 (last valid ntag203 page)
+				status = ul_read(0x26, data, sizeof(data));
+				if ( status <= 1 ) {
+					tagtype = UL;
+				} else {
+					// read page 0x30 (should error if it is a ntag203)
+					status = ul_read(0x30, data, sizeof(data));
+					if ( status <= 1 ){
+						tagtype = NTAG_203;
+					} else {
+						tagtype = UNKNOWN;
+					}
+				}
+				ul_switch_off_field();
+			}
+		}
+	} else {
+		// Infinition MY-D tests   Exam high nibble 
+		uint8_t nib = (card.uid[1] & 0xf0) >> 4;
+		switch ( nib ){
+			case 1:	tagtype =  MY_D; break;
+			case 2:	tagtype = (MY_D | MY_D_NFC); break; //notice: we can not currently distinguish between these two
+			case 3:	tagtype = (MY_D_MOVE | MY_D_MOVE_NFC); break; //notice: we can not currently distinguish between these two
+		}
+	}
+
+	tagtype |= ul_magic_test();
+	if (tagtype == (UNKNOWN | MAGIC)) tagtype = (UL_MAGIC);
+	return tagtype;
+}
+
+int CmdHF14AMfUInfo(const char *Cmd){
+
+	uint8_t authlim = 0xff;
+	uint8_t data[16] = {0x00};
+	iso14a_card_select_t card;
+	int status;
+	bool errors = false;
+	bool hasAuthKey = false;
+	bool locked = false;
+	bool swapEndian = false;
+	uint8_t cmdp = 0;
+	uint8_t dataLen = 0;
+	uint8_t authenticationkey[16] = {0x00};
+	uint8_t *authkeyptr = authenticationkey;
+	uint8_t	*key;
+	uint8_t pack[4] = {0,0,0,0};
+	int len = 0;
+	char tempStr[50];
+
+	while(param_getchar(Cmd, cmdp) != 0x00)
+	{
+		switch(param_getchar(Cmd, cmdp))
+		{
+		case 'h':
+		case 'H':
+			return usage_hf_mfu_info();
+		case 'k':
+		case 'K':
+			dataLen = param_getstr(Cmd, cmdp+1, tempStr);
+			if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+				errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+				dataLen /= 2; // handled as bytes from now on
+			} else {
+				PrintAndLog("\nERROR: Key is incorrect length\n");
+				errors = true;
+			}
+			cmdp += 2;
+			hasAuthKey = true;
+			break;
+		case 'l':
+		case 'L':
+			swapEndian = true;
+			cmdp++;
+			break;
+		default:
+			PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = true;
+			break;
+		}
+		if(errors) break;
+	}
+
+	//Validations
+	if(errors) return usage_hf_mfu_info();
+
+	TagTypeUL_t tagtype = GetHF14AMfU_Type();
+	if (tagtype == UL_ERROR) return -1;
+
+	PrintAndLog("\n--- Tag Information ---------");
+	PrintAndLog("-------------------------------------------------------------");
+	ul_print_type(tagtype, 6);
+
+	// Swap endianness 
+	if (swapEndian && hasAuthKey) authkeyptr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4 );
+
+	if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+
+	// read pages 0,1,2,3 (should read 4pages)
+	status = ul_read(0, data, sizeof(data));
+	if ( status == -1 ) {
+		ul_switch_off_field();
+		PrintAndLog("Error: tag didn't answer to READ");
+		return status;
+	} else if (status == 16) {
+		ul_print_default(data);
+		ndef_print_CC(data+12);
+	} else {
+		locked = true;
+	}
+
+	// UL_C Specific
+	if ((tagtype & UL_C)) {
 
-	return 0;
-}
+		// read pages 0x28, 0x29, 0x2A, 0x2B
+		uint8_t ulc_conf[16] = {0x00};
+		status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
+		if ( status == -1 ){
+			PrintAndLog("Error: tag didn't answer to READ UL-C");
+			ul_switch_off_field();
+			return status;
+		} 
+		if (status == 16) ulc_print_configuration(ulc_conf);
+		else locked = true;
 
-static int ndef_print_CC(uint8_t *data) {
-	// no NDEF message
-	if(data[0] != 0xe1)
-		return -1;
+		if ((tagtype & MAGIC)) {
+			//just read key
+			uint8_t ulc_deskey[16] = {0x00};
+			status = ul_read(0x2C, ulc_deskey, sizeof(ulc_deskey));
+			if ( status == -1 ) {
+				ul_switch_off_field();
+				PrintAndLog("Error: tag didn't answer to READ magic");
+				return status;
+			}
+			if (status == 16) ulc_print_3deskey(ulc_deskey);
 
-	PrintAndLog("--- NDEF Message");
-	PrintAndLog("Capability Container: %s", sprint_hex(data,4) );
-	PrintAndLog("  %02X : NDEF Magic Number", data[0]); 
-	PrintAndLog("  %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0f);
-	PrintAndLog("  %02X : Physical Memory Size: %d bytes", data[2], (data[2] + 1) * 8);
-	if ( data[2] == 0x12 )
-		PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 144);
-	else if ( data[2] == 0x3e )
-		PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 496);
-	else if ( data[2] == 0x6d )
-		PrintAndLog("  %02X : NDEF Memory Size: %d bytes", data[2], 872);
-	
-	PrintAndLog("  %02X : %s / %s", data[3], 
-				(data[3] & 0xF0) ? "(RFU)" : "Read access granted without any security", 
-				(data[3] & 0x0F)==0 ? "Write access granted without any security" : (data[3] & 0x0F)==0x0F ? "No write access granted at all" : "(RFU)");
-	return 0;				
-}
+		} else {
+			ul_switch_off_field();
+			// if we called info with key, just return 
+			if ( hasAuthKey ) return 1;
 
-int ul_print_type(uint32_t tagtype, uint8_t spaces){
-	char spc[11] = "          ";
-	spc[10]=0x00;
-	char *spacer = spc + (10-spaces);
+			// also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys
+			PrintAndLog("Trying some default 3des keys");
+			for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ) {
+				key = default_3des_keys[i];
+				if (ulc_authentication(key, true)) {
+					PrintAndLog("Found default 3des key: ");
+					uint8_t keySwap[16];
+					memcpy(keySwap, SwapEndian64(key,16,8), 16);
+					ulc_print_3deskey(keySwap);
+					return 1;
+				} 
+			}
+			return 1;
+		}
+	}
 
-	if ( tagtype & UL )	
-		PrintAndLog("%sTYPE : MIFARE Ultralight (MF0ICU1) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
-	else if ( tagtype & UL_C)
-		PrintAndLog("%sTYPE : MIFARE Ultralight C (MF0ULC) %s", spacer, (tagtype & MAGIC) ? "<magic>" : "" );
-	else if ( tagtype & UL_EV1_48)
-		PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); 
-	else if ( tagtype & UL_EV1_128)	
-		PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
-	else if ( tagtype & NTAG )
-		PrintAndLog("%sTYPE : NTAG UNKNOWN", spacer);
-	else if ( tagtype & NTAG_203 )
-		PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301F0DT)", spacer);
-	else if ( tagtype & NTAG_210 )
-		PrintAndLog("%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
-	else if ( tagtype & NTAG_212 )
-		PrintAndLog("%sTYPE : NTAG 212 128bytes (NT2L1211G0DU)", spacer);
-	else if ( tagtype & NTAG_213 )
-		PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
-	else if ( tagtype & NTAG_215 )
-		PrintAndLog("%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer);
-	else if ( tagtype & NTAG_216 )
-		PrintAndLog("%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer);
-	else if ( tagtype & NTAG_I2C_1K )
-		PrintAndLog("%sTYPE : NTAG I%sC 888bytes (NT3H1101FHK)", spacer, "\xFD");
-	else if ( tagtype & NTAG_I2C_2K )	
-		PrintAndLog("%sTYPE : NTAG I%sC 1904bytes (NT3H1201FHK)", spacer, "\xFD");
-	else if ( tagtype & MY_D )
-		PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
-	else if ( tagtype & MY_D_NFC )
-		PrintAndLog("%sTYPE : INFINEON my-d\x99 NFC", spacer);
-	else if ( tagtype & MY_D_MOVE )
-		PrintAndLog("%sTYPE : INFINEON my-d\x99 move", spacer);
-	else if ( tagtype & MY_D_MOVE_NFC )
-		PrintAndLog("%sTYPE : INFINEON my-d\x99 move NFC", spacer);
-	else
-		PrintAndLog("%sTYPE : Unknown %06x", spacer, tagtype);
-	return 0;
-}
+	// do counters and signature first (don't neet auth) 
 
-static int ulc_print_3deskey( uint8_t *data){			
-	PrintAndLog("         deskey1 [44/0x2C] : %s [%.4s]", sprint_hex(data   ,4),data);
-	PrintAndLog("         deskey1 [45/0x2D] : %s [%.4s]", sprint_hex(data+4 ,4),data+4);
-	PrintAndLog("         deskey2 [46/0x2E] : %s [%.4s]", sprint_hex(data+8 ,4),data+8);
-	PrintAndLog("         deskey2 [47/0x2F] : %s [%.4s]", sprint_hex(data+12,4),data+12);
-	PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));
-	return 0;
-}
+	// ul counters are different than ntag counters
+	if ((tagtype & (UL_EV1_48 | UL_EV1_128))) {
+		if (ulev1_print_counters() != 3) {
+			// failed - re-select
+			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+		}
+	}
 
-static int ulc_print_configuration( uint8_t *data){
-		
-	PrintAndLog("--- UL-C Configuration");
-	PrintAndLog(" Higher Lockbits [40/0x28] : %s - %s", sprint_hex(data, 4), printBits(2, data));
-	PrintAndLog("         Counter [41/0x29] : %s - %s", sprint_hex(data+4, 4), printBits(2, data+4));
+	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216 | NTAG_I2C_1K | NTAG_I2C_2K	))) {
+		uint8_t ulev1_signature[32] = {0x00};
+		status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));
+		if ( status == -1 ) {
+			PrintAndLog("Error: tag didn't answer to READ SIGNATURE");
+			ul_switch_off_field();
+			return status;
+		}
+		if (status == 32) ulev1_print_signature( ulev1_signature, sizeof(ulev1_signature));
+		else {
+			// re-select
+			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+		}
+	}
 
-	bool validAuth = (data[8] >= 0x03 && data[8] <= 0x30);
-	if ( validAuth )
-		PrintAndLog("           Auth0 [42/0x2A] : %s page %d/0x%02X and above need authentication", sprint_hex(data+8, 4), data[8],data[8] );
-	else{
-		if ( data[8] == 0){
-			PrintAndLog("           Auth0 [42/0x2A] : %s default", sprint_hex(data+8, 4) );
+	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_210 | NTAG_212 | NTAG_213 | NTAG_215 | NTAG_216 | NTAG_I2C_1K | NTAG_I2C_2K))) {
+		uint8_t version[10] = {0x00};
+		status  = ulev1_getVersion(version, sizeof(version));
+		if ( status == -1 ) {
+			PrintAndLog("Error: tag didn't answer to GETVERSION");
+			ul_switch_off_field();
+			return status;
+		} else if (status == 10) {
+			ulev1_print_version(version);
 		} else {
-			PrintAndLog("           Auth0 [42/0x2A] : %s auth byte is out-of-range", sprint_hex(data+8, 4) );
+			locked = true;
+			if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+		}
+
+		uint8_t startconfigblock = 0;
+		uint8_t ulev1_conf[16] = {0x00};
+		// config blocks always are last 4 pages
+		for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)
+			if (tagtype & UL_TYPES_ARRAY[idx])
+				startconfigblock = UL_MEMORY_ARRAY[idx]-3;
+
+		if (startconfigblock){ // if we know where the config block is...
+			status = ul_read(startconfigblock, ulev1_conf, sizeof(ulev1_conf));
+			if ( status == -1 ) {
+				PrintAndLog("Error: tag didn't answer to READ EV1");
+				ul_switch_off_field();
+				return status;
+			} else if (status == 16) {
+				// save AUTHENTICATION LIMITS for later:
+				authlim = (ulev1_conf[4] & 0x07);
+				ulev1_print_configuration(ulev1_conf, startconfigblock);
+			}
+		}
+
+		// AUTHLIMIT, (number of failed authentications)
+		// 0 = limitless.
+		// 1-7 = limit. No automatic tries then.
+		// hasAuthKey,  if we was called with key, skip test.
+		if ( !authlim && !hasAuthKey ) {
+			PrintAndLog("\n--- Known EV1/NTAG passwords.");
+			len = 0;
+			for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
+				key = default_pwd_pack[i];
+				len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+				if (len >= 1) {
+					PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+					break;
+				} else {
+					if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
+				}
+			}
+			if (len < 1) PrintAndLog("password not known");
 		}
 	}
-	PrintAndLog("           Auth1 [43/0x2B] : %s %s",
-			sprint_hex(data+12, 4),
-			(data[12] & 1) ? "write access restricted": "read and write access restricted"
-			);
-	return 0;
+
+	ul_switch_off_field();
+	if (locked) PrintAndLog("\nTag appears to be locked, try using the key to get more info");
+	PrintAndLog("");
+	return 1;
 }
 
-static int ulev1_print_configuration( uint8_t *data){
+//
+//  Mifare Ultralight Write Single Block
+//
+int CmdHF14AMfUWrBl(const char *Cmd){
+	uint8_t blockNo    = -1;
+	bool chinese_card  = FALSE;
+	uint8_t bldata[16] = {0x00};
+	UsbCommand resp;
 
 	PrintAndLog("\n--- Tag Configuration");
 
@@ -526,21 +1020,9 @@ static int ul_magic_test(){
 	return 0;
 }
 
-uint32_t GetHF14AMfU_Type(void){
-
-	TagTypeUL_t tagtype = UNKNOWN;
-	iso14a_card_select_t card;
-	uint8_t version[10] = {0x00};
-	int status = 0;
-	int len;
-
-	if (!ul_select(&card)) return UL_ERROR;
-
-	// Ultralight - ATQA / SAK 
-	if ( card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00 ) {
-		PrintAndLog("Tag is not Ultralight | NTAG | MY-D  [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
-		ul_switch_off_field();
-		return UL_ERROR;
+	if (blockNo > MAX_UL_BLOCKS){
+		PrintAndLog("Error: Maximum number of blocks is 15 for Ultralight Cards!");
+		return 1;
 	}
 	
 	if ( card.uid[0] != 0x05) {
@@ -1050,7 +1532,6 @@ int CmdHF14AMfURdBl(const char *Cmd){
 		//Validations
 		if(errors) return usage_hf_mfu_rdbl();
 	}
-
 	if ( blockNo == -1 ) return usage_hf_mfu_rdbl();
 	
 	// Swap endianness 
@@ -1069,7 +1550,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
 	}
 	
 	SendCommand(&c);
-  	UsbCommand resp;
+
 	if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
 		uint8_t isOK = resp.arg[0] & 0xff;
 		if (isOK) {
@@ -1082,6 +1563,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
 	} else {
 		PrintAndLog("Command execute time-out");
 	}
+
 	return 0;
 }
 
@@ -1161,7 +1643,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 
 	FILE *fout;
 	char filename[FILE_PATH_SIZE] = {0x00};
-	char * fnameptr = filename;
+	char *fnameptr = filename;
 	uint8_t *lockbytes_t = NULL;
 	uint8_t lockbytes[2] = {0x00};
 	uint8_t *lockbytes_t2 = NULL;
@@ -1173,10 +1655,10 @@ int CmdHF14AMfUDump(const char *Cmd){
 	int i = 0;
 	int Pages = 16;
 	bool tmplockbit = false;
-	uint8_t dataLen=0;
-	uint8_t cmdp =0;
+	uint8_t dataLen = 0;
+	uint8_t cmdp = 0;
 	uint8_t authenticationkey[16] = {0x00};
-	uint8_t *authKeyPtr = authenticationkey;
+	uint8_t	*authKeyPtr = authenticationkey;
 	size_t fileNlen = 0;
 	bool errors = false;
 	bool swapEndian = false;
@@ -1238,13 +1720,13 @@ int CmdHF14AMfUDump(const char *Cmd){
 
 	//Validations
 	if(errors) return usage_hf_mfu_dump();
-	
+
 	if (swapEndian && hasAuthKey) 
 		authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
 	TagTypeUL_t tagtype = GetHF14AMfU_Type();
 	if (tagtype == UL_ERROR) return -1;
-	
+
 	if (!manualPages)
 		for (uint8_t idx = 0; idx < MAX_UL_TYPES; idx++)
 			if (tagtype & UL_TYPES_ARRAY[idx])
@@ -1253,7 +1735,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 	ul_print_type(tagtype, 0);
 	PrintAndLog("Reading tag memory...");
 	UsbCommand c = {CMD_MIFAREU_READCARD, {startPage,Pages}};
-	if ( hasAuthKey ) { 
+	if ( hasAuthKey ) {
 		if (tagtype & UL_C)
 			c.arg[2] = 1; //UL_C auth
 		else
@@ -1263,7 +1745,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 	}
 	SendCommand(&c);
 	UsbCommand resp;
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
+	if (!WaitForResponseTimeout(CMD_ACK, &resp,1500)) {
 		PrintAndLog("Command execute time-out");
 		return 1;
 	}
@@ -1283,14 +1765,14 @@ int CmdHF14AMfUDump(const char *Cmd){
 	Pages = bufferSize/4;
 	// Load lock bytes.
 	int j = 0;
-	
+
 	lockbytes_t = data + 8;
 	lockbytes[0] = lockbytes_t[2];
 	lockbytes[1] = lockbytes_t[3];
 	for(j = 0; j < 16; j++){
 		bit[j] = lockbytes[j/8] & ( 1 <<(7-j%8));
-	}		
-	
+	}
+
 	// Load bottom lockbytes if available
 	// TODO -- FIGURE OUT LOCK BYTES FOR TO EV1 and/or NTAG
 	if ( Pages == 44 ) {
@@ -1304,15 +1786,20 @@ int CmdHF14AMfUDump(const char *Cmd){
 
 	// add keys to block dump
 	if (hasAuthKey) {
-		if (!swapEndian) {
+		if (!swapEndian){
 			authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
-			memcpy(data + Pages*4, authKeyPtr, dataLen);
 		} else {
-			memcpy(data + Pages*4, authenticationkey, dataLen);
+			authKeyPtr = authenticationkey;
+		}
+
+		if (tagtype & UL_C){ //add 4 pages
+			memcpy(data + Pages*4, authKeyPtr, dataLen);
+			Pages += dataLen/4;  
+		} else { // 2nd page from end
+			memcpy(data + (Pages*4) - 8, authenticationkey, dataLen);
 		}
-		Pages += dataLen/4;  //not sure output is in correct location for all tag types.
 	}
-	
+
 	for (i = 0; i < Pages; ++i) {
 		if ( i < 3 ) {
 			PrintAndLog("Block %02x:%s ", i,sprint_hex(data + i * 4, 4));
@@ -1343,7 +1830,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 			case 24:
 			case 25:
 			case 26:
-			case 27: tmplockbit = bit2[4]; break; 		    
+			case 27: tmplockbit = bit2[4]; break;
 			case 28:
 			case 29:
 			case 30:
@@ -1362,21 +1849,21 @@ int CmdHF14AMfUDump(const char *Cmd){
 			case 43: tmplockbit = bit2[9]; break;  //auth1
 			default: break;
 		}
-		PrintAndLog("Block %02x:%s [%d] {%.4s}", i, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);
-	}  
-	
+		PrintAndLog("Block %02X:%s [%d] {%.4s}", i, sprint_hex(data + i * 4, 4), tmplockbit, data+i*4);
+	}
+
 	// user supplied filename?
 	if (fileNlen < 1) {
 		// UID = data 0-1-2 4-5-6-7  (skips a beat)
 		sprintf(fnameptr,"%02X%02X%02X%02X%02X%02X%02X.bin",
-			data[0], data[1], data[2], data[4], data[5], data[6], data[7]);
+			data[0],data[1], data[2], data[4],data[5],data[6], data[7]);
 	} else {
 		sprintf(fnameptr + fileNlen,".bin");
 	}
 
 	if ((fout = fopen(filename,"wb")) == NULL) { 
 		PrintAndLog("Could not create file name %s", filename);
-		return 1;	
+		return 1;
 	}
 	fwrite( data, 1, Pages*4, fout );
 	fclose(fout);
@@ -1394,7 +1881,7 @@ int CmdHF14AMfUDump(const char *Cmd){
 //
 int CmdHF14AMfucAuth(const char *Cmd){
 
-	uint8_t keyNo = 0;
+	uint8_t keyNo = 3;
 	bool errors = false;
 
 	char cmdp = param_getchar(Cmd, 0);
@@ -1428,7 +1915,7 @@ int CmdHF14AMfucAuth(const char *Cmd){
 		PrintAndLog("Authentication successful. 3des key: %s",sprint_hex(key, 16));
 	else
 		PrintAndLog("Authentication failed");
-			
+		
 	return 0;
 }
 
@@ -1536,8 +2023,9 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 
 	uint8_t pwd[16] = {0x00};	
 	
+	uint8_t key[16];
 	char cmdp = param_getchar(Cmd, 0);
-	
+
 	if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') {	
 		PrintAndLog("Usage:  hf mfu setpwd <password (32 hex symbols)>");
 		PrintAndLog("       [password] - (32 hex symbols)");
@@ -1551,6 +2039,11 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 		PrintAndLog("Password must include 32 HEX symbols");
 		return 1;
 	}
+
+	if (blockNo > MAX_ULC_BLOCKS ){
+		PrintAndLog("Error: Maximum number of blocks is 47 for Ultralight-C");
+		return 1;
+	} 
 	
 	UsbCommand c = {CMD_MIFAREUC_SETPWD};	
 	memcpy( c.d.asBytes, pwd, 16);
@@ -1607,7 +2100,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 		PrintAndLog("Command execute timeout");
 		return 2;
 	}
-	
+
 	// save old block2.
 	uint8_t oldblock2[4] = {0x00};
 	memcpy(resp.d.asBytes, oldblock2, 4);
@@ -1624,7 +2117,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 		PrintAndLog("Command execute timeout");
 		return 3;
 	}
-	
+
 	// block 1.
 	c.arg[0] = 1;
 	c.d.asBytes[0] = uid[3];
diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index d4d3070a..4ec48ff9 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -32,9 +32,9 @@ typedef enum TAGTYPE_UL {
 	UL_EV1_48     = 0x000004,
 	UL_EV1_128    = 0x000008,
 	NTAG          = 0x000010,
-	NTAG_203	  = 0x000020,
-	NTAG_210	  = 0x000040,
-	NTAG_212	  = 0x000080,
+	NTAG_203      = 0x000020,
+	NTAG_210      = 0x000040,
+	NTAG_212      = 0x000080,
 	NTAG_213      = 0x000100,
 	NTAG_215      = 0x000200,
 	NTAG_216      = 0x000400,
@@ -42,8 +42,8 @@ typedef enum TAGTYPE_UL {
 	MY_D_NFC      = 0x001000,
 	MY_D_MOVE     = 0x002000,
 	MY_D_MOVE_NFC = 0x004000,
-	NTAG_I2C_1K	  = 0x008000,
-	NTAG_I2C_2K	  = 0x010000,
+	NTAG_I2C_1K   = 0x008000,
+	NTAG_I2C_2K   = 0x010000,
 	MAGIC         = 0x020000,
 	UL_MAGIC      = UL | MAGIC,
 	UL_C_MAGIC    = UL_C | MAGIC,
diff --git a/client/cmdscript.c b/client/cmdscript.c
index fd02d13a..730f4e96 100644
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -83,7 +83,7 @@ int CmdList(const char *Cmd)
     {
         while ((ep = readdir (dp)) != NULL)
         {
-            if( str_ends_with(ep->d_name, ".lua"))
+            if(str_ends_with(ep->d_name, ".lua"))
                 PrintAndLog("%-16s %s", ep->d_name, "A script file");
         }
         (void) closedir (dp);
diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua
index bd8e6d0c..17096063 100644
--- a/client/lualibs/html_dumplib.lua
+++ b/client/lualibs/html_dumplib.lua
@@ -192,7 +192,7 @@ end
 return {
 	convert_bin_to_html = convert_bin_to_html,
 	convert_eml_to_html = convert_eml_to_html,
-    convert_eml_to_bin = convert_eml_to_bin,
+	convert_eml_to_bin = convert_eml_to_bin,
     SaveAsBinary = save_BIN,
 	SaveAsText = save_TEXT,
     SaveAsBinary = save_BIN,
diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index 1d7441c7..13c4c063 100644
--- a/client/nonce2key/crapto1.c
+++ b/client/nonce2key/crapto1.c
@@ -251,7 +251,6 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 			}
 		}
 
-
 	// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
 	for(i = 1 << 20; i >= 0; --i) {
 		if(filter(i) == (oks & 1))
@@ -272,9 +271,7 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
 
 	in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);		// Byte swapping
 
-	recover(odd_head, odd_tail, oks,
-		even_head, even_tail, eks, 11, statelist, in << 1, bucket);
-
+	recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
 
 out:
 	free(odd_head);
@@ -536,8 +533,7 @@ brute_top(uint32_t prefix, uint32_t rresp, unsigned char parities[8][8],
  * It returns a zero terminated list of possible cipher states after the
  * tag nonce was fed in
  */
-struct Crypto1State*
-lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint8_t no_par)
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint8_t no_par)
 {
 	struct Crypto1State *statelist, *s;
 	uint32_t *odd, *even, *o, *e, top;
@@ -548,10 +544,10 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8],
 	statelist = malloc((sizeof *statelist) << 21);	//how large should be?
 	if(!statelist || !odd || !even)
 	{
-				free(statelist);
-				free(odd);
-				free(even);
-				return 0;
+		free(statelist);
+		free(odd);
+		free(even);
+		return 0;
 	}
 
 	s = statelist;
@@ -571,3 +567,66 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8],
 
 	return statelist;
 }
+
+/*
+struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], uint8_t no_par, uint32_t nt, uint32_t uid)
+{
+    long long int amount = 0;
+    struct Crypto1State *statelist, *s;
+    uint32_t *odd, *even, *o, *e, top;
+
+    odd = lfsr_prefix_ks(ks, 1);
+    even = lfsr_prefix_ks(ks, 0);
+
+    s = statelist = malloc((sizeof *statelist) << 20);
+    if(!s || !odd || !even) {
+		free(odd);
+		free(even);
+		free(statelist);
+		return 0;
+    }
+
+    char filename[50] = "archivo.txt";
+    sprintf(filename, "logs/%x.txt", nt);
+    PrintAndLog("Name: %s\n", filename);
+    FILE *file = fopen(filename,"w+");
+	if ( !file ) {
+		s->odd = s->even = 0;
+		free(odd);
+		free(even);
+		PrintAndLog("Failed to create file");
+		return 0;
+	}
+    PrintAndLog("Creating file... ");
+	uint32_t xored = uid^nt;
+	
+    int lastOdd = 0;
+    for(o = odd; *o + 1; ++o)
+        for(e = even; *e + 1; ++e)
+            for(top = 0; top < 64; ++top) {
+                *o += 1 << 21;
+                *e += (!(top & 7) + 1) << 21;
+
+                //added by MG
+                if(lastOdd != statelist->odd){
+					// Here I create a temporal crypto1 state, 
+					// where I load the odd and even state and work with it,
+					// in order not to interfere with regular mechanism, This is what I save to file
+					struct Crypto1State *state;
+                    lastOdd = state->odd = statelist->odd; state->even = statelist->even;
+                    lfsr_rollback_word(state,xored,0);
+                    fprintf(file,"%x %x \n",state->odd,state->even);
+                    amount++;
+                }
+                //s = check_pfx_parity(pfx, rr, par, *o, *e, s); //This is not useful at all when attacking chineese cards
+				s = brute_top(pfx, rr, par, *o, *e, s, no_par); 
+            }
+
+	PrintAndLog("File created, amount %u\n",amount);
+	fclose(file);
+	s->odd = s->even = 0;
+	free(odd);
+	free(even);
+    return statelist;
+}
+ */
diff --git a/client/scripting.c b/client/scripting.c
index 880b7cb2..9e643932 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -153,7 +153,7 @@ static int l_nonce2key(lua_State *L){
 
     //Push the retval on the stack
     lua_pushinteger(L,retval);
-  
+
     //Push the key onto the stack
     uint8_t dest_key[8];
     num_to_bytes(key,sizeof(dest_key),dest_key);
@@ -180,10 +180,10 @@ static int l_foobar(lua_State *L)
     printf("foobar called with %d arguments" , n);
     lua_settop(L, 0);
     printf("Arguments discarded, stack now contains %d elements", lua_gettop(L));
-  
+
     // todo: this is not used, where was it intended for?
     // UsbCommand response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}};
-  
+
     printf("Now returning a uint64_t as a string");
     uint64_t x = 0xDEADBEEF;
     uint8_t destination[8];
@@ -240,12 +240,13 @@ static int l_aes128decrypt(lua_State *L)
     if(size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
-    
+
 	unsigned char indata[16] = {0x00};
 	unsigned char outdata[16] = {0x00};
     unsigned char aes_key[16] = {0x00};
 	unsigned char iv[16] = {0x00};
 
+	// convert key to bytearray and convert input to bytearray
 	for (i = 0; i < 32; i += 2) {
 		sscanf(&p_encTxt[i], "%02x", (unsigned int *)&indata[i / 2]);
 		sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
@@ -282,9 +283,9 @@ static int l_aes128encrypt(lua_State *L)
 
     aes_context ctx;
     aes_init(&ctx);
-    aes_setkey_enc(&ctx, aes_key, 128);
+	aes_setkey_enc(&ctx, aes_key, 128);
 	aes_crypt_cbc(&ctx, AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
-    //Push encrypted array as a string
+	//Push encrypted array as a string
 	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
 	return 1;// return 1 to signal one return value
 }
@@ -293,7 +294,7 @@ static int l_crc16(lua_State *L)
 {
 	size_t size;
 	const char *p_str = luaL_checklstring(L, 1, &size);
-		
+
 	uint16_t retval = crc16_ccitt( (uint8_t*) p_str, size);
     lua_pushinteger(L, (int) retval);
     return 1;
@@ -306,7 +307,7 @@ static int l_crc64(lua_State *L)
 	unsigned char outdata[8] = {0x00};
 
 	const char *p_str = luaL_checklstring(L, 1, &size);
-	
+
 	crc64( (uint8_t*) p_str, size, &crc);
 
 	outdata[0] = (uint8_t)(crc >> 56) & 0xff;
@@ -318,7 +319,7 @@ static int l_crc64(lua_State *L)
 	outdata[6] = (uint8_t)(crc >> 8) & 0xff;
 	outdata[7] = crc & 0xff;
 	lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
-    return 1;
+	return 1;
 }
 
 /**
@@ -341,7 +342,7 @@ int setLuaPath( lua_State* L, const char* path )
     lua_pushstring( L, buf ); // push the new one
     lua_setfield( L, -2, "path" ); // set the field "path" in table at -2 with value at top of stack
     lua_pop( L, 1 ); // get rid of package table from top of stack
-    free(buf);
+	free(buf);
 	return 0; // all done!
 }
 
@@ -357,12 +358,12 @@ int set_pm3_libraries(lua_State *L)
         {"foobar",                      l_foobar},
         {"ukbhit",                      l_ukbhit},
         {"clearCommandBuffer",          l_clearCommandBuffer},
-        {"console",                     l_CmdConsole},
-        {"iso15693_crc",                l_iso15693_crc},
+		{"console",                     l_CmdConsole},
+		{"iso15693_crc",                l_iso15693_crc},
 		{"aes128_decrypt",              l_aes128decrypt},
 		{"aes128_encrypt",              l_aes128encrypt},
 		{"crc16",                       l_crc16},
-		{"crc64",						l_crc64},
+		{"crc64",                       l_crc64},
         {NULL, NULL}
     };
 
diff --git a/client/util.c b/client/util.c
index 391b9b00..a64f46b9 100644
--- a/client/util.c
+++ b/client/util.c
@@ -113,7 +113,7 @@ char *sprint_hex(const uint8_t *data, const size_t len) {
 	int maxLen = ( len > 1024/3) ? 1024/3 : len;
 	static char buf[1024];
 	memset(buf, 0x00, 1024);
-	char *tmp = buf;
+	char * tmp = buf;
 	size_t i;
 
 	for (i=0; i < maxLen; ++i, tmp += 3)
diff --git a/common/protocols.h b/common/protocols.h
index 62cfb7ff..466e84f1 100644
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -123,8 +123,8 @@ NXP/Philips CUSTOM COMMANDS
 #define MIFARE_CMD_RESTORE      0xC2
 #define MIFARE_CMD_TRANSFER     0xB0
 
-#define MIFARE_ULC_WRITE		0xA2
-//#define MIFARE_ULC_COMP_WRITE 0xA0
+#define MIFARE_ULC_WRITE        0xA2
+//#define MIFARE_ULC__COMP_WRITE  0xA0
 #define MIFARE_ULC_AUTH_1       0x1A
 #define MIFARE_ULC_AUTH_2       0xAF
 
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 2a6e9484..345793ec 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -133,7 +133,7 @@ typedef struct{
 #define CMD_SNOOP_ICLASS                                                  0x0392
 #define CMD_SIMULATE_TAG_ICLASS                                           0x0393
 #define CMD_READER_ICLASS                                                 0x0394
-#define CMD_READER_ICLASS_REPLAY										  0x0395
+#define CMD_READER_ICLASS_REPLAY                                          0x0395
 #define CMD_ICLASS_ISO14443A_WRITE										  0x0397
 #define CMD_ICLASS_EML_MEMSET                                             0x0398
 
@@ -164,9 +164,9 @@ typedef struct{
 #define CMD_MIFARE_NESTED                                                 0x0612
 
 #define CMD_MIFARE_READBL                                                 0x0620
-#define CMD_MIFAREU_READBL						                          0x0720
+#define CMD_MIFAREU_READBL                                                0x0720
 #define CMD_MIFARE_READSC                                                 0x0621
-#define CMD_MIFAREU_READCARD						                      0x0721
+#define CMD_MIFAREU_READCARD                                              0x0721
 #define CMD_MIFARE_WRITEBL                                                0x0622
 #define CMD_MIFAREU_WRITEBL						                          0x0722
 #define CMD_MIFAREU_WRITEBL_COMPAT					                      0x0723
@@ -175,9 +175,9 @@ typedef struct{
 
 #define CMD_MIFARE_SNIFFER                                                0x0630
 //ultralightC
-#define CMD_MIFAREUC_AUTH						                          0x0724
+#define CMD_MIFAREUC_AUTH                                                 0x0724
 //0x0725 and 0x0726 no longer used 
-#define CMD_MIFAREUC_SETPWD							                      0x0727
+#define CMD_MIFAREUC_SETPWD                                               0x0727
 
 
 // mifare desfire