ADD: @marshmellow42 's changes / fixes.

[proxmark3-svn] / client / scripting.c

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

-#include <openssl/aes.h>   

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

+#include "../common/crc64.h"
+#include "../common/sha1.h"
+#include "aes.h"

 /**
  * The following params expected:
  *  UsbCommand c
 /**
  * The following params expected:
  *  UsbCommand c


@@ -152,7 +154,7 @@ static int l_nonce2key(lua_State *L){
 
     //Push the retval on the stack
     lua_pushinteger(L,retval);
 
     //Push the retval on the stack
     lua_pushinteger(L,retval);

-  
+

     //Push the key onto the stack
     uint8_t dest_key[8];
     num_to_bytes(key,sizeof(dest_key),dest_key);
     //Push the key onto the stack
     uint8_t dest_key[8];
     num_to_bytes(key,sizeof(dest_key),dest_key);


@@ -179,10 +181,10 @@ static int l_foobar(lua_State *L)
     printf("foobar called with %d arguments" , n);
     lua_settop(L, 0);
     printf("Arguments discarded, stack now contains %d elements", lua_gettop(L));
     printf("foobar called with %d arguments" , n);
     lua_settop(L, 0);
     printf("Arguments discarded, stack now contains %d elements", lua_gettop(L));

-  
+

     // todo: this is not used, where was it intended for?
     // UsbCommand response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}};
     // todo: this is not used, where was it intended for?
     // UsbCommand response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}};

-  
+

     printf("Now returning a uint64_t as a string");
     uint64_t x = 0xDEADBEEF;
     uint8_t destination[8];
     printf("Now returning a uint64_t as a string");
     uint64_t x = 0xDEADBEEF;
     uint8_t destination[8];


@@ -230,7 +232,7 @@ static int l_iso15693_crc(lua_State *L)
  Simple AES 128 cbc hook up to OpenSSL.
  params:  key, input
 */
  Simple AES 128 cbc hook up to OpenSSL.
  params:  key, input
 */

