Add hf list 15 (#754)

[proxmark3-svn] / client / cmdhfmfu.c

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 1077ec992fe9826e650ff4557fde8362c208f118..c3442ee3b26de848c3dc17d6a353f4a2cf494714 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -16,7 +16,7 @@
 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include "ui.h"
 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include "ui.h"

-#include "polarssl/des.h"
+#include "mbedtls/des.h"

 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
 #include "mifare.h"
 #include "cmdhfmf.h"
 #include "cmdhf14a.h"
 #include "mifare.h"


@@ -1742,11 +1742,11 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
        mix[6] = block ^ uid[2];
        mix[7] = uid[3];
 
        mix[6] = block ^ uid[2];
        mix[7] = uid[3];
 

-       des3_context ctx = { 0x00 };
-       des3_set2key_enc(&ctx, masterkey);
+       mbedtls_des3_context ctx = { {0} };
+       mbedtls_des3_set2key_enc(&ctx, masterkey);

 
 

-       des3_crypt_cbc(&ctx  // des3_context
-               , DES_ENCRYPT    // int mode
+       mbedtls_des3_crypt_cbc(&ctx  // des3_context
+               , MBEDTLS_DES_ENCRYPT    // int mode

                , sizeof(mix)    // length
                , iv             // iv[8]
                , mix            // input
                , sizeof(mix)    // length
                , iv             // iv[8]
                , mix            // input


@@ -1781,10 +1781,10 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
        memcpy(dmkey+16, dkeyA, 8);
        memset(iv, 0x00, 8);
 
        memcpy(dmkey+16, dkeyA, 8);
        memset(iv, 0x00, 8);
 

-       des3_set3key_enc(&ctx, dmkey);
+       mbedtls_des3_set3key_enc(&ctx, dmkey);

 
 

-       des3_crypt_cbc(&ctx  // des3_context
-               , DES_ENCRYPT    // int mode
+       mbedtls_des3_crypt_cbc(&ctx  // des3_context
+               , MBEDTLS_DES_ENCRYPT    // int mode

                , sizeof(newpwd) // length
                , iv             // iv[8]
                , zeros         // input
                , sizeof(newpwd) // length
                , iv             // iv[8]
                , zeros         // input