X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/d209443322a410eadd9746ac74c6a8b4899788a9..5b749dcb0e33306ac3845d43ded3b391da0c9bc5:/armsrc/mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 9c6adcce..5dfeeab0 100644
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -9,17 +9,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;
 
@@ -470,14 +460,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 data:%02X %02X %02X %02X", len, receivedAnswer[0],receivedAnswer[1],receivedAnswer[2],receivedAnswer[3]);  
-		if (len == 1 && receivedAnswer[0] == 0x04)
-			return 4;
+		if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);
 		return 1;
 	}
 	return 0;