X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7ac59a82ab5d244407254febf5dc9b7be892d2ad..7b215d149ac4fd5709635111d86a2062fc7ac3ad:/client/scripting.c?ds=sidebyside

diff --git a/client/scripting.c b/client/scripting.c
index d68adb3e..0c761cb2 100644
--- a/client/scripting.c
+++ b/client/scripting.c
@@ -23,9 +23,9 @@
 #include "iso14443crc.h"
 #include "../common/crc16.h"
 #include "../common/crc64.h"
-#include "../common/sha1.h"
-#include "aes.h"
-#include "cmdcrc.h"
+#include "../common/polarssl/sha1.h"
+#include "../common/polarssl/aes.h"
+
 /**
  * The following params expected:
  *  UsbCommand c
@@ -391,62 +391,6 @@ static int l_sha1(lua_State *L)
 	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.
@@ -493,8 +437,6 @@ int set_pm3_libraries(lua_State *L)
 		{"crc16",                       l_crc16},
 		{"crc64",                       l_crc64},
 		{"sha1",                        l_sha1},
-		{"reveng_models",               l_reveng_models},
-		{"reveng_runmodel",             l_reveng_RunModel},
 		{NULL, NULL}
 	};