From 57d859eb0f9fb43d2fdf5eeeab63e25976de48ab Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 24 May 2014 13:02:32 +0000
Subject: Include <openssl/opensslconf.h> - currently ssl.h is relying on it
 being pulled in elsewhere, even though it is makes use of the OPENSSL_NO_*
 defines. While here, remove kssl.h since it is a no-op.

ok beck@ miod@
---
 src/lib/libssl/src/ssl/ssl.h | 3 ++-
 src/lib/libssl/ssl.h         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 98c7cfaa38..9744d9783c 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -143,6 +143,8 @@
 #ifndef HEADER_SSL_H 
 #define HEADER_SSL_H 
 
+#include <openssl/opensslconf.h>
+
 #ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
 #endif
@@ -160,7 +162,6 @@
 #include <openssl/pem.h>
 #include <openssl/hmac.h>
 
-#include <openssl/kssl.h>
 #include <openssl/safestack.h>
 
 #ifdef  __cplusplus
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 98c7cfaa38..9744d9783c 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -143,6 +143,8 @@
 #ifndef HEADER_SSL_H 
 #define HEADER_SSL_H 
 
+#include <openssl/opensslconf.h>
+
 #ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
 #endif
@@ -160,7 +162,6 @@
 #include <openssl/pem.h>
 #include <openssl/hmac.h>
 
-#include <openssl/kssl.h>
 #include <openssl/safestack.h>
 
 #ifdef  __cplusplus
-- 
cgit v1.2.3-55-g6feb