diff options
author | jsing <> | 2014-07-10 22:45:58 +0000 |
---|---|---|
committer | jsing <> | 2014-07-10 22:45:58 +0000 |
commit | c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5 (patch) | |
tree | 9101caa8789c6a2612e96fe7996efbe84f28f5a9 /src/lib/libcrypto/bio | |
parent | 81b6b7632b2207a2dbd7b6d803912ee3779176aa (diff) | |
download | openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.tar.gz openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.tar.bz2 openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.zip |
Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.
This also includes some miscellaneous sorting/tidying of headers.
Diffstat (limited to 'src/lib/libcrypto/bio')
-rw-r--r-- | src/lib/libcrypto/bio/bio_err.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_dgram.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/bio/bss_fd.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/libcrypto/bio/bio_err.c b/src/lib/libcrypto/bio/bio_err.c index 8307c1099f..80788585ba 100644 --- a/src/lib/libcrypto/bio/bio_err.c +++ b/src/lib/libcrypto/bio/bio_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bio_err.c,v 1.15 2014/06/22 14:41:10 jsing Exp $ */ | 1 | /* $OpenBSD: bio_err.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -59,6 +59,9 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include <stdio.h> | 61 | #include <stdio.h> |
62 | |||
63 | #include <openssl/opensslconf.h> | ||
64 | |||
62 | #include <openssl/err.h> | 65 | #include <openssl/err.h> |
63 | #include <openssl/bio.h> | 66 | #include <openssl/bio.h> |
64 | 67 | ||
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c index d06406aebd..d56b71ba27 100644 --- a/src/lib/libcrypto/bio/bss_dgram.c +++ b/src/lib/libcrypto/bio/bss_dgram.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_dgram.c,v 1.29 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_dgram.c,v 1.30 2014/07/10 22:45:56 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. |
@@ -67,6 +67,8 @@ | |||
67 | #include <string.h> | 67 | #include <string.h> |
68 | #include <unistd.h> | 68 | #include <unistd.h> |
69 | 69 | ||
70 | #include <openssl/opensslconf.h> | ||
71 | |||
70 | #include "cryptlib.h" | 72 | #include "cryptlib.h" |
71 | #include <openssl/bio.h> | 73 | #include <openssl/bio.h> |
72 | 74 | ||
diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c index 60efde91c9..6e8e8d0815 100644 --- a/src/lib/libcrypto/bio/bss_fd.c +++ b/src/lib/libcrypto/bio/bss_fd.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: bss_fd.c,v 1.15 2014/07/10 13:58:22 jsing Exp $ */ | 1 | /* $OpenBSD: bss_fd.c,v 1.16 2014/07/10 22:45:56 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 | * |
@@ -61,6 +61,8 @@ | |||
61 | #include <string.h> | 61 | #include <string.h> |
62 | #include <unistd.h> | 62 | #include <unistd.h> |
63 | 63 | ||
64 | #include <openssl/opensslconf.h> | ||
65 | |||
64 | #include "cryptlib.h" | 66 | #include "cryptlib.h" |
65 | 67 | ||
66 | #if defined(OPENSSL_NO_POSIX_IO) | 68 | #if defined(OPENSSL_NO_POSIX_IO) |