- improved reader sensitivity for 14443a cards (FPGA change!)

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index f9f4999df37b5d2280bad1800b9383d0abe60b3a..963bb64c2b0dd616595671eb5923f5bc9c8e5049 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -15,6 +15,9 @@
 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include "scripting.h"
 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include "scripting.h"

+#include "util.h"
+#include "nonce2key/nonce2key.h"
+#include "../common/iso15693tools.h"

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


@@ -40,10 +43,18 @@ static int l_SendCommand(lua_State *L){
     ==> A 544 byte buffer will do.
     **/
     //Pop cmd
     ==> A 544 byte buffer will do.
     **/
     //Pop cmd

-    UsbCommand *c = (UsbCommand *)lua_touserdata(L, 1);
-    luaL_argcheck(L, c != NULL, 1, "'UsbCommand' expected");
-    SendCommand(c);
-    return 0;
+    size_t size;
+    const char *data = luaL_checklstring(L, 1, &size);
+    if(size != sizeof(UsbCommand))
+    {
+        printf("Got data size %d, expected %d" , (int) size,(int) sizeof(UsbCommand));
+        lua_pushstring(L,"Wrong data size");
+        return 1;
+    }
+
+//    UsbCommand c = (*data);
+    SendCommand((UsbCommand* )data);
+    return 0; // no return values

 }
 /**
  * @brief The following params expected:
 }
 /**
  * @brief The following params expected:


@@ -54,52 +65,202 @@ static int l_SendCommand(lua_State *L){
  */
 static int l_WaitForResponseTimeout(lua_State *L){
 
  */
 static int l_WaitForResponseTimeout(lua_State *L){
 

-    //pop cmd
-    uint32_t cmd = luaL_checkunsigned(L,1);
-    printf("in l_WaitForResponseTimeout, got cmd 0x%0x\n",(int) cmd);
-    //UsbCommand response;
+    uint32_t cmd = 0;
+    size_t ms_timeout = -1;

 
 

-    //We allocate the usbcommand as userdata on the Lua-stack
-    size_t nbytes = sizeof(UsbCommand);
-
-    UsbCommand *response = (UsbCommand *)lua_newuserdata(L, nbytes);
-
-    size_t ms_timeout = 2000;
-    //Did the user send a timeout ?
-    //Check if the current top of stack is an integer
-
-    if(lua_isnumber( L, 2))
+    //Check number of arguments
+    int n = lua_gettop(L);
+    if(n == 0)

     {
     {

-        printf("You sent a timout-value\n");
+        //signal error by returning Nil, errorstring
+        lua_pushnil(L);
+        lua_pushstring(L,"You need to supply at least command to wait for");
+        return 2; // two return values
+    }
+    if(n >= 1)
+    {
+        //pop cmd
+        cmd = luaL_checkunsigned(L,1);
+    }
+    if(n >= 2)
+    {
+        //Did the user send a timeout ?
+        //Check if the current top of stack is an integer

         ms_timeout = luaL_checkunsigned(L,2);
         ms_timeout = luaL_checkunsigned(L,2);

+        //printf("Timeout set to %dms\n" , (int) ms_timeout);

     }
     }

-    printf("Timeout set to %dms\n" , (int) ms_timeout);

 
 

-    if(WaitForResponseTimeout(cmd, response, ms_timeout))
-    {
-        //Return the UsbCommand as userdata
-        //the usbcommand is already on the stack
-        // return 1 to signal one return value
-        return 1;
-    }else
+    UsbCommand response;
+
+    if(WaitForResponseTimeout(cmd, &response, ms_timeout))

     {
     {

-        //Don't return the UsbCommand. Pop it.
-        lua_pop(L,-1);
+        //Push it as a string
+         lua_pushlstring(L,(const char *)&response,sizeof(UsbCommand));
+
+        return 1;// return 1 to signal one return value
+    }else{

         //Push a Nil instead
         lua_pushnil(L);
         //Push a Nil instead
         lua_pushnil(L);

-        return 1;
+        return 1;// one return value

     }
 }
     }
 }

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

 
 

