Re: [NSE patch] patch for pack/unpack to use platform independant types

[Sven Klemm <sven () c3d2 de>]

Hi,

I've enhanced the patch to also update the documentation. Currently 
unpack/pack produces different results on 32-bit linux than on 64-bit 
linux because platform dependant types like int,long and size_t are 
used. The byte size of these types is used to determine the number of 
bytes used when packing/unpacking. So any scripts using the library 
will most likely not be crossplatform. The attached patch uses 
platform independant datatypes defined by nbase for pack/unpack which 
fixes the issue.

Any chance this is getting applied?

Cheers,
Sven

--
Sven Klemm
http://cthulhu.c3d2.de/~sven/

Index: nse_binlib.cc
===================================================================
--- nse_binlib.cc       (revision 9487)
+++ nse_binlib.cc       (working copy)
@@ -13,21 +13,21 @@
 */
 
 #define        OP_ZSTRING      'z'             /* zero-terminated string */
-#define        OP_BSTRING      'p'             /* string preceded by length byte */
-#define        OP_WSTRING      'P'             /* string preceded by length word */
-#define        OP_SSTRING      'a'             /* string preceded by length size_t */
+#define        OP_BSTRING      'p'             /* string preceded by 1 byte integer */
+#define        OP_WSTRING      'P'             /* string preceded by 2 byte integer */
+#define        OP_SSTRING      'a'             /* string preceded by 4 byte integer */
 #define        OP_STRING       'A'             /* string */
 #define        OP_FLOAT        'f'             /* float */
 #define        OP_DOUBLE       'd'             /* double */
 #define        OP_NUMBER       'n'             /* Lua number */
-#define        OP_CHAR         'c'             /* char */
-#define        OP_BYTE         'C'             /* byte = unsigned char */
-#define        OP_SHORT        's'             /* short */
-#define        OP_USHORT       'S'             /* unsigned short */
-#define        OP_INT          'i'             /* int */
-#define        OP_UINT         'I'             /* unsigned int */
-#define        OP_LONG         'l'             /* long */
-#define        OP_ULONG        'L'             /* unsigned long */
+#define        OP_CHAR         'c'             /* char (1-byte int) */
+#define        OP_BYTE         'C'             /* byte = unsigned char (1-byte unsigned int) */
+#define        OP_SHORT        's'             /* short (2-byte int) */
+#define        OP_USHORT       'S'             /* unsigned short (2-byte unsigned int) */
+#define        OP_INT          'i'             /* int (4-byte int) */
+#define        OP_UINT         'I'             /* unsigned int (4-byte unsigned int) */
+#define        OP_LONG         'l'             /* long (8-byte int) */
+#define        OP_ULONG        'L'             /* unsigned long (8-byte unsigned int) */
 #define        OP_LITTLEENDIAN '<'             /* little endian */
 #define        OP_BIGENDIAN    '>'             /* big endian */
 #define        OP_NATIVE       '='             /* native endian */
@@ -46,6 +46,7 @@
 #include "lualib.h"
 #include "lauxlib.h"
 }
+#include <nbase.h>
 #include "nse_binlib.h"
 
 static void badcode(lua_State *L, int c)
@@ -168,20 +169,20 @@
     ++n;
     break;
    }
-   UNPACKSTRING(OP_BSTRING, unsigned char)
-   UNPACKSTRING(OP_WSTRING, unsigned short)
-   UNPACKSTRING(OP_SSTRING, size_t)
+   UNPACKSTRING(OP_BSTRING, u_int8_t)
+   UNPACKSTRING(OP_WSTRING, u_int16_t)
+   UNPACKSTRING(OP_SSTRING, u_int32_t)
    UNPACKNUMBER(OP_NUMBER, lua_Number)
    UNPACKNUMBER(OP_DOUBLE, double)
    UNPACKNUMBER(OP_FLOAT, float)
-   UNPACKNUMBER(OP_CHAR, char)
-   UNPACKNUMBER(OP_BYTE, unsigned char)
-   UNPACKNUMBER(OP_SHORT, short)
-   UNPACKNUMBER(OP_USHORT, unsigned short)
-   UNPACKNUMBER(OP_INT, int)
-   UNPACKNUMBER(OP_UINT, unsigned int)
-   UNPACKNUMBER(OP_LONG, long)
-   UNPACKNUMBER(OP_ULONG, unsigned long)
+   UNPACKNUMBER(OP_CHAR, int8_t)
+   UNPACKNUMBER(OP_BYTE, u_int8_t)
+   UNPACKNUMBER(OP_SHORT, int16_t)
+   UNPACKNUMBER(OP_USHORT, u_int16_t)
+   UNPACKNUMBER(OP_INT, int32_t)
+   UNPACKNUMBER(OP_UINT, u_int32_t)
+   UNPACKNUMBER(OP_LONG, int64_t)
+   UNPACKNUMBER(OP_ULONG, u_int64_t)
 
    case OP_BINMSB:
      {
@@ -305,20 +306,20 @@
     luaL_addlstring(&b,a,l+(c==OP_ZSTRING));
     break;
    }
