diff options
author | jsing <> | 2016-12-30 15:10:57 +0000 |
---|---|---|
committer | jsing <> | 2016-12-30 15:10:57 +0000 |
commit | 3dafaaa6898a7483168a8940c80b6bb2050262a3 (patch) | |
tree | dc2bb6569a6ccff5fc619e8f9f0f2b82bf96e03a | |
parent | 7cb5cc537bf1f81f4401e584185c508b46c4dc86 (diff) | |
download | openbsd-3dafaaa6898a7483168a8940c80b6bb2050262a3.tar.gz openbsd-3dafaaa6898a7483168a8940c80b6bb2050262a3.tar.bz2 openbsd-3dafaaa6898a7483168a8940c80b6bb2050262a3.zip |
Explicitly include openssl/opensslconf.h in headers that use OPENSSL_NO_*
defines - do not rely on another heading making those available for us.
-rw-r--r-- | src/lib/libssl/dtls1.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl3.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/dtls1.h b/src/lib/libssl/dtls1.h index 5aed28e99a..8ec0bb8421 100644 --- a/src/lib/libssl/dtls1.h +++ b/src/lib/libssl/dtls1.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dtls1.h,v 1.18 2015/09/10 17:57:50 jsing Exp $ */ | 1 | /* $OpenBSD: dtls1.h,v 1.19 2016/12/30 15:10:57 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -66,6 +66,7 @@ | |||
66 | #include <stdlib.h> | 66 | #include <stdlib.h> |
67 | #include <string.h> | 67 | #include <string.h> |
68 | 68 | ||
69 | #include <openssl/opensslconf.h> | ||
69 | #include <openssl/buffer.h> | 70 | #include <openssl/buffer.h> |
70 | 71 | ||
71 | #ifdef __cplusplus | 72 | #ifdef __cplusplus |
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h index 90fcae7914..c52c0a780e 100644 --- a/src/lib/libssl/ssl3.h +++ b/src/lib/libssl/ssl3.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl3.h,v 1.42 2016/12/21 16:44:31 jsing Exp $ */ | 1 | /* $OpenBSD: ssl3.h,v 1.43 2016/12/30 15:10:57 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -117,6 +117,7 @@ | |||
117 | #ifndef HEADER_SSL3_H | 117 | #ifndef HEADER_SSL3_H |
118 | #define HEADER_SSL3_H | 118 | #define HEADER_SSL3_H |
119 | 119 | ||
120 | #include <openssl/opensslconf.h> | ||
120 | #include <openssl/buffer.h> | 121 | #include <openssl/buffer.h> |
121 | #include <openssl/evp.h> | 122 | #include <openssl/evp.h> |
122 | #include <openssl/ssl.h> | 123 | #include <openssl/ssl.h> |