FIX: "hf mf hardnested" merging of @matrix commit https://github.com/matrix/proxmark3...

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index bae4761d3f29ff5fc73b46545023d58379d6f894..ca2cbeb7d924a3a9d7a5d75d08392b81eaad5f34 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -179,7 +179,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        }       \r
                \r
        // Skip 32 bits in pseudo random generator\r
        }       \r
                \r
        // Skip 32 bits in pseudo random generator\r

-       nt = prng_successor(nt,32);\r
+       nt = prng_successor(nt, 32);\r

 \r
        //  ar+parity\r
        for (pos = 4; pos < 8; pos++) {\r
 \r
        //  ar+parity\r
        for (pos = 4; pos < 8; pos++) {\r


@@ -470,13 +470,8 @@ int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData) {
     return 0;\r
 }\r
 int mifare_classic_halt_ex(struct Crypto1State *pcs) {\r
     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
        uint8_t receivedAnswer[4] = {0x00, 0x00, 0x00, 0x00};\r

-       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_ERROR) Dbprintf("halt error. response len: %x", len);  \r
-               return 1;\r
-       }\r
+       mifare_sendcmd_short(pcs, (pcs == NULL) ? CRYPT_NONE : CRYPT_ALL, 0x50, 0x00, receivedAnswer, NULL, NULL);\r

        return 0;\r
 }\r
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {\r
        return 0;\r
 }\r
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) {\r