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

fix: 14a raw commands - running lua scripts works again for MIX/NG frames

Browse source
This commit is contained in:
iceman1001 2019-05-25 09:06:44 -04:00
parent 2d972f8cb9
commit abc66484e5
3 changed files with 54 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

38
client/scripting.c
View file

@ -303,11 +303,45 @@ static int l_WaitForResponseTimeout(lua_State *L) {
ms_timeout = luaL_checkunsigned(L, 2);
PacketResponseNG resp;
if (WaitForResponseTimeout(cmd, &resp, ms_timeout) == 0)
if (WaitForResponseTimeout(cmd, &resp, ms_timeout) == false)
return returnToLuaWithError(L, "No response from the device");
char foo[sizeof(PacketResponseNG)];
n = 0;
memcpy(foo + n, &resp.cmd, sizeof(resp.cmd));
n += sizeof(resp.cmd);
memcpy(foo + n, &resp.length, sizeof(resp.length));
n += sizeof(resp.length);
memcpy(foo + n, &resp.magic, sizeof(resp.magic));
n += sizeof(resp.magic);
memcpy(foo + n, &resp.status, sizeof(resp.status));
n += sizeof(resp.status);
memcpy(foo + n, &resp.crc, sizeof(resp.crc));
n += sizeof(resp.crc);
memcpy(foo + n, &resp.oldarg[0], sizeof(resp.oldarg[0]));
n += sizeof(resp.oldarg[0]);
memcpy(foo + n, &resp.oldarg[1], sizeof(resp.oldarg[1]));
n += sizeof(resp.oldarg[1]);
memcpy(foo + n, &resp.oldarg[2], sizeof(resp.oldarg[2]));
n += sizeof(resp.oldarg[2]);
memcpy(foo + n, resp.data.asBytes, sizeof(resp.data));
n += sizeof(resp.data);
memcpy(foo + n, &resp.ng, sizeof(resp.ng));
n += sizeof(resp.ng);
//Push it as a string
lua_pushlstring(L, (const char *)&resp, sizeof(PacketResponseNG));
lua_pushlstring(L, (const char *)&foo, sizeof(foo));
return 1;
}