From: jsing <jsing@openbsd.org>
Date: Sat, 24 May 2014 13:02:32 +0000 (+0000)
Subject: Include <openssl/opensslconf.h> - currently ssl.h is relying on it being
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6078dbb70fd9437aaedd8e960ef5267d969681a5;p=openbsd

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@
---

diff --git a/lib/libssl/src/ssl/ssl.h b/lib/libssl/src/ssl/ssl.h
index 98c7cfaa380..9744d9783cd 100644
--- a/lib/libssl/src/ssl/ssl.h
+++ b/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/lib/libssl/ssl.h b/lib/libssl/ssl.h
index 98c7cfaa380..9744d9783cd 100644
--- a/lib/libssl/ssl.h
+++ b/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