new grid X offset calcs to fix some issues

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index a188ecf047de8eda6c35bd4e5434ed3845c14147..d68adb3ee66ab82406bd448f147b315d8eb83832 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -8,21 +8,24 @@
 // Some lua scripting glue to proxmark core.
 //-----------------------------------------------------------------------------
 
 // Some lua scripting glue to proxmark core.
 //-----------------------------------------------------------------------------
 

+#include "scripting.h"
+
+#include <stdlib.h>

 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #include "proxmark3.h"
 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #include "proxmark3.h"
 #include "usb_cmd.h"
 #include "cmdmain.h"

-#include "scripting.h"

 #include "util.h"
 #include "util.h"

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

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

+#include "cmdcrc.h"

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


@@ -123,49 +126,27 @@ static int returnToLuaWithError(lua_State *L, const char* fmt, ...)
        return 2;
 }
 
        return 2;
 }
 

-static int l_nonce2key(lua_State *L){
-
-       size_t size;
-       const char *p_uid = luaL_checklstring(L, 1, &size);
-       if(size != 4)  return returnToLuaWithError(L,"Wrong size of uid, got %d bytes, expected 4", (int) size);
-
-       const char *p_nt = luaL_checklstring(L, 2, &size);
-       if(size != 4)  return returnToLuaWithError(L,"Wrong size of nt, got %d bytes, expected 4", (int) size);
-
-       const char *p_nr = luaL_checklstring(L, 3, &size);
-       if(size != 4)  return returnToLuaWithError(L,"Wrong size of nr, got %d bytes, expected 4", (int) size);
-
-       const char *p_par_info = luaL_checklstring(L, 4, &size);
-       if(size != 8)  return returnToLuaWithError(L,"Wrong size of par_info, got %d bytes, expected 8", (int) size);
-
-       const char *p_pks_info = luaL_checklstring(L, 5, &size);
-       if(size != 8)  return returnToLuaWithError(L,"Wrong size of ks_info, got %d bytes, expected 8", (int) size);
-
-
-       uint32_t uid = bytes_to_num(( uint8_t *)p_uid,4);
-       uint32_t nt = bytes_to_num(( uint8_t *)p_nt,4);
-
-       uint32_t nr = bytes_to_num(( uint8_t*)p_nr,4);
-       uint64_t par_info = bytes_to_num(( uint8_t *)p_par_info,8);
-       uint64_t ks_info = bytes_to_num(( uint8_t *)p_pks_info,8);
-
-       uint64_t key = 0;
-
-       int retval = nonce2key(uid,nt, nr, par_info,ks_info, &key);
+static int l_mfDarkside(lua_State *L){

 
 

+       uint64_t key;
+       
+       int retval = mfDarkside(&key);
+       

        //Push the retval on the stack
        //Push the retval on the stack

-       lua_pushinteger(L,retval);
+       lua_pushinteger(L, retval);

 
        //Push the key onto the stack
        uint8_t dest_key[8];
 
        //Push the key onto the stack
        uint8_t dest_key[8];

-       num_to_bytes(key,sizeof(dest_key),dest_key);
+       num_to_bytes(key, sizeof(dest_key), dest_key);

 
 

-       //printf("Pushing to lua stack: %012"llx"\n",key);
-       lua_pushlstring(L,(const char *) dest_key,sizeof(dest_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
 }
 
        return 2; //Two return values
 }

+

 //static int l_PrintAndLog(lua_State *L){ return CmdHF14AMfDump(luaL_checkstring(L, 1));}
 //static int l_PrintAndLog(lua_State *L){ return CmdHF14AMfDump(luaL_checkstring(L, 1));}

+

 static int l_clearCommandBuffer(lua_State *L){
        clearCommandBuffer();
        return 0;
 static int l_clearCommandBuffer(lua_State *L){
        clearCommandBuffer();
        return 0;


@@ -410,6 +391,62 @@ static int l_sha1(lua_State *L)
        return 1;
 }
 
        return 1;
 }
 

+static int l_reveng_models(lua_State *L){
+
+       char *models[80];
+       int count = 0;
+       int in_width = luaL_checkinteger(L, 1);
+       
+       if( in_width > 89 ) return returnToLuaWithError(L,"Width cannot exceed 89, got %d", in_width);
+
+       uint8_t width[80];
+       width[0] = (uint8_t)in_width;
+       int ans = GetModels(models, &count, width);
+       if (!ans) return 0;
+       
+       lua_newtable(L);
+       
+       for (int i = 0; i < count; i++){
+               lua_pushstring(L,  (const char*)models[i]);
+               lua_rawseti(L,-2,i+1);
+               free(models[i]);
+       }
+
+       return 1;
+}
+
+//Called with 4 parameters.
+// inModel   ,string containing the crc model name: 'CRC-8'
+// inHexStr  ,string containing the hex representation of the data that will be used for CRC calculations.
+// reverse   ,int 0/1  (bool) if 1, calculate the reverse CRC
+// endian    ,char,  'B','b','L','l','t','r' describing if Big-Endian or Little-Endian should be used in different combinations.
+//
+// outputs:  string with hex representation of the CRC result
+static int l_reveng_RunModel(lua_State *L){
+       //-c || -v
+       //inModel = valid model name string - CRC-8
+       //inHexStr = input hex string to calculate crc on
+       //reverse = reverse calc option if true
+       //endian = {0 = calc default endian input and output, b = big endian input and output, B = big endian output, r = right justified
+       //          l = little endian input and output, L = little endian output only, t = left justified}
+       //result = calculated crc hex string    
+       char result[50];
+       
+       const char *inModel = luaL_checkstring(L, 1);
+       const char *inHexStr = luaL_checkstring(L, 2);
+       bool reverse =  lua_toboolean(L, 3);
+       const char endian = luaL_checkstring(L, 4)[0];
+
+       //PrintAndLog("mod: %s, hex: %s, rev %d", inModel, inHexStr, reverse);
+       //int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *result)
+       int ans = RunModel( (char *)inModel, (char *)inHexStr, reverse, endian, result);
+       if (!ans)       
+               return returnToLuaWithError(L,"Reveng failed");
+
+       lua_pushstring(L, (const char*)result); 
+       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.


@@ -441,7 +478,7 @@ int set_pm3_libraries(lua_State *L)
        static const luaL_Reg libs[] = {
                {"SendCommand",                 l_SendCommand},
                {"WaitForResponseTimeout",      l_WaitForResponseTimeout},
        static const luaL_Reg libs[] = {
                {"SendCommand",                 l_SendCommand},
                {"WaitForResponseTimeout",      l_WaitForResponseTimeout},

-               {"nonce2key",                   l_nonce2key},
+               {"mfDarkside",                  l_mfDarkside},

                //{"PrintAndLog",                 l_PrintAndLog},
                {"foobar",                      l_foobar},
                {"ukbhit",                      l_ukbhit},
                //{"PrintAndLog",                 l_PrintAndLog},
                {"foobar",                      l_foobar},
                {"ukbhit",                      l_ukbhit},


@@ -456,6 +493,8 @@ int set_pm3_libraries(lua_State *L)
                {"crc16",                       l_crc16},
                {"crc64",                       l_crc64},
                {"sha1",                        l_sha1},
                {"crc16",                       l_crc16},
                {"crc64",                       l_crc64},
                {"sha1",                        l_sha1},

+               {"reveng_models",               l_reveng_models},
+               {"reveng_runmodel",             l_reveng_RunModel},

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


@@ -477,7 +516,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;
 }