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/ecdh | |
| 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/ecdh')
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_err.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_lib.c | 7 | ||||
| -rw-r--r-- | src/lib/libcrypto/ecdh/ech_ossl.c | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ecdh/ech_err.c b/src/lib/libcrypto/ecdh/ech_err.c index c44f364a51..6b417a255d 100644 --- a/src/lib/libcrypto/ecdh/ech_err.c +++ b/src/lib/libcrypto/ecdh/ech_err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ech_err.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: ech_err.c,v 1.3 2014/07/10 22:45:57 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/ecdh.h> | 66 | #include <openssl/ecdh.h> |
| 64 | 67 | ||
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c index 99390c2373..e9fae9428b 100644 --- a/src/lib/libcrypto/ecdh/ech_lib.c +++ b/src/lib/libcrypto/ecdh/ech_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ech_lib.c,v 1.6 2014/07/09 11:10:50 bcook Exp $ */ | 1 | /* $OpenBSD: ech_lib.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. |
| 4 | * | 4 | * |
| @@ -67,8 +67,11 @@ | |||
| 67 | * | 67 | * |
| 68 | */ | 68 | */ |
| 69 | 69 | ||
| 70 | #include "ech_locl.h" | ||
| 71 | #include <string.h> | 70 | #include <string.h> |
| 71 | |||
| 72 | #include <openssl/opensslconf.h> | ||
| 73 | |||
| 74 | #include "ech_locl.h" | ||
| 72 | #ifndef OPENSSL_NO_ENGINE | 75 | #ifndef OPENSSL_NO_ENGINE |
| 73 | #include <openssl/engine.h> | 76 | #include <openssl/engine.h> |
| 74 | #endif | 77 | #endif |
diff --git a/src/lib/libcrypto/ecdh/ech_ossl.c b/src/lib/libcrypto/ecdh/ech_ossl.c index dc99eec79e..aa22ccafa2 100644 --- a/src/lib/libcrypto/ecdh/ech_ossl.c +++ b/src/lib/libcrypto/ecdh/ech_ossl.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ech_ossl.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: ech_ossl.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. |
| 4 | * | 4 | * |
| @@ -67,9 +67,10 @@ | |||
| 67 | * | 67 | * |
| 68 | */ | 68 | */ |
| 69 | 69 | ||
| 70 | |||
| 71 | #include <string.h> | ||
| 72 | #include <limits.h> | 70 | #include <limits.h> |
| 71 | #include <string.h> | ||
| 72 | |||
| 73 | #include <openssl/opensslconf.h> | ||
| 73 | 74 | ||
| 74 | #include "cryptlib.h" | 75 | #include "cryptlib.h" |
| 75 | 76 | ||