-void set_pm3_libraries(lua_State *L)
+static int returnToLuaWithError(lua_State *L, const char* fmt, ...)
+{
+    char buffer[200];
+    va_list args;
+    va_start(args,fmt);
+    vsnprintf(buffer, sizeof(buffer), fmt,args);
+    va_end(args);
+
+    lua_pushnil(L);
+    lua_pushstring(L,buffer);
+    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);
+
+    //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);
+
+    //printf("Pushing to lua stack: %012"llx"\n",key);
+    lua_pushlstring(L,(const char *) dest_key,sizeof(dest_key));
+
+    return 2; //Two return values
+}
+//static int l_PrintAndLog(lua_State *L){ return CmdHF14AMfDump(luaL_checkstring(L, 1));}
+static int l_clearCommandBuffer(lua_State *L){
+    clearCommandBuffer();
+    return 0;
+}
+/**
+ * @brief l_foobar is a dummy function to test lua-integration with
+ * @param L
+ * @return
+ */
+static int l_foobar(lua_State *L)
+{
+    //Check number of arguments
+    int n = 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}};
+  
+    printf("Now returning a uint64_t as a string");
+    uint64_t x = 0xDEADBEEF;
+    uint8_t destination[8];
+    num_to_bytes(x,sizeof(x),destination);
+    lua_pushlstring(L,(const char *)&x,sizeof(x));
+    lua_pushlstring(L,(const char *)destination,sizeof(destination));
+
+    return 2;
+}
+
+
+/**
+ * @brief Utility to check if a key has been pressed by the user. This method does not block.
+ * @param L
+ * @return boolean, true if kbhit, false otherwise.
+ */
+static int l_ukbhit(lua_State *L)
+{
+    lua_pushboolean(L,ukbhit() ? true : false);
+    return 1;
+}
+/**
+ * @brief Calls the command line parser to deal with the command. This enables
+ * lua-scripts to do stuff like "core.console('hf mf mifare')"
+ * @param L
+ * @return
+ */
+static int l_CmdConsole(lua_State *L)
+{
+    CommandReceived((char *)luaL_checkstring(L, 1));
+    return 0;
+}
+
+static int l_iso15693_crc(lua_State *L)

 {
 {

+    //    uint16_t Iso15693Crc(uint8_t *v, int n);
+    size_t size;
+    const char *v = luaL_checklstring(L, 1, &size);
+    uint16_t retval = Iso15693Crc((uint8_t *) v, size);
+    lua_pushinteger(L, (int) retval);
+    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.
+ * Taken from http://stackoverflow.com/questions/4125971/setting-the-global-lua-path-variable-from-c-c
+ * @param L
+ * @param path
+ * @return
+ */
+int setLuaPath( lua_State* L, const char* path )
+{
+    lua_getglobal( L, "package" );
+    lua_getfield( L, -1, "path" ); // get field "path" from table at top of stack (-1)
+    const char* cur_path = lua_tostring( L, -1 ); // grab path string from top of stack
+    int requiredLength = strlen(cur_path)+ strlen(path)+10; //A few bytes too many, whatever we can afford it
+    char * buf = malloc(requiredLength);
+    snprintf(buf, requiredLength, "%s;%s", cur_path, path);
+    lua_pop( L, 1 ); // get rid of the string on the stack we just pushed on line 5
+    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!
+}
+
+
+int set_pm3_libraries(lua_State *L)
+{
+

     static const luaL_Reg libs[] = {
         {"SendCommand",                 l_SendCommand},
         {"WaitForResponseTimeout",      l_WaitForResponseTimeout},
         {"nonce2key",                   l_nonce2key},
     static const luaL_Reg libs[] = {
         {"SendCommand",                 l_SendCommand},
         {"WaitForResponseTimeout",      l_WaitForResponseTimeout},
         {"nonce2key",                   l_nonce2key},

-        {"PrintAndLog",                 l_PrintAndLog},
+        //{"PrintAndLog",                 l_PrintAndLog},
+        {"foobar",                      l_foobar},
+        {"ukbhit",                      l_ukbhit},
+        {"clearCommandBuffer",          l_clearCommandBuffer},
+        {"console",                      l_CmdConsole},
+        {"iso15693_crc",                 l_iso15693_crc},

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


@@ -118,5 +279,10 @@ void set_pm3_libraries(lua_State *L)
 
     //-- remove the global environment table from the stack
     lua_pop(L, 1);
 
     //-- remove the global environment table from the stack
     lua_pop(L, 1);

+
+    //-- 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");
+

     return 1;
 }
     return 1;
 }