X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2abdfa491ccf46320cd813764ca8ca49073388ed..be67483e63430608982f1c92e02b59d7b4dc65b3:/armsrc/mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index bae4761d..1dd62951 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -8,18 +8,7 @@
 //-----------------------------------------------------------------------------
 // Work with mifare cards.
 //-----------------------------------------------------------------------------
-
-#include "proxmark3.h"
-#include "apps.h"
-#include "util.h"
-#include "string.h"
-
-#include "iso14443crc.h"
-#include "iso14443a.h"
-#include "crapto1.h"
 #include "mifareutil.h"
-#include "parity.h"
-#include "des.h"
 
 int MF_DBGLEVEL = MF_DBG_ALL;
 
@@ -132,7 +121,10 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 
 	// "random" reader nonce:
 	//byte_t nr[4] = {0x55, 0x41, 0x49, 0x92};
-	byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};
+	fast_prand();
+	byte_t nr[4];
+	num_to_bytes(prand(), 4, nr);
+	//byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};
 	
 	uint32_t nt, ntpp; // Supplied tag nonce
 	
@@ -165,7 +157,7 @@ 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 | nr: %08x | nt: %08x", uid, nr, nt);
 	
 	// save Nt
 	if (ntptr)
@@ -179,7 +171,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 	}	
 		
 	// Skip 32 bits in pseudo random generator
-	nt = prng_successor(nt,32);
+	nt = prng_successor(nt, 32);
 
 	//  ar+parity
 	for (pos = 4; pos < 8; pos++) {
@@ -287,7 +279,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 	memcpy(enc_random_b,resp+1,8);
 
 	// decrypt nonce.
-	tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );
+	tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );
 	rol(random_b,8);
 	memcpy(rnd_ab  ,random_a,8);
 	memcpy(rnd_ab+8,random_b,8);
@@ -470,11 +462,10 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
     return 0;
 }
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {
-	uint16_t len = 0;	
 	uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};
-	len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);
+	uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);
 	if (len != 0) {
-		if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("halt error. response len: %x", len);  
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
 		return 1;
 	}
 	return 0;
@@ -576,23 +567,19 @@ int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum) {
 uint64_t emlGetKey(int sectorNum, int keyType) {
 	uint8_t key[6] = {0x00};
 	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);
+	for(uint16_t b = 3; b < 256; ((b < 127) ? (b += 4) : (b += 16)))
+		emlSetMem((uint8_t *)trailer, b, 1);
 
 	// uid
 	emlSetMem((uint8_t *)uid, 0, 1);