Add missing includes into openssl-compat.h

Before it depends from the caller #include appropriate headers (at least
for OPENSSL_VERSION_NUMBER), but let's make it independent.

Fixes: #574

diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index f7f5c0f188f92016faa7d6b0657d99bb217ea7c4..6a803a63c82c13111a02585deff7c0eaf3476fae 100644 (file)
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -63,7 +63,6 @@
 #include "bufferevent-internal.h"
 #include "log-internal.h"
 
-#include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include "openssl-compat.h"

diff --git a/openssl-compat.h b/openssl-compat.h
index 0f2dcb75d88fcbeeeeeedfb8ebf9a3f2f57f6296..bffd2593d0cded7b8ec81791a28889b382aa2756 100644 (file)
--- a/openssl-compat.h
+++ b/openssl-compat.h
@@ -1,6 +1,9 @@
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H
 
+#include <openssl/bio.h>
+#include "util-internal.h"
+
 #if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 
 static inline BIO_METHOD *BIO_meth_new(int type, const char *name)

diff --git a/sample/le-proxy.c b/sample/le-proxy.c
index c764afc7ecec2c69950a10af584cbf065cb5375a..4e1cf03390f8302909394a3562aa66d0e43896d9 100644 (file)
--- a/sample/le-proxy.c
+++ b/sample/le-proxy.c
@@ -31,7 +31,6 @@
 #include <event2/util.h>
 
 #include "util-internal.h"
-#include <openssl/bio.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>

diff --git a/test/regress_ssl.c b/test/regress_ssl.c
index 490853fcb0a4d8562122116eb1412e7ec991ff00..5004f7e83f72052ba315f16dbd4f52ad5393a68a 100644 (file)
--- a/test/regress_ssl.c
+++ b/test/regress_ssl.c
@@ -53,7 +53,6 @@
 #include "tinytest.h"
 #include "tinytest_macros.h"
 
-#include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include "openssl-compat.h"