--- nmap-4.68-orig/Makefile.in 2008-05-31 05:24:50.000000000 +0200
+++ nmap-4.68/Makefile.in 2008-07-04 16:43:17.000000000 +0200
@@ -60,9 +60,9 @@ INSTALLZENMAP=@INSTALLZENMAP@
UNINSTALLZENMAP=@UNINSTALLZENMAP@
ifneq (@LIBLUA_LIBS@,)
-NSE_SRC=nse_main.cc nse_nsock.cc nse_init.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_string.cc
-NSE_HDRS=nse_main.h nse_nsock.h nse_init.h nse_fs.h nse_nmaplib.h nse_debug.h nse_macros.h nse_pcrelib.h nse_string.h
-NSE_OBJS=nse_main.o nse_nsock.o nse_init.o nse_fs.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_string.o
+NSE_SRC=nse_main.cc nse_nsock.cc nse_init.cc nse_fs.cc nse_nmaplib.cc nse_debug.cc nse_pcrelib.cc nse_string.cc nse_binlib.cc
+NSE_HDRS=nse_main.h nse_nsock.h nse_init.h nse_fs.h nse_nmaplib.h nse_debug.h nse_macros.h nse_pcrelib.h nse_string.h nse_binlib.h
+NSE_OBJS=nse_main.o nse_nsock.o nse_init.o nse_fs.o nse_nmaplib.o nse_debug.o nse_pcrelib.o nse_string.o nse_binlib.o
NSESTDLIB=nsestdlib
endif
--- nmap-4.68-orig/mswin32/nmap.vcproj 2008-06-29 06:52:00.000000000 +0200
+++ nmap-4.68/mswin32/nmap.vcproj 2008-07-04 17:00:29.000000000 +0200
@@ -287,6 +287,10 @@
>
+
+
@@ -476,6 +480,10 @@
>
+
+
--- nmap-4.68-orig/nse_binlib.cc 1970-01-01 01:00:00.000000000 +0100
+++ nmap-4.68/nse_binlib.cc 2008-07-04 16:41:48.000000000 +0200
@@ -0,0 +1,407 @@
+/*
+ * -- nse_packlib.cc
+ * -- adapted from:
+ * lpack.c
+ * a Lua library for packing and unpacking binary data
+ * Luiz Henrique de Figueiredo
+ * 29 Jun 2007 19:27:20
+ * This code is hereby placed in the public domain.
+ * with contributions from Ignacio Castaño and
+ * Roberto Ierusalimschy .
+ * -- modified:
+ * BinStringHandling
+*/
+
+#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_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_LITTLEENDIAN '<' /* little endian */
+#define OP_BIGENDIAN '>' /* big endian */
+#define OP_NATIVE '=' /* native endian */
+
+#define OP_BINMSB 'B'
+
+#define OP_HEX 'H'
+
+#define OP_NULL 'x'
+
+
+#include
+#include
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}
+#include "nse_binlib.h"
+
+static void badcode(lua_State *L, int c)
+{
+ char s[]="bad code `?'";
+ s[sizeof(s)-3]=c;
+ luaL_argerror(L,1,s);
+}
+
+static int doendian(int c)
+{
+ int x=1;
+ int e=*(char*)&x;
+ if (c==OP_LITTLEENDIAN) return !e;
+ if (c==OP_BIGENDIAN) return e;
+ if (c==OP_NATIVE) return 0;
+ return 0;
+}
+
+static void doswap(int swap, void *p, size_t n)
+{
+ if (swap)
+ {
+ char *a=(char*)p;
+ int i,j;
+ for (i=0, j=n-1, n=n/2; n--; i++, j--)
+ {
+ char t=a[i]; a[i]=a[j]; a[j]=t;
+ }
+ }
+}
+
+#define UNPACKNUMBER(OP,T) \
+ case OP: \
+ { \
+ T a; \
+ int m=sizeof(a); \
+ if (i+m>len) { done = 1; break;} \
+ memcpy(&a,s+i,m); \
+ i+=m; \
+ doswap(swap,&a,m); \
+ lua_pushnumber(L,(lua_Number)a); \
+ ++n; \
+ break; \
+ }
+
+#define UNPACKSTRING(OP,T) \
+ case OP: \
+ { \
+ T l; \
+ int m=sizeof(l); \
+ if (i+m>len) { done = 1; break; } \
+ memcpy(&l,s+i,m); \
+ doswap(swap,&l,m); \
+ if (i+m+l>len) { done = 1; break;} \
+ i+=m; \
+ lua_pushlstring(L,s+i,l); \
+ i+=l; \
+ ++n; \
+ break; \
+ }
+
+#define HEXDIGITS(DIG) \
+ "0123456789ABCDEF"[DIG]
+
+
+static int l_unpack(lua_State *L) /** unpack(f,s, [init]) */
+{
+ size_t len;
+ const char *s=luaL_checklstring(L,2,&len); /* switched s and f */
+ const char *f=luaL_checkstring(L,1);
+ int i=luaL_optnumber(L,3,1)-1;
+ int n=0;
+ int swap=0;
+ int done=0;
+ lua_pushnil(L);
+ while (*f && done == 0)
+ {
+ int c=*f++;
+ int N=1;
+ if (isdigit(*f))
+ {
+ N=0;
+ while (isdigit(*f)) N=10*N+(*f++)-'0';
+ if (N==0 && c==OP_STRING) { lua_pushliteral(L,""); ++n; }
+ }
+ while (N-- && done == 0) switch (c)
+ {
+ case OP_LITTLEENDIAN:
+ case OP_BIGENDIAN:
+ case OP_NATIVE:
+ {
+ swap=doendian(c);
+ N=0;
+ break;
+ }
+ case OP_STRING:
+ {
+ ++N;
+ if (i+N>len) {done = 1; break; }
+ lua_pushlstring(L,s+i,N);
+ i+=N;
+ ++n;
+ N=0;
+ break;
+ }
+ case OP_ZSTRING:
+ {
+ size_t l;
+ if (i>=len) {done = 1; break; }
+ l=strlen(s+i);
+ lua_pushlstring(L,s+i,l);
+ i+=l+1;
+ ++n;
+ break;
+ }
+ UNPACKSTRING(OP_BSTRING, unsigned char)
+ UNPACKSTRING(OP_WSTRING, unsigned short)
+ UNPACKSTRING(OP_SSTRING, size_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)
+
+ case OP_BINMSB:
+ {
+ luaL_Buffer buf;
+ luaL_buffinit(L,&buf);
+ unsigned char sbyte = 0x80;
+ N++;
+ if (i+N > len) {done = 1; break;}
+ for (int ii = i; ii < i+N; ii++) {
+ sbyte = 0x80;
+ for (int ij = 0; ij < 8; ij++) {
+ if (s[ii] & sbyte) {
+ luaL_addlstring(&buf, "1", 1);
+ } else {
+ luaL_addlstring(&buf, "0", 1);
+ }
+ sbyte = sbyte >> 1;
+ }
+ }
+ luaL_pushresult(&buf);
+ n++;
+ i += N;
+ N = 0;
+ break;
+ }
+
+ case OP_HEX:
+ {
+ luaL_Buffer buf;
+ char hdigit = '0';
+ int val = 0;
+ luaL_buffinit(L,&buf);
+ N++;
+ if (i+N > len) {done = 1; break;}
+ for (int ii = i; ii < i+N; ii++) {
+ val = s[ii] & 0xF0;
+ val = val >> 4;
+ hdigit = HEXDIGITS(val);
+ luaL_addlstring(&buf, &hdigit, 1);
+
+ val = s[ii] & 0x0F;
+ hdigit = HEXDIGITS(val);
+ luaL_addlstring(&buf, &hdigit, 1);
+ }
+ luaL_pushresult(&buf);
+ n++;
+ i += N;
+ N = 0;
+ break;
+ }
+ case OP_NULL:
+ {
+ i+= N + 1;
+ N = 0;
+ break;
+ }
+ case ' ': case ',':
+ break;
+ default:
+ badcode(L,c);
+ break;
+ }
+ }
+ lua_pushnumber(L,i+1);
+ lua_replace(L,-n-2);
+ return n+1;
+}
+
+#define PACKNUMBER(OP,T) \
+ case OP: \
+ { \
+ T a=(T)luaL_checknumber(L,i++); \
+ doswap(swap,&a,sizeof(a)); \
+ luaL_addlstring(&b,(char*)&a,sizeof(a)); \
+ break; \
+ }
+
+#define PACKSTRING(OP,T) \
+ case OP: \
+ { \
+ size_t l; \
+ const char *a=luaL_checklstring(L,i++,&l); \
+ T ll=(T)l; \
+ doswap(swap,&ll,sizeof(ll)); \
+ luaL_addlstring(&b,(char*)&ll,sizeof(ll)); \
+ luaL_addlstring(&b,a,l); \
+ break; \
+ }
+
+static int l_pack(lua_State *L) /** pack(f,...) */
+{
+ int i=2;
+ const char *f=luaL_checkstring(L,1);
+ int swap=0;
+ luaL_Buffer b;
+ luaL_buffinit(L,&b);
+ while (*f)
+ {
+ int c=*f++;
+ int N=1;
+ if (isdigit(*f))
+ {
+ N=0;
+ while (isdigit(*f)) N=10*N+(*f++)-'0';
+ }
+ while (N--) switch (c)
+ {
+ case OP_LITTLEENDIAN:
+ case OP_BIGENDIAN:
+ case OP_NATIVE:
+ {
+ swap=doendian(c);
+ N=0;
+ break;
+ }
+ case OP_STRING:
+ case OP_ZSTRING:
+ {
+ size_t l;
+ const char *a=luaL_checklstring(L,i++,&l);
+ luaL_addlstring(&b,a,l+(c==OP_ZSTRING));
+ break;
+ }
+ PACKSTRING(OP_BSTRING, unsigned char)
+ PACKSTRING(OP_WSTRING, unsigned short)
+ PACKSTRING(OP_SSTRING, size_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)
+ case OP_BINMSB:
+ {
+ unsigned char sbyte = 0;
+ size_t l;
+ int ii = 0, ia = 0;
+ const char *a = luaL_checklstring(L, i++, &l);
+ for (ia = 0; ia < l; ia+= 8) {
+ sbyte = 0;
+ for (ii = 0; ii+ia < l && ii < 8; ii++) {
+ sbyte = sbyte << 1;
+ if (a[ii+ia] != '0') {
+ sbyte++;
+ }
+ }
+ for (; ii < 8; ii++) {
+ sbyte = sbyte << 1;
+ }
+ luaL_addlstring(&b, (char *) &sbyte, 1);
+ }
+ break;
+ }
+
+ case OP_NULL:
+ {
+ char nullbyte = 0;
+ luaL_addlstring(&b, &nullbyte, 1);
+ break;
+ }
+
+ case OP_HEX:
+ { // doing digit parsing the lpack way
+ unsigned char sbyte = 0;
+ size_t l;
+ int ii = 0;
+ int odd = 0;
+ const char *a = luaL_checklstring(L, i++, &l);
+ for (ii = 0; ii < l; ii++) {
+ if (isxdigit(a[ii])) {
+ if (isdigit(a[ii])) {
+ sbyte += a[ii] - '0';
+ odd++;
+ } else if (a[ii] >= 'A' && a[ii] <= 'F') {
+ sbyte += a[ii] - 'A' + 10;
+ odd++;
+ } else if (a[ii] >= 'a' && a[ii] <= 'f') {
+ sbyte += a[ii] - 'a' + 10;
+ odd++;
+ }
+ if (odd == 1) {
+ sbyte = sbyte << 4;
+ } else if (odd == 2) {
+ luaL_addlstring(&b, (char *) &sbyte, 1);
+ sbyte = 0;
+ odd = 0;
+ }
+ } else if (isspace(a[ii])) {
+ /* ignore */
+ } else {
+ /* err ... ignore too*/
+ }
+ }
+ if (odd == 1) {
+ luaL_addlstring(&b, (char *) &sbyte, 1);
+ }
+ break;
+ }
+ case ' ': case ',':
+ break;
+ default:
+ badcode(L,c);
+ break;
+ }
+ }
+ luaL_pushresult(&b);
+ return 1;
+}
+
+static const luaL_reg binlib[] =
+{
+ {"pack", l_pack},
+ {"unpack", l_unpack},
+ {NULL, NULL}
+};
+
+/*
+** Open bin library
+*/
+LUALIB_API int luaopen_binlib (lua_State *L) {
+ luaL_register(L, NSE_BINLIBNAME, binlib);
+ return 1;
+}
+
--- nmap-4.68-orig/nse_binlib.h 1970-01-01 01:00:00.000000000 +0100
+++ nmap-4.68/nse_binlib.h 2008-07-04 16:41:48.000000000 +0200
@@ -0,0 +1,8 @@
+#ifndef NSE_BINLIB
+#define NSE_BINLIB
+
+#define NSE_BINLIBNAME "bin"
+
+LUALIB_API int luaopen_binlib (lua_State *L);
+
+#endif /* NSE_BINLIB */
--- nmap-4.68-orig/nse_init.cc 2008-06-21 15:33:53.000000000 +0200
+++ nmap-4.68/nse_init.cc 2008-07-04 16:39:35.000000000 +0200
@@ -6,6 +6,7 @@
// 3rd Party libs
#include "nse_pcrelib.h"
+#include "nse_binlib.h"
#include "nbase.h"
@@ -250,6 +251,7 @@ int init_lua (lua_State *L)
static const luaL_Reg libs[] = {
{NSE_PCRELIBNAME, luaopen_pcrelib}, // pcre library
{"nmap", luaopen_nmap} // nmap bindings
+ ,{NSE_BINLIBNAME, luaopen_binlib}
};
luaL_openlibs(L); // opens all standard libraries