-static int l_aes(lua_State *L)
+static int l_aes128decrypt_cbc(lua_State *L)

 {
        //Check number of arguments
        int i;
 {
        //Check number of arguments
        int i;


@@ -239,41 +241,153 @@ static int l_aes(lua_State *L)
     if(size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);
     if(size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
 
     const char *p_encTxt = luaL_checklstring(L, 2, &size);

-    
-       unsigned char indata[AES_BLOCK_SIZE] = {0x00};
-       unsigned char outdata[AES_BLOCK_SIZE] = {0x00};
-    unsigned char aes_key[AES_BLOCK_SIZE] = {0x00};
-       unsigned char iv[AES_BLOCK_SIZE] = {0x00};
-       
-       // convert key to bytearray
+
+       unsigned char indata[16] = {0x00};
+       unsigned char outdata[16] = {0x00};
+    unsigned char aes_key[16] = {0x00};
+       unsigned char iv[16] = {0x00};
+
+       // convert key to bytearray and convert input to bytearray

        for (i = 0; i < 32; i += 2) {
                sscanf(&p_encTxt[i], "%02x", (unsigned int *)&indata[i / 2]);
        for (i = 0; i < 32; i += 2) {
                sscanf(&p_encTxt[i], "%02x", (unsigned int *)&indata[i / 2]);

+               sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);

        }
        }

-       
-       // convert input to bytearray
+
+    aes_context ctx;
+    aes_init(&ctx);
+       aes_setkey_dec(&ctx, aes_key, 128);
+       aes_crypt_cbc(&ctx, 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
+}
+static int l_aes128decrypt_ecb(lua_State *L)
+{
+       //Check number of arguments
+       int i;
+    size_t size;
+    const char *p_key = luaL_checklstring(L, 1, &size);
+    if(size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
+
+    const char *p_encTxt = luaL_checklstring(L, 2, &size);
+
+       unsigned char indata[16] = {0x00};
+       unsigned char outdata[16] = {0x00};
+    unsigned char aes_key[16] = {0x00};
+
+       // convert key to bytearray and convert input to bytearray

        for (i = 0; i < 32; i += 2) {
        for (i = 0; i < 32; i += 2) {

+               sscanf(&p_encTxt[i], "%02x", (unsigned int *)&indata[i / 2]);

                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }
                sscanf(&p_key[i], "%02x", (unsigned int *)&aes_key[i / 2]);
        }

-       
-       AES_KEY key;
-       AES_set_decrypt_key(aes_key, 128, &key);
-    AES_cbc_encrypt(indata, outdata, sizeof(indata), &key, iv, AES_DECRYPT);
+    aes_context ctx;
+    aes_init(&ctx);
+       aes_setkey_dec(&ctx, aes_key, 128);
+       aes_crypt_ecb(&ctx, AES_DECRYPT, 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
 }
 

+static int l_aes128encrypt_cbc(lua_State *L)
+{
+       //Check number of arguments
+       int i;
+    size_t size;
+    const char *p_key = luaL_checklstring(L, 1, &size);
+    if(size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
+
+    const char *p_txt = luaL_checklstring(L, 2, &size);
+    
+       unsigned char indata[16] = {0x00};
+       unsigned char outdata[16] = {0x00};
+    unsigned char aes_key[16] = {0x00};
+       unsigned char iv[16] = {0x00};
+       
+       for (i = 0; i < 32; 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_cbc(&ctx, 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
+}
+
+static int l_aes128encrypt_ecb(lua_State *L)
+{
+       //Check number of arguments
+       int i;
+    size_t size;
+    const char *p_key = luaL_checklstring(L, 1, &size);
+    if(size != 32)  return returnToLuaWithError(L,"Wrong size of key, got %d bytes, expected 32", (int) size);
+
+    const char *p_txt = luaL_checklstring(L, 2, &size);
+    
+       unsigned char indata[16] = {0x00};
+       unsigned char outdata[16] = {0x00};
+    unsigned char aes_key[16] = {0x00};
+       
+       for (i = 0; i < 32; 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 );
+       //Push encrypted array as a string
+       lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+       return 1;// return 1 to signal one return value
+}
+

 static int l_crc16(lua_State *L)
 {
        size_t size;
        const char *p_str = luaL_checklstring(L, 1, &size);
 static int l_crc16(lua_State *L)
 {
        size_t size;
        const char *p_str = luaL_checklstring(L, 1, &size);

-               
+

        uint16_t retval = crc16_ccitt( (uint8_t*) p_str, size);
     lua_pushinteger(L, (int) retval);
     return 1;
 }
 
        uint16_t retval = crc16_ccitt( (uint8_t*) p_str, size);
     lua_pushinteger(L, (int) retval);
     return 1;
 }
 

+static int l_crc64(lua_State *L)
+{
+       size_t size;
+       uint64_t crc = 0; 
+       unsigned char outdata[8] = {0x00};
+
+       const char *p_str = luaL_checklstring(L, 1, &size);
+
+       crc64( (uint8_t*) p_str, size, &crc);
+
+       outdata[0] = (uint8_t)(crc >> 56) & 0xff;
+       outdata[1] = (uint8_t)(crc >> 48) & 0xff;
+       outdata[2] = (uint8_t)(crc >> 40) & 0xff;
+       outdata[3] = (uint8_t)(crc >> 32) & 0xff;
+       outdata[4] = (uint8_t)(crc >> 24) & 0xff;
+       outdata[5] = (uint8_t)(crc >> 16) & 0xff;
+       outdata[6] = (uint8_t)(crc >> 8) & 0xff;
+       outdata[7] = crc & 0xff;
+       lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+       return 1;
+}
+
+static int l_sha1(lua_State *L)
+{
+       size_t size;
+       const char *p_str = luaL_checklstring(L, 1, &size);     
+       unsigned char outdata[20] = {0x00};                                                                                                                                                                     
+    sha1( (uint8_t*) p_str, size, outdata);                                                                                                                                                                 
+    lua_pushlstring(L,(const char *)&outdata, sizeof(outdata));
+    return 1;  
+}
+

 /**
  * @brief Sets the lua path to include "./lualibs/?.lua", in order for a script to be
  * able to do "require('foobar')" if foobar.lua is within lualibs folder.
 /**
  * @brief Sets the lua path to include "./lualibs/?.lua", in order for a script to be
  * able to do "require('foobar')" if foobar.lua is within lualibs folder.


@@ -294,7 +408,8 @@ int setLuaPath( lua_State* L, const char* path )
     lua_pushstring( L, buf ); // push the new one
     lua_setfield( L, -2, "path" ); // set the field "path" in table at -2 with value at top of stack
     lua_pop( L, 1 ); // get rid of package table from top of stack
     lua_pushstring( L, buf ); // push the new one
     lua_setfield( L, -2, "path" ); // set the field "path" in table at -2 with value at top of stack
     lua_pop( L, 1 ); // get rid of package table from top of stack

-    return 0; // all done!
+       free(buf);
+       return 0; // all done!

 }
 
 
 }
 
 


@@ -309,10 +424,15 @@ int set_pm3_libraries(lua_State *L)
         {"foobar",                      l_foobar},
         {"ukbhit",                      l_ukbhit},
         {"clearCommandBuffer",          l_clearCommandBuffer},
         {"foobar",                      l_foobar},
         {"ukbhit",                      l_ukbhit},
         {"clearCommandBuffer",          l_clearCommandBuffer},

-        {"console",                     l_CmdConsole},
-        {"iso15693_crc",                l_iso15693_crc},
-               {"aes",                         l_aes},
+               {"console",                     l_CmdConsole},
+               {"iso15693_crc",                l_iso15693_crc},
+               {"aes128_decrypt",              l_aes128decrypt_cbc},
+               {"aes128_decrypt_ecb",          l_aes128decrypt_ecb},
+               {"aes128_encrypt",              l_aes128encrypt_cbc},           
+               {"aes128_encrypt_ecb",          l_aes128encrypt_ecb},

                {"crc16",                       l_crc16},
                {"crc16",                       l_crc16},

+               {"crc64",                       l_crc64},
+               {"sha1",                                                l_sha1},

         {NULL, NULL}
     };
 
         {NULL, NULL}
     };