add psk to em4x05 reads and tweak psk demod

[proxmark3-svn] / client / scripting.c

diff --git a/client/scripting.c b/client/scripting.c
index 414f5315b45c16ccee3d86096314f95205f7564f..8d77c78a2e4a2b9aef6aae0b075a62c1910fc608 100644 (file)
--- 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"
@@ -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
@@ -393,12 +415,13 @@ static int l_reveng_models(lua_State *L){
 
        char *models[80];
        int count = 0;
-       lua_Integer  in_width = luaL_checkinteger(L, 1);
+       int in_width = luaL_checkinteger(L, 1);
        
        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);
@@ -412,6 +435,13 @@ static int l_reveng_models(lua_State *L){
        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
@@ -422,19 +452,14 @@ static int l_reveng_RunModel(lua_State *L){
        //result = calculated crc hex string    
        char result[50];
        
-       size_t dataLen;
-       const char *inModel = luaL_checklstring(L, 1, &dataLen);
-       if ( dataLen < 4 ) return returnToLuaWithError(L,"Can't find model, got %s", inModel);
-       
-       const char *inHexStr = luaL_checklstring(L, 2, &dataLen);
-       if ( dataLen < 4 ) return returnToLuaWithError(L,"Hex string too short, got %d", dataLen);
-       
-       int reverse = luaL_checkinteger(L, 3);  
-       const char endian = luaL_checklstring(L, 4, &dataLen)[0];
+       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, (bool)reverse, endian, result);
+       int ans = RunModel( (char *)inModel, (char *)inHexStr, reverse, endian, result);
        if (!ans)       
                return returnToLuaWithError(L,"Reveng failed");
 
@@ -442,7 +467,6 @@ static int l_reveng_RunModel(lua_State *L){
        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.
@@ -481,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},
@@ -490,7 +515,6 @@ int set_pm3_libraries(lua_State *L)
                {"sha1",                        l_sha1},
                {"reveng_models",               l_reveng_models},
                {"reveng_runmodel",             l_reveng_RunModel},
-
                {NULL, NULL}
        };