X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1d0ccbe04b6d04cc4e05aeb9bbcb7b7fa0cfdbd1..a8ee668770c99f651346266a506b79192e944ab3:/client/scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index 5d9ce55a..64fb2a8f 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2013 m h swende <martin at swende.se>
+// Modified 2015,2016, iceman 
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
@@ -7,23 +8,8 @@
 //-----------------------------------------------------------------------------
 // Some lua scripting glue to proxmark core.
 //-----------------------------------------------------------------------------
-
-#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 "nonce2key/nonce2key.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
@@ -96,7 +82,6 @@ static int l_WaitForResponseTimeout(lua_State *L){
     }
 
     UsbCommand response;
-
     if(WaitForResponseTimeout(cmd, &response, ms_timeout))
     {
         //Push it as a string
@@ -236,18 +221,17 @@ static int l_iso14443b_crc(lua_State *L)
                      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;
+    size_t size = 0;	
+    const char *data = luaL_checklstring(L, 1, &size);
+
+	unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
 	
-	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]);
+	for (int i = 0; i < size; i += 2)
+		sscanf(&data[i], "%02x", (unsigned int *)&buf[i / 2]);	
 	
-    lua_pushlstring(L, (const char *)&buf, len+2);
+	size /= 2;	
+	ComputeCrc14443(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);	
+    lua_pushlstring(L, (const char *)&buf, size+2);
     return 1;
 }
 
@@ -369,6 +353,16 @@ static int l_aes128encrypt_ecb(lua_State *L)
 	return 1;// return 1 to signal one return value
 }
 
+static int l_crc8legic(lua_State *L)
+{
+	size_t size;
+	const char *p_str = luaL_checklstring(L, 1, &size);
+
+	uint16_t retval = CRC8Legic( (uint8_t*) p_str, size);
+    lua_pushinteger(L, (int) retval);
+    return 1;
+}
+
 static int l_crc16(lua_State *L)
 {
 	size_t size;
@@ -413,13 +407,15 @@ static int l_sha1(lua_State *L)
 
 static int l_reveng_models(lua_State *L){
 
-	char *models[80];
+	// This array needs to be adjusted if RevEng adds more crc-models.
+	char *models[100];
 	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];
+	// This array needs to be adjusted if RevEng adds more crc-models.
+	uint8_t width[100];
 	width[0] = (uint8_t)in_width;
 	int ans = GetModels(models, &count, width);
 	if (!ans) return 0;
@@ -491,7 +487,6 @@ int setLuaPath( lua_State* L, const char* path )
 	return 0; // all done!
 }
 
-
 int set_pm3_libraries(lua_State *L)
 {
 
@@ -510,6 +505,7 @@ int set_pm3_libraries(lua_State *L)
 		{"aes128_decrypt_ecb",          l_aes128decrypt_ecb},
 		{"aes128_encrypt",              l_aes128encrypt_cbc},		
 		{"aes128_encrypt_ecb",          l_aes128encrypt_ecb},
+		{"crc8legic",					l_crc8legic},
 		{"crc16",                       l_crc16},
 		{"crc64",                       l_crc64},
 		{"sha1",						l_sha1},