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/x509v3/ext_dat.h | |
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/x509v3/ext_dat.h')
-rw-r--r-- | src/lib/libcrypto/x509v3/ext_dat.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509v3/ext_dat.h b/src/lib/libcrypto/x509v3/ext_dat.h index 36d535d42d..1111af2108 100644 --- a/src/lib/libcrypto/x509v3/ext_dat.h +++ b/src/lib/libcrypto/x509v3/ext_dat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ext_dat.h,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */ | 1 | /* $OpenBSD: ext_dat.h,v 1.11 2014/07/10 22:45:58 jsing Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
@@ -55,6 +55,9 @@ | |||
55 | * Hudson (tjh@cryptsoft.com). | 55 | * Hudson (tjh@cryptsoft.com). |
56 | * | 56 | * |
57 | */ | 57 | */ |
58 | |||
59 | #include <openssl/opensslconf.h> | ||
60 | |||
58 | /* This file contains a table of "standard" extensions */ | 61 | /* This file contains a table of "standard" extensions */ |
59 | 62 | ||
60 | extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; | 63 | extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; |