X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4abe4f5867e52615c0e053a2bab4b3b129b12d45..9ca155ba443e8f2a9feb7640f4b461842cce9e35:/armsrc/mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 59dafedc..fc95de72 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -19,11 +19,18 @@
 #include "crapto1.h"
 #include "mifareutil.h"
 
+int MF_DBGLEVEL = MF_DBG_ALL;
+
 uint8_t* mifare_get_bigbufptr(void) {
 	return (((uint8_t *)BigBuf) + 3560);	// was 3560 - tied to other size changes
 }
 
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer)
+{
+	return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, NULL);
+}
+
+int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr)
 {
 	uint8_t dcmd[4], ecmd[4];
 	uint32_t pos, par, res;
@@ -48,7 +55,9 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 		ReaderTransmit(dcmd, sizeof(dcmd));
 	}
 
-	int len = ReaderReceive(answer);
+	int len = ReaderReceivePar(answer, &par);
+	
+	if (parptr) *parptr = par;
 
 	if (crypted == CRYPT_ALL) {
 		if (len == 1) {
@@ -70,6 +79,11 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
 }
 
 int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested) 
+{
+	return mifare_classic_authex(pcs, uid, blockNo, keyType, ui64Key, isNested, NULL);
+}
+
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr) 
 {
 	// variables
 	int len;	
@@ -84,7 +98,7 @@ int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo,
 
 	// Transmit MIFARE_CLASSIC_AUTH
 	len = mifare_sendcmd_short(pcs, isNested, 0x60 + (keyType & 0x01), blockNo, receivedAnswer);
-//	Dbprintf("rand nonce len: %x", len);  
+  if (MF_DBGLEVEL >= 4)	Dbprintf("rand nonce len: %x", len);  
 	if (len != 4) return 1;
 	
 	ar[0] = 0x55;
@@ -111,7 +125,12 @@ int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo,
 	}
 
 	// some statistic
-	Dbprintf("auth uid: %08x nt: %08x", uid, nt);  
+	if (!ntptr && (MF_DBGLEVEL >= 3))
+		Dbprintf("auth uid: %08x nt: %08x", uid, nt);  
+	
+	// save Nt
+	if (ntptr)
+		*ntptr = nt;
 
 	par = 0;
 	// Generate (encrypted) nr+parity by loading it into the cipher (Nr)
@@ -139,7 +158,7 @@ int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo,
 	len = ReaderReceive(receivedAnswer);
 	if (!len)
 	{
-		Dbprintf("Authentication failed. Card timeout.");
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Authentication failed. Card timeout.");
 		return 2;
 	}
 	
@@ -147,7 +166,7 @@ int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo,
 	ntpp = prng_successor(nt, 32) ^ crypto1_word(pcs, 0,0);
 	
 	if (ntpp != bytes_to_num(tmp4, 4)) {
-		Dbprintf("Authentication failed. Error card response.");
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Authentication failed. Error card response.");
 		return 3;
 	}
 
@@ -165,18 +184,18 @@ int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blo
 	// command MIFARE_CLASSIC_READBLOCK
 	len = mifare_sendcmd_short(pcs, 1, 0x30, blockNo, receivedAnswer);
 	if (len == 1) {
-		Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
 		return 1;
 	}
 	if (len != 18) {
-		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]) {
-		Dbprintf("Cmd CRC response error.");  
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd CRC response error.");  
 		return 3;
 	}
 	
@@ -199,7 +218,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 	len = mifare_sendcmd_short(pcs, 1, 0xA0, blockNo, receivedAnswer);
 
 	if ((len != 1) || (receivedAnswer[0] != 0x0A)) {   //  0x0a - ACK
-		Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd Error: %02x", receivedAnswer[0]);  
 		return 1;
 	}
 	
@@ -224,7 +243,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
 		res |= (crypto1_bit(pcs, 0, 0) ^ BIT(receivedAnswer[0], i)) << i;
 
 	if ((len != 1) || (res != 0x0A)) {
-		Dbprintf("Cmd send data2 Error: %02x", res);  
+		if (MF_DBGLEVEL >= 1)	Dbprintf("Cmd send data2 Error: %02x", res);  
 		return 2;
 	}
 	
@@ -241,9 +260,10 @@ int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid)
 
 	len = mifare_sendcmd_short(pcs, 1, 0x50, 0x00, receivedAnswer);
 	if (len != 0) {
-		Dbprintf("halt error. response len: %x", len);  
+		if (MF_DBGLEVEL >= 1)	Dbprintf("halt error. response len: %x", len);  
 		return 1;
 	}
 
 	return 0;
 }
+