Fix for USB uart slowness since PR #720 (#787)

[proxmark3-svn] / armsrc / mifareutil.c

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 684b5e362bdf16db312da24b662d1e8e491b5a11..ab04aee45917a1ec9497e339284e06176f124266 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -21,7 +21,7 @@
 #include "iso14443crc.h"\r
 #include "iso14443a.h"\r
 #include "crapto1/crapto1.h"\r
-#include "polarssl/des.h"\r
+#include "mbedtls/des.h"\r
 \r
 int MF_DBGLEVEL = MF_DBG_ALL;\r
 \r
@@ -296,7 +296,7 @@ int mifare_ultra_auth(uint8_t *keybytes){
 \r
        /// 3des2k\r
 \r
-       des3_context ctx = { 0x00 };\r
+       mbedtls_des3_context ctx = { {0} };\r
        uint8_t random_a[8] = {1,1,1,1,1,1,1,1};\r
        uint8_t random_b[8] = {0x00};\r
        uint8_t enc_random_b[8] = {0x00};\r
@@ -321,9 +321,9 @@ int mifare_ultra_auth(uint8_t *keybytes){
 \r
        // decrypt nonce.\r
        // tdes_2key_dec(random_b, enc_random_b, sizeof(random_b), key, IV );\r
-       des3_set2key_dec(&ctx, key);\r
-       des3_crypt_cbc(&ctx     // des3_context\r
-               , DES_DECRYPT           // int mode\r
+       mbedtls_des3_set2key_dec(&ctx, key);\r
+       mbedtls_des3_crypt_cbc(&ctx     // des3_context\r
+               , MBEDTLS_DES_DECRYPT           // int mode\r
                , sizeof(random_b)      // length\r
                , IV                    // iv[8]\r
                , enc_random_b          // input\r
@@ -350,9 +350,9 @@ int mifare_ultra_auth(uint8_t *keybytes){
 \r
        // encrypt    out, in, length, key, iv\r
        //tdes_2key_enc(rnd_ab, rnd_ab, sizeof(rnd_ab), key, enc_random_b);\r
-       des3_set2key_enc(&ctx, key);\r
-       des3_crypt_cbc(&ctx     // des3_context\r
-               , DES_ENCRYPT           // int mode\r
+       mbedtls_des3_set2key_enc(&ctx, key);\r
+       mbedtls_des3_crypt_cbc(&ctx     // des3_context\r
+               , MBEDTLS_DES_ENCRYPT           // int mode\r
                , sizeof(rnd_ab)        // length\r
                , enc_random_b          // iv[8]\r
                , rnd_ab                        // input\r
@@ -372,9 +372,9 @@ int mifare_ultra_auth(uint8_t *keybytes){
 \r
        // decrypt    out, in, length, key, iv \r
        // tdes_2key_dec(resp_random_a, enc_resp, 8, key, enc_random_b);\r
-       des3_set2key_dec(&ctx, key);\r
-       des3_crypt_cbc(&ctx     // des3_context\r
-               , DES_DECRYPT           // int mode\r
+       mbedtls_des3_set2key_dec(&ctx, key);\r
+       mbedtls_des3_crypt_cbc(&ctx     // des3_context\r
+               , MBEDTLS_DES_DECRYPT           // int mode\r
                , 8                                     // length\r
                , enc_random_b          // iv[8]\r
                , enc_resp                      // input\r