diff --git a/nse_init.cc b/nse_init.cc index 78c5039f6..276f5e7aa 100644 --- a/nse_init.cc +++ b/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 extern NmapOps o; diff --git a/nse_openssl.cc b/nse_openssl.cc index 6acb3ed06..377fe075c 100644 --- a/nse_openssl.cc +++ b/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 @@ -25,6 +18,8 @@ #include #include "nse_openssl.h" +#include "lua.h" +#include "lauxlib.h" typedef struct bignum_data { BIGNUM * bn; diff --git a/nse_openssl.h b/nse_openssl.h index 834ded1fc..a0c3df5c1 100644 --- a/nse_openssl.h +++ b/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