Some refactoring, also placed wait14443a here

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index f7c0b2a4aaaa3bbf2dfb5153b8a6677ec6126c5b..43474b98d183feb7201ea78384fc2124d05ca117 100644 (file)
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -150,8 +150,13 @@ 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
     //Push the key onto the stack

-    lua_pushlstring(L,(const char *) &key,sizeof(key));
+    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
 }
 
     return 2; //Two return values
 }


@@ -172,10 +177,18 @@ 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));

-    UsbCommand response =  {CMD_MIFARE_READBL, {1337, 1338, 1339}};
-    printf("Now returning a UsbCommand as a string");
-    lua_pushlstring(L,(const char *)&response,sizeof(UsbCommand));
-    return 1;
+  
+    // 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;

 }
 
 
 }