fix WaitForResponse (without timeout)

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index 0c761cb2e91c21ff4a78ff0000b9bce051dd8e67..1ad5d214dace12714c2108ebfb7aebd7ce0a87d8 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -14,17 +14,19 @@
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>

+#include <string.h>

 #include "proxmark3.h"
 #include "proxmark3.h"

+#include "comms.h"

 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include "util.h"
 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include "util.h"

-#include "mifarehost.h"
+#include "mifare/mifarehost.h"

 #include "../common/iso15693tools.h"
 #include "iso14443crc.h"
 #include "../common/crc16.h"
 #include "../common/crc64.h"
 #include "../common/iso15693tools.h"
 #include "iso14443crc.h"
 #include "../common/crc16.h"
 #include "../common/crc64.h"

-#include "../common/polarssl/sha1.h"
-#include "../common/polarssl/aes.h"
+#include <mbedtls/sha1.h>
+#include <mbedtls/aes.h>

 
 /**
  * The following params expected:
 
 /**
  * The following params expected:


@@ -220,7 +222,7 @@ static int l_iso14443b_crc(lua_State *L)
        unsigned char buf[USB_CMD_DATA_SIZE];
        size_t len = 0;
        const char *data = luaL_checklstring(L, 1, &len);
        unsigned char buf[USB_CMD_DATA_SIZE];
        size_t len = 0;
        const char *data = luaL_checklstring(L, 1, &len);

-       if (USB_CMD_DATA_SIZE < len)
+       if (len > USB_CMD_DATA_SIZE-2)

                len =  USB_CMD_DATA_SIZE-2;
 
        for (int i = 0; i < len; i += 2) {
                len =  USB_CMD_DATA_SIZE-2;
 
        for (int i = 0; i < len; i += 2) {


@@ -256,10 +258,10 @@ static int l_aes128decrypt_cbc(lua_State *L)
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }
 
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }
 

-       aes_context ctx;
-       aes_init(&ctx);
-       aes_setkey_dec(&ctx, aes_key, 128);
-       aes_crypt_cbc(&ctx,AES_DECRYPT,sizeof(indata), iv, indata,outdata );
+       mbedtls_aes_context ctx;
+       mbedtls_aes_init(&ctx);
+       mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
+       mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_DECRYPT, sizeof(indata), iv, indata,outdata );

        //Push decrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;// return 1 to signal one return value
        //Push decrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;// return 1 to signal one return value


@@ -283,10 +285,10 @@ static int l_aes128decrypt_ecb(lua_State *L)
                sscanf(&p_encTxt[i], "%02x", (unsigned int *)&indata[i / 2]);
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }
                sscanf(&p_encTxt[i], "%02x", (unsigned int *)&indata[i / 2]);
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }

-       aes_context ctx;
-       aes_init(&ctx);
-       aes_setkey_dec(&ctx, aes_key, 128);
-       aes_crypt_ecb(&ctx, AES_DECRYPT, indata, outdata );
+       mbedtls_aes_context ctx;
+       mbedtls_aes_init(&ctx);
+       mbedtls_aes_setkey_dec(&ctx, aes_key, 128);
+       mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_DECRYPT, indata, outdata );

 
        //Push decrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
 
        //Push decrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));


@@ -313,10 +315,10 @@ static int l_aes128encrypt_cbc(lua_State *L)
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }
 
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }
 

-       aes_context ctx;
-       aes_init(&ctx);
-       aes_setkey_enc(&ctx, aes_key, 128);
-       aes_crypt_cbc(&ctx, AES_ENCRYPT, sizeof(indata), iv, indata, outdata );
+       mbedtls_aes_context ctx;
+       mbedtls_aes_init(&ctx);
+       mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
+       mbedtls_aes_crypt_cbc(&ctx, MBEDTLS_AES_ENCRYPT, sizeof(indata), iv, indata, outdata );

        //Push encrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;// return 1 to signal one return value
        //Push encrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;// return 1 to signal one return value


@@ -340,10 +342,10 @@ static int l_aes128encrypt_ecb(lua_State *L)
                sscanf(&p_txt[i], "%02x", (unsigned int *)&indata[i / 2]);
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }
                sscanf(&p_txt[i], "%02x", (unsigned int *)&indata[i / 2]);
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }

-       aes_context ctx;
-       aes_init(&ctx);
-       aes_setkey_enc(&ctx, aes_key, 128);
-       aes_crypt_ecb(&ctx, AES_ENCRYPT, indata, outdata );
+       mbedtls_aes_context ctx;
+       mbedtls_aes_init(&ctx);
+       mbedtls_aes_setkey_enc(&ctx, aes_key, 128);
+       mbedtls_aes_crypt_ecb(&ctx, MBEDTLS_AES_ENCRYPT, indata, outdata );

        //Push encrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;// return 1 to signal one return value
        //Push encrypted array as a string
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;// return 1 to signal one return value


@@ -386,7 +388,7 @@ static int l_sha1(lua_State *L)
        size_t size;
        const char *p_str = luaL_checklstring(L, 1, &size);
        unsigned char outdata[20] = {0x00};
        size_t size;
        const char *p_str = luaL_checklstring(L, 1, &size);
        unsigned char outdata[20] = {0x00};

-       sha1( (uint8_t*) p_str, size, outdata);
+       mbedtls_sha1( (uint8_t*) p_str, size, outdata);

        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;
 }
        lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
        return 1;
 }