Make some changes to allow a Windows build of the new openssl code. (Just

rearragement of some includes and defines.)

nse_init.cc

@@ -8,10 +8,6 @@
 #include "nse_pcrelib.h"
 #include "nse_bit.h"
 
-#ifdef HAVE_OPENSSL
-#include "nse_openssl.h"
-#endif
-
 #include "nse_binlib.h"
 
 #include "nbase.h"
@@ -22,6 +18,10 @@
 
 #include "errno.h"
 
+#ifdef HAVE_OPENSSL
+#include "nse_openssl.h"
+#endif
+
 #include <algorithm>
 
 extern NmapOps o;

nse_openssl.cc

@@ -1,10 +1,3 @@
-#ifdef WIN32
-#include "nmap_winconfig.h"
-#else
-#include "nmap_config.h"
-#endif
-
-
 /* OpenSSL library for lua
  * adapted from lmd5 library (http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/)
  * Original code written by Luiz Henrique de Figueiredo <lhf@tecgraf.puc-rio.br>
@@ -25,6 +18,8 @@
 #include <openssl/evp.h>
 
 #include "nse_openssl.h"
+#include "lua.h"
+#include "lauxlib.h"
 
 typedef struct bignum_data {
   BIGNUM * bn;

nse_openssl.h

@@ -1,7 +1,3 @@
-#include "../nmap_config.h"
-
-#if HAVE_OPENSSL
-
 #ifndef OPENSSLLIB
 #define OPENSSLLIB
 
@@ -15,5 +11,3 @@ extern "C" {
 LUALIB_API int luaopen_openssl(lua_State *L);
 
 #endif
-
-#endif