152: Clean up libcrypto-compat declarations.

diff --git a/configure.in b/configure.in
index 173dded361373665f23c4dc2080c7e09bb3df3eb..a2ae2cd72ef5a330b6d0a54437575a6dd9624b83 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -470,7 +470,7 @@ if test "X$cf_enable_openssl" != "Xno" ; then
     cf_enable_openssl="yes"
     encryption="enabled"
     AC_DEFINE(HAVE_ENCRYPTION_ON)
-    ENCRYPT_SRC="rc4.c dh.c"
+    ENCRYPT_SRC="rc4.c dh.c libcrypto-compat.c"
     AC_SUBST(ENCRYPT_SRC)
   else
     AC_MSG_RESULT(not found.  Please check your path.)

diff --git a/include/libcrypto-compat.h b/include/libcrypto-compat.h
index 5a5e4439e0165007f2ccb693c3b2282ab46cebf7..4f0e0d4ca569b0fc42ee43ba59eaefc3c56a9b5e 100644 (file)
--- a/include/libcrypto-compat.h
+++ b/include/libcrypto-compat.h
@@ -1,6 +1,7 @@
 #ifndef LIBCRYPTO_COMPAT_H
 #define LIBCRYPTO_COMPAT_H
 
+#include <struct.h>
 #ifdef USE_SSL
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L

diff --git a/include/struct.h b/include/struct.h
index 7bf74d9cc45bdb7792658ee255c5c30ea2a46b19..179d87b104f8d8a6b684d5a309da05b516b2d91a 100644 (file)
--- a/include/struct.h
+++ b/include/struct.h
@@ -56,7 +56,6 @@
 #include <openssl/pem.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "libcrypto-compat.h"
 #endif
 
 #define REPORT_DO_DNS_    ":%s NOTICE AUTH :*** Looking up your hostname..."

diff --git a/src/Makefile.in b/src/Makefile.in
index cddc467f9ce005ff4cac7746689bd18dce3882c1..16fbb2cf2ddcb75fd2dab43a32d9aec3bf380cf1 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -18,7 +18,7 @@ RES_SRC =
 
 SOURCES = blalloc.c bsd.c channel.c clientlist.c clones.c confparse.c \
           fdlist.c fds.c hash.c hide.c inet_addr.c ircd.c \
-          klines.c libcrypto-compat.c list.c m_nick.c m_rwho.c m_server.c m_services.c \
+          klines.c list.c m_nick.c m_rwho.c m_server.c m_services.c \
           m_stats.c m_who.c match.c memcount.c modules.c packet.c parse.c pcre.c \
           probability.c res.c s_auth.c s_bsd.c s_conf.c s_debug.c s_err.c \
           s_misc.c s_numeric.c s_serv.c s_user.c sbuf.c scache.c send.c \

diff --git a/src/ircd.c b/src/ircd.c
index e524f0cf5cecf67a1862ae8670af18cf65591d09..e1a7c9c1f8cf17ff22aee01da1dfeb7f32af442f 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -47,7 +47,6 @@
 #include "hooks.h"
 #include "fds.h"
 #include "memcount.h"
-#include "libcrypto-compat.h"
 #include "spamfilter.h"
 
 aMotd      *motd;

diff --git a/src/libcrypto-compat.c b/src/libcrypto-compat.c
index c72818ae414f047d825bc172abf26a16053ffd7c..b8c32850d64c599d8d66ddf34f8a9c4db4e37eb7 100644 (file)
--- a/src/libcrypto-compat.c
+++ b/src/libcrypto-compat.c
@@ -7,9 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifdef USE_SSL
-
 #include "struct.h"
+#ifdef USE_SSL
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L