Client code cleanup:

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index 88afef34049c8c71b8556fc43313ea5683e711f5..10d554a07082a9dab2e237d7324f689b0797b309 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -18,6 +18,7 @@
 #include "util.h"
 #include "nonce2key/nonce2key.h"
 #include "../common/iso15693tools.h"
 #include "util.h"
 #include "nonce2key/nonce2key.h"
 #include "../common/iso15693tools.h"

+#include "iso14443crc.h"

 #include "../common/crc16.h"
 #include "../common/crc64.h"
 #include "../common/sha1.h"
 #include "../common/crc16.h"
 #include "../common/crc64.h"
 #include "../common/sha1.h"


@@ -160,7 +161,7 @@ static int l_nonce2key(lua_State *L){
        uint8_t dest_key[8];
        num_to_bytes(key,sizeof(dest_key),dest_key);
 
        uint8_t dest_key[8];
        num_to_bytes(key,sizeof(dest_key),dest_key);
 

-       //printf("Pushing to lua stack: %012"llx"\n",key);
+       //printf("Pushing to lua stack: %012" PRIx64 "\n",key);

        lua_pushlstring(L,(const char *) dest_key,sizeof(dest_key));
 
        return 2; //Two return values
        lua_pushlstring(L,(const char *) dest_key,sizeof(dest_key));
 
        return 2; //Two return values


@@ -229,6 +230,27 @@ static int l_iso15693_crc(lua_State *L)
        return 1;
 }
 
        return 1;
 }
 

+static int l_iso14443b_crc(lua_State *L)
+{
+       /* void ComputeCrc14443(int CrcType,
+                     const unsigned char *Data, int Length,
+                     unsigned char *TransmitFirst,
+                     unsigned char *TransmitSecond)
+       */
+       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)
+               len =  USB_CMD_DATA_SIZE-2;
+
+       for (int i = 0; i < len; i += 2) {
+               sscanf(&data[i], "%02x", (unsigned int *)&buf[i / 2]);
+       }
+       ComputeCrc14443(CRC_14443_B, buf, len, &buf[len], &buf[len+1]);
+
+       lua_pushlstring(L, (const char *)&buf, len+2);
+       return 1;
+}

 /*
  Simple AES 128 cbc hook up to OpenSSL.
  params:  key, input
 /*
  Simple AES 128 cbc hook up to OpenSSL.
  params:  key, input


@@ -483,6 +505,7 @@ int set_pm3_libraries(lua_State *L)
                {"clearCommandBuffer",          l_clearCommandBuffer},
                {"console",                     l_CmdConsole},
                {"iso15693_crc",                l_iso15693_crc},
                {"clearCommandBuffer",          l_clearCommandBuffer},
                {"console",                     l_CmdConsole},
                {"iso15693_crc",                l_iso15693_crc},

+               {"iso14443b_crc",               l_iso14443b_crc},

                {"aes128_decrypt",              l_aes128decrypt_cbc},
                {"aes128_decrypt_ecb",          l_aes128decrypt_ecb},
                {"aes128_encrypt",              l_aes128encrypt_cbc},
                {"aes128_decrypt",              l_aes128decrypt_cbc},
                {"aes128_decrypt_ecb",          l_aes128decrypt_ecb},
                {"aes128_encrypt",              l_aes128encrypt_cbc},


@@ -513,7 +536,11 @@ int set_pm3_libraries(lua_State *L)
 
        //-- Last but not least, add to the LUA_PATH (package.path in lua)
        // so we can load libraries from the ./lualib/ - directory
 
        //-- Last but not least, add to the LUA_PATH (package.path in lua)
        // so we can load libraries from the ./lualib/ - directory

-       setLuaPath(L,"./lualibs/?.lua");
+       char libraries_path[strlen(get_my_executable_directory()) + strlen(LUA_LIBRARIES_DIRECTORY) + strlen(LUA_LIBRARIES_WILDCARD) + 1];
+       strcpy(libraries_path, get_my_executable_directory());
+       strcat(libraries_path, LUA_LIBRARIES_DIRECTORY);
+       strcat(libraries_path, LUA_LIBRARIES_WILDCARD);
+       setLuaPath(L, libraries_path);

 
        return 1;
 }
 
        return 1;
 }