diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-10 22:45:59 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-10 22:45:59 +0000 |
| commit | 03bd4af8b64912d28ecf5845fced13e4926fe5a1 (patch) | |
| tree | ebcea9269eef6832b649e7fc5f08dc626d79f4b1 /lib/libcrypto/conf | |
| parent | c91dd69f085de982c70898116e3538397e189678 (diff) | |
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 'lib/libcrypto/conf')
| -rw-r--r-- | lib/libcrypto/conf/conf_err.c | 7 | ||||
| -rw-r--r-- | lib/libcrypto/conf/conf_mall.c | 5 | ||||
| -rw-r--r-- | lib/libcrypto/conf/conf_sap.c | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/lib/libcrypto/conf/conf_err.c b/lib/libcrypto/conf/conf_err.c index 5694103a791..a1a7cbe42e1 100644 --- a/lib/libcrypto/conf/conf_err.c +++ b/lib/libcrypto/conf/conf_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_err.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_err.c,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,8 +59,11 @@ */ #include <stdio.h> -#include <openssl/err.h> + +#include <openssl/opensslconf.h> + #include <openssl/conf.h> +#include <openssl/err.h> /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/lib/libcrypto/conf/conf_mall.c b/lib/libcrypto/conf/conf_mall.c index e964b84df07..5eef7a7d185 100644 --- a/lib/libcrypto/conf/conf_mall.c +++ b/lib/libcrypto/conf/conf_mall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_mall.c,v 1.7 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_mall.c,v 1.8 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/conf.h> diff --git a/lib/libcrypto/conf/conf_sap.c b/lib/libcrypto/conf/conf_sap.c index 7c46b2476fa..332b48ba5a3 100644 --- a/lib/libcrypto/conf/conf_sap.c +++ b/lib/libcrypto/conf/conf_sap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_sap.c,v 1.8 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_sap.c,v 1.9 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/conf.h> |