summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-05-24 13:02:32 +0000
committerjsing <>2014-05-24 13:02:32 +0000
commit57d859eb0f9fb43d2fdf5eeeab63e25976de48ab (patch)
tree2891f3cb03bc7599c533b34d987290fb634e4e41 /src
parent52c89a2661760a5549aeb55a62ea9957c3379e64 (diff)
downloadopenbsd-57d859eb0f9fb43d2fdf5eeeab63e25976de48ab.tar.gz
openbsd-57d859eb0f9fb43d2fdf5eeeab63e25976de48ab.tar.bz2
openbsd-57d859eb0f9fb43d2fdf5eeeab63e25976de48ab.zip
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@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl.h3
-rw-r--r--src/lib/libssl/ssl.h3
2 files changed, 4 insertions, 2 deletions
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 @@
143#ifndef HEADER_SSL_H 143#ifndef HEADER_SSL_H
144#define HEADER_SSL_H 144#define HEADER_SSL_H
145 145
146#include <openssl/opensslconf.h>
147
146#ifndef OPENSSL_NO_COMP 148#ifndef OPENSSL_NO_COMP
147#include <openssl/comp.h> 149#include <openssl/comp.h>
148#endif 150#endif
@@ -160,7 +162,6 @@
160#include <openssl/pem.h> 162#include <openssl/pem.h>
161#include <openssl/hmac.h> 163#include <openssl/hmac.h>
162 164
163#include <openssl/kssl.h>
164#include <openssl/safestack.h> 165#include <openssl/safestack.h>
165 166
166#ifdef __cplusplus 167#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 @@
143#ifndef HEADER_SSL_H 143#ifndef HEADER_SSL_H
144#define HEADER_SSL_H 144#define HEADER_SSL_H
145 145
146#include <openssl/opensslconf.h>
147
146#ifndef OPENSSL_NO_COMP 148#ifndef OPENSSL_NO_COMP
147#include <openssl/comp.h> 149#include <openssl/comp.h>
148#endif 150#endif
@@ -160,7 +162,6 @@
160#include <openssl/pem.h> 162#include <openssl/pem.h>
161#include <openssl/hmac.h> 163#include <openssl/hmac.h>
162 164
163#include <openssl/kssl.h>
164#include <openssl/safestack.h> 165#include <openssl/safestack.h>
165 166
166#ifdef __cplusplus 167#ifdef __cplusplus