CHG: fixes to match the new arguments to the darkside attack (keytype A|B and blockn...

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index 7576066313a575021f12a6b75b6e48438b56e70b..64fb2a8fe0da78afea2f8f425b6ceea162fd5998 100644 (file)
--- 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,22 +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 "../common/crc16.h"
-#include "../common/crc64.h"
-#include "../common/sha1.h"
-#include "aes.h"
-#include "cmdcrc.h"
+
 /**
  * The following params expected:
  *  UsbCommand c
@@ -52,12 +39,11 @@ static int l_SendCommand(lua_State *L){
     const char *data = luaL_checklstring(L, 1, &size);
     if(size != sizeof(UsbCommand))
     {
-        printf("Got data size %d, expected %d" , (int) size,(int) 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
 }
@@ -96,11 +82,10 @@ static int l_WaitForResponseTimeout(lua_State *L){
     }
 
     UsbCommand response;
-
     if(WaitForResponseTimeout(cmd, &response, ms_timeout))
     {
         //Push it as a string
-         lua_pushlstring(L,(const char *)&response,sizeof(UsbCommand));
+         lua_pushlstring(L,(const char *)&response, sizeof(UsbCommand));
 
         return 1;// return 1 to signal one return value
     }else{
@@ -229,6 +214,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)
+       */
+    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 < size; i += 2)
+               sscanf(&data[i], "%02x", (unsigned int *)&buf[i / 2]);  
+       
+       size /= 2;      
+       ComputeCrc14443(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);      
+    lua_pushlstring(L, (const char *)&buf, size+2);
+    return 1;
+}
+
 /*
  Simple AES 128 cbc hook up to OpenSSL.
  params:  key, input
@@ -347,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;
@@ -391,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;
@@ -469,7 +487,6 @@ int setLuaPath( lua_State* L, const char* path )
        return 0; // all done!
 }
 
-
 int set_pm3_libraries(lua_State *L)
 {
 
@@ -483,10 +500,12 @@ 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},           
                {"aes128_encrypt_ecb",          l_aes128encrypt_ecb},
+               {"crc8legic",                                   l_crc8legic},
                {"crc16",                       l_crc16},
                {"crc64",                       l_crc64},
                {"sha1",                                                l_sha1},