CHG: 'lf em4x' - the em4x50 demod didn't calc ASKDemod_ext with a refenence bool.

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 5dfeeab0a76eae5cb0fd374d40ce9dfe8f5c1e6b..4100ef5483a4387659abba90169328174d10b743 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -8,7 +8,6 @@
 //-----------------------------------------------------------------------------\r
 // Work with mifare cards.\r
 //-----------------------------------------------------------------------------\r
 //-----------------------------------------------------------------------------\r
 // Work with mifare cards.\r
 //-----------------------------------------------------------------------------\r

-\r

 #include "mifareutil.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 #include "mifareutil.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r


@@ -122,7 +121,10 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
 \r
        // "random" reader nonce:\r
        //byte_t nr[4] = {0x55, 0x41, 0x49, 0x92};\r
 \r
        // "random" reader nonce:\r
        //byte_t nr[4] = {0x55, 0x41, 0x49, 0x92};\r

-       byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};\r
+       fast_prand();\r
+       byte_t nr[4];\r
+       num_to_bytes(prand(), 4, nr);\r
+       //byte_t nr[4] = {0x01, 0x01, 0x01, 0x01};\r

        \r
        uint32_t nt, ntpp; // Supplied tag nonce\r
        \r
        \r
        uint32_t nt, ntpp; // Supplied tag nonce\r
        \r


@@ -277,7 +279,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
        memcpy(enc_random_b,resp+1,8);\r
 \r
        // decrypt nonce.\r
        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
        rol(random_b,8);\r
        memcpy(rnd_ab  ,random_a,8);\r
        memcpy(rnd_ab+8,random_b,8);\r