github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-15 01:23:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: the 14b crc was called wrong in LUA. You enter a hexstring already, and get a hexstring back.

Browse source
This commit is contained in:
iceman1001 2016-02-25 17:51:02 +01:00
parent 71cb7328e3
commit f6af1cf0ad
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/lualibs/utils.lua
View file

@ -75,9 +75,9 @@ local Utils =
if #s == 0 then return nil end if #s == 0 then return nil end
if type(s) == 'string' then if type(s) == 'string' then
local utils = require('utils') local utils = require('utils')
local ascii = utils.ConvertHexToAscii(s) return utils.ConvertAsciiToHex(
local hashed = core.iso14443b_crc(ascii) core.iso14443b_crc(s)
return utils.ConvertAsciiToHex(hashed) )
end end
return nil return nil
end, end,

20
client/scripting.c
View file

@ -82,7 +82,6 @@ static int l_WaitForResponseTimeout(lua_State *L){
} }
UsbCommand response; UsbCommand response;
if(WaitForResponseTimeout(cmd, &response, ms_timeout)) if(WaitForResponseTimeout(cmd, &response, ms_timeout))
{ {
//Push it as a string //Push it as a string
@ -222,18 +221,17 @@ static int l_iso14443b_crc(lua_State *L)
unsigned char *TransmitFirst, unsigned char *TransmitFirst,
unsigned char *TransmitSecond) unsigned char *TransmitSecond)
*/ */
unsigned char buf[USB_CMD_DATA_SIZE]; size_t size = 0;
size_t len = 0; const char *data = luaL_checklstring(L, 1, &size);
const char *data = luaL_checklstring(L, 1, &len);
if (USB_CMD_DATA_SIZE < len) unsigned char buf[USB_CMD_DATA_SIZE] = {0x00};
len = USB_CMD_DATA_SIZE-2;
for (int i = 0; i < len; i += 2) { for (int i = 0; i < size; i += 2)
sscanf(&data[i], "%02x", (unsigned int *)&buf[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); size /= 2;
ComputeCrc14443(CRC_14443_B, buf, size, &buf[size], &buf[size+1]);
lua_pushlstring(L, (const char *)&buf, size+2);
return 1; return 1;
} }