-   PACKSTRING(OP_BSTRING, unsigned char)
-   PACKSTRING(OP_WSTRING, unsigned short)
-   PACKSTRING(OP_SSTRING, size_t)
+   PACKSTRING(OP_BSTRING, u_int8_t)
+   PACKSTRING(OP_WSTRING, u_int16_t)
+   PACKSTRING(OP_SSTRING, u_int32_t)
    PACKNUMBER(OP_NUMBER, lua_Number)
    PACKNUMBER(OP_DOUBLE, double)
    PACKNUMBER(OP_FLOAT, float)
-   PACKNUMBER(OP_CHAR, char)
-   PACKNUMBER(OP_BYTE, unsigned char)
-   PACKNUMBER(OP_SHORT, short)
-   PACKNUMBER(OP_USHORT, unsigned short)
-   PACKNUMBER(OP_INT, int)
-   PACKNUMBER(OP_UINT, unsigned int)
-   PACKNUMBER(OP_LONG, long)
-   PACKNUMBER(OP_ULONG, unsigned long)
+   PACKNUMBER(OP_CHAR, int8_t)
+   PACKNUMBER(OP_BYTE, u_int8_t)
+   PACKNUMBER(OP_SHORT, int16_t)
+   PACKNUMBER(OP_USHORT, u_int16_t)
+   PACKNUMBER(OP_INT, int32_t)
+   PACKNUMBER(OP_UINT, u_int32_t)
+   PACKNUMBER(OP_LONG, int64_t)
+   PACKNUMBER(OP_ULONG, u_int64_t)
    case OP_BINMSB:
      {
        unsigned char sbyte = 0;
Index: docs/scripting.xml
===================================================================
--- docs/scripting.xml  (revision 9487)
+++ docs/scripting.xml  (working copy)
@@ -900,21 +900,21 @@
                <row><entry><literal>B</literal></entry><entry>bit string</entry></row>
                <row><entry><literal>x</literal></entry><entry>null byte</entry></row>
                <row><entry><literal>z</literal></entry><entry>zero-terminated string</entry></row>
-               <row><entry><literal>p</literal></entry><entry>string preceded by length byte</entry></row>
-               <row><entry><literal>P</literal></entry><entry>string preceded by length word</entry></row>
-               <row><entry><literal>a</literal></entry><entry>string preceded by length size_t</entry></row>
+               <row><entry><literal>p</literal></entry><entry>string preceded by 1-byte integer length</entry></row>
+               <row><entry><literal>P</literal></entry><entry>string preceded by 2-byte integer length</entry></row>
+               <row><entry><literal>a</literal></entry><entry>string preceded by 4-byte integer length</entry></row>
                <row><entry><literal>A</literal></entry><entry>string</entry></row>
                <row><entry><literal>f</literal></entry><entry>float</entry></row>
                <row><entry><literal>d</literal></entry><entry>double</entry></row>
                <row><entry><literal>n</literal></entry><entry>Lua number</entry></row>
-               <row><entry><literal>c</literal></entry><entry>char</entry></row>
-               <row><entry><literal>C</literal></entry><entry>byte = unsigned char</entry></row>
-               <row><entry><literal>s</literal></entry><entry>short</entry></row>
-               <row><entry><literal>S</literal></entry><entry>unsigned short</entry></row>
-               <row><entry><literal>i</literal></entry><entry>int</entry></row>
-               <row><entry><literal>I</literal></entry><entry>unsigned int</entry></row>
-               <row><entry><literal>l</literal></entry><entry>long</entry></row>
-               <row><entry><literal>L</literal></entry><entry>unsigned long</entry></row>
+               <row><entry><literal>c</literal></entry><entry>char (1-byte integer)</entry></row>
+               <row><entry><literal>C</literal></entry><entry>byte = unsigned char (1-byte unsigned 
integer)</entry></row>
+               <row><entry><literal>s</literal></entry><entry>short (2-byte integer)</entry></row>
+               <row><entry><literal>S</literal></entry><entry>unsigned short (2-byte unsigned integer)</entry></row>
+               <row><entry><literal>i</literal></entry><entry>int (4-byte integer)</entry></row>
+               <row><entry><literal>I</literal></entry><entry>unsigned int (4-byte unsigned integer)</entry></row>
+               <row><entry><literal>l</literal></entry><entry>long (8-byte integer)</entry></row>
+               <row><entry><literal>L</literal></entry><entry>unsigned long (8-byte unsigned integer)</entry></row>
                <row><entry><literal>&lt;</literal></entry><entry>little endian modifier</entry></row>
                <row><entry><literal>&gt;</literal></entry><entry>big endian modifier</entry></row>
                <row><entry><literal>=</literal></entry><entry>native endian modifier</entry></row>


_______________________________________________
Sent through the nmap-dev mailing list
http://cgi.insecure.org/mailman/listinfo/nmap-dev
Archived at http://SecLists.Org