github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-20 05:13:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed so correct sizes are used across different architectures in the binlib

Browse source
This commit is contained in:
martin.holst@gmail.com 2013-06-26 12:33:31 +00:00
commit ca363c2348
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
client/pm3_binlib.c
View file

@ -35,7 +35,7 @@
#include <lua.h> #include <lua.h>
#include <lualib.h> #include <lualib.h>
#include <lauxlib.h> #include <lauxlib.h>
#include <stdint.h>
#include "pm3_binlib.h" #include "pm3_binlib.h"
@ -158,20 +158,21 @@ static int l_unpack(lua_State *L) /** unpack(f,s, [init]) */
++n; ++n;
break; break;
} }
UNPACKSTRING(OP_BSTRING, unsigned char)
UNPACKSTRING(OP_WSTRING, unsigned short) UNPACKSTRING(OP_BSTRING, uint8_t)
UNPACKSTRING(OP_SSTRING, size_t) UNPACKSTRING(OP_WSTRING, uint16_t)
UNPACKSTRING(OP_SSTRING, uint32_t)
UNPACKNUMBER(OP_NUMBER, lua_Number) UNPACKNUMBER(OP_NUMBER, lua_Number)
UNPACKNUMBER(OP_DOUBLE, double) UNPACKNUMBER(OP_DOUBLE, double)
UNPACKNUMBER(OP_FLOAT, float) UNPACKNUMBER(OP_FLOAT, float)
UNPACKNUMBER(OP_CHAR, char) UNPACKNUMBER(OP_CHAR, int8_t)
UNPACKNUMBER(OP_BYTE, unsigned char) UNPACKNUMBER(OP_BYTE, uint8_t)
UNPACKNUMBER(OP_SHORT, short) UNPACKNUMBER(OP_SHORT, int16_t)
UNPACKNUMBER(OP_USHORT, unsigned short) UNPACKNUMBER(OP_USHORT, uint16_t)
UNPACKNUMBER(OP_INT, int) UNPACKNUMBER(OP_INT, int32_t)
UNPACKNUMBER(OP_UINT, unsigned int) UNPACKNUMBER(OP_UINT, uint32_t)
UNPACKNUMBER(OP_LONG, long) UNPACKNUMBER(OP_LONG, int64_t)
UNPACKNUMBER(OP_ULONG, unsigned long) UNPACKNUMBER(OP_ULONG, uint64_t)
case OP_HEX: case OP_HEX:
{ {
luaL_Buffer buf; luaL_Buffer buf;
@ -264,20 +265,20 @@ static int l_pack(lua_State *L) /** pack(f,...) */
luaL_addlstring(&b,a,l+(c==OP_ZSTRING)); luaL_addlstring(&b,a,l+(c==OP_ZSTRING));
break; break;
} }
PACKSTRING(OP_BSTRING, unsigned char) PACKSTRING(OP_BSTRING, uint8_t)
PACKSTRING(OP_WSTRING, unsigned short) PACKSTRING(OP_WSTRING, uint16_t)
PACKSTRING(OP_SSTRING, size_t) PACKSTRING(OP_SSTRING, uint32_t)
PACKNUMBER(OP_NUMBER, lua_Number) PACKNUMBER(OP_NUMBER, lua_Number)
PACKNUMBER(OP_DOUBLE, double) PACKNUMBER(OP_DOUBLE, double)
PACKNUMBER(OP_FLOAT, float) PACKNUMBER(OP_FLOAT, float)
PACKNUMBER(OP_CHAR, char) PACKNUMBER(OP_CHAR, int8_t)
PACKNUMBER(OP_BYTE, unsigned char) PACKNUMBER(OP_BYTE, uint8_t)
PACKNUMBER(OP_SHORT, short) PACKNUMBER(OP_SHORT, int16_t)
PACKNUMBER(OP_USHORT, unsigned short) PACKNUMBER(OP_USHORT, uint16_t)
PACKNUMBER(OP_INT, int) PACKNUMBER(OP_INT, int32_t)
PACKNUMBER(OP_UINT, unsigned int) PACKNUMBER(OP_UINT, uint32_t)
PACKNUMBER(OP_LONG, long) PACKNUMBER(OP_LONG, int64_t)
PACKNUMBER(OP_ULONG, unsigned long) PACKNUMBER(OP_ULONG, uint64_t)
case OP_HEX: case OP_HEX:
{ // doing digit parsing the lpack way { // doing digit parsing the lpack way
unsigned char sbyte = 0; unsigned char sbyte = 0;