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 | |
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')
-rw-r--r-- | src/lib/libcrypto/x509v3/ext_dat.h | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_addr.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_asid.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_ocsp.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_purp.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3err.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/x509v3.h | 4 |
7 files changed, 24 insertions, 7 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; |
diff --git a/src/lib/libcrypto/x509v3/v3_addr.c b/src/lib/libcrypto/x509v3/v3_addr.c index 3fb43603c0..9099994dc4 100644 --- a/src/lib/libcrypto/x509v3/v3_addr.c +++ b/src/lib/libcrypto/x509v3/v3_addr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_addr.c,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */ | 1 | /* $OpenBSD: v3_addr.c,v 1.11 2014/07/10 22:45:58 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Contributed to the OpenSSL Project by the American Registry for | 3 | * Contributed to the OpenSSL Project by the American Registry for |
4 | * Internet Numbers ("ARIN"). | 4 | * Internet Numbers ("ARIN"). |
@@ -63,6 +63,8 @@ | |||
63 | #include <stdio.h> | 63 | #include <stdio.h> |
64 | #include <stdlib.h> | 64 | #include <stdlib.h> |
65 | 65 | ||
66 | #include <openssl/opensslconf.h> | ||
67 | |||
66 | #include "cryptlib.h" | 68 | #include "cryptlib.h" |
67 | #include <openssl/conf.h> | 69 | #include <openssl/conf.h> |
68 | #include <openssl/asn1.h> | 70 | #include <openssl/asn1.h> |
diff --git a/src/lib/libcrypto/x509v3/v3_asid.c b/src/lib/libcrypto/x509v3/v3_asid.c index b3245c9fe1..473304c1e5 100644 --- a/src/lib/libcrypto/x509v3/v3_asid.c +++ b/src/lib/libcrypto/x509v3/v3_asid.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_asid.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ | 1 | /* $OpenBSD: v3_asid.c,v 1.9 2014/07/10 22:45:58 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Contributed to the OpenSSL Project by the American Registry for | 3 | * Contributed to the OpenSSL Project by the American Registry for |
4 | * Internet Numbers ("ARIN"). | 4 | * Internet Numbers ("ARIN"). |
@@ -62,6 +62,9 @@ | |||
62 | 62 | ||
63 | #include <stdio.h> | 63 | #include <stdio.h> |
64 | #include <string.h> | 64 | #include <string.h> |
65 | |||
66 | #include <openssl/opensslconf.h> | ||
67 | |||
65 | #include "cryptlib.h" | 68 | #include "cryptlib.h" |
66 | #include <openssl/conf.h> | 69 | #include <openssl/conf.h> |
67 | #include <openssl/asn1.h> | 70 | #include <openssl/asn1.h> |
diff --git a/src/lib/libcrypto/x509v3/v3_ocsp.c b/src/lib/libcrypto/x509v3/v3_ocsp.c index ca3fc51c77..0406c83be3 100644 --- a/src/lib/libcrypto/x509v3/v3_ocsp.c +++ b/src/lib/libcrypto/x509v3/v3_ocsp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_ocsp.c,v 1.8 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: v3_ocsp.c,v 1.9 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 | */ |
@@ -59,6 +59,8 @@ | |||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <string.h> | 60 | #include <string.h> |
61 | 61 | ||
62 | #include <openssl/opensslconf.h> | ||
63 | |||
62 | #ifndef OPENSSL_NO_OCSP | 64 | #ifndef OPENSSL_NO_OCSP |
63 | 65 | ||
64 | #include "cryptlib.h" | 66 | #include "cryptlib.h" |
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c index 02538335ae..0d4b9aae64 100644 --- a/src/lib/libcrypto/x509v3/v3_purp.c +++ b/src/lib/libcrypto/x509v3/v3_purp.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3_purp.c,v 1.19 2014/07/10 13:58:23 jsing Exp $ */ | 1 | /* $OpenBSD: v3_purp.c,v 1.20 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 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -59,6 +59,8 @@ | |||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <string.h> | 60 | #include <string.h> |
61 | 61 | ||
62 | #include <openssl/opensslconf.h> | ||
63 | |||
62 | #include "cryptlib.h" | 64 | #include "cryptlib.h" |
63 | #include <openssl/x509v3.h> | 65 | #include <openssl/x509v3.h> |
64 | #include <openssl/x509_vfy.h> | 66 | #include <openssl/x509_vfy.h> |
diff --git a/src/lib/libcrypto/x509v3/v3err.c b/src/lib/libcrypto/x509v3/v3err.c index eaa7cdf8d5..a49632a069 100644 --- a/src/lib/libcrypto/x509v3/v3err.c +++ b/src/lib/libcrypto/x509v3/v3err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: v3err.c,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */ | 1 | /* $OpenBSD: v3err.c,v 1.11 2014/07/10 22:45:58 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2007 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/x509v3.h> | 66 | #include <openssl/x509v3.h> |
64 | 67 | ||
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h index 73ef3ecc57..a88223cd9b 100644 --- a/src/lib/libcrypto/x509v3/x509v3.h +++ b/src/lib/libcrypto/x509v3/x509v3.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509v3.h,v 1.14 2014/06/12 15:49:31 deraadt Exp $ */ | 1 | /* $OpenBSD: x509v3.h,v 1.15 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 | */ |
@@ -58,6 +58,8 @@ | |||
58 | #ifndef HEADER_X509V3_H | 58 | #ifndef HEADER_X509V3_H |
59 | #define HEADER_X509V3_H | 59 | #define HEADER_X509V3_H |
60 | 60 | ||
61 | #include <openssl/opensslconf.h> | ||
62 | |||
61 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
62 | #include <openssl/x509.h> | 64 | #include <openssl/x509.h> |
63 | #include <openssl/conf.h> | 65 | #include <openssl/conf.h> |