Update README.md

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index d145e13cae4c85484ed4c76c7a6a2ae64c621850..4795a7ec4cfa3ce7a9009947c138a425db3e6c57 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -8,18 +8,7 @@
 //-----------------------------------------------------------------------------\r
 // Work with mifare cards.\r
 //-----------------------------------------------------------------------------\r
-\r
-#include "proxmark3.h"\r
-#include "apps.h"\r
-#include "util.h"\r
-#include "string.h"\r
-\r
-#include "iso14443crc.h"\r
-#include "iso14443a.h"\r
-#include "crapto1.h"\r
 #include "mifareutil.h"\r
-#include "parity.h"\r
-#include "des.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 \r
@@ -287,7 +276,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        memcpy(enc_random_b,resp+1,8);\r
 \r
        // decrypt nonce.\r
-       tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
+       tdes_2key_dec((void*)random_b, (void*)enc_random_b, sizeof(random_b), (const void*)key, IV );\r
        rol(random_b,8);\r
        memcpy(rnd_ab  ,random_a,8);\r
        memcpy(rnd_ab+8,random_b,8);\r
@@ -470,9 +459,12 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
     return 0;\r
 }\r
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {\r
-       uint16_t len = 0;       \r
        uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};\r
-       mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);\r
+       uint16_t len = mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);\r
+       if (len != 0) {\r
+               if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("halt warning. response len: %x", len);\r
+               return 1;\r
+       }\r
        return 0;\r
 }\r
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {\r