X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/53ee28cb3a14f529f36fcfeb514b7ef718a31973..f9f0e83b7cf98887fc5dbe97bcb491b8c45c7d69:/client/scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index cc6498ce..10d554a0 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -18,6 +18,7 @@
 #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"
@@ -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);
 
-	//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
@@ -229,6 +230,27 @@ static int l_iso15693_crc(lua_State *L)
 	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
@@ -397,8 +419,9 @@ static int l_reveng_models(lua_State *L){
 	
 	if( in_width > 89 ) return returnToLuaWithError(L,"Width cannot exceed 89, got %d", in_width);
 
-	uint32_t width = (uint32_t)in_width;
-	int ans = GetModels(models, &count, &width);
+	uint8_t width[80];
+	width[0] = (uint8_t)in_width;
+	int ans = GetModels(models, &count, width);
 	if (!ans) return 0;
 	
 	lua_newtable(L);
@@ -482,6 +505,7 @@ int set_pm3_libraries(lua_State *L)
 		{"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},
@@ -512,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
-	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;
 }