summaryrefslogtreecommitdiffstats
path: root/crypto/ecdh
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2004-05-17 19:14:22 +0000
committerGeoff Thorpe <geoff@openssl.org>2004-05-17 19:14:22 +0000
commit0f814687b95e5980744240b7a81672c89c255340 (patch)
tree7e65ceeb8d939a4ab4dbadb5170bb879a6c361cd /crypto/ecdh
parentf0eae953e2a02a92674e39f5ff087c1f67afd7dc (diff)
Deprecate the recursive includes of bn.h from various API headers (asn1.h,
dh.h, dsa.h, ec.h, ecdh.h, ecdsa.h, rsa.h), as the opaque bignum types are already declared in ossl_typ.h. Add explicit includes for bn.h in those C files that need access to structure internals or API functions+macros.
Diffstat (limited to 'crypto/ecdh')
-rw-r--r--crypto/ecdh/ecdh.h4
-rw-r--r--crypto/ecdh/ech_ossl.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/crypto/ecdh/ecdh.h b/crypto/ecdh/ecdh.h
index 1a62a214b3..f9189e09ca 100644
--- a/crypto/ecdh/ecdh.h
+++ b/crypto/ecdh/ecdh.h
@@ -75,9 +75,11 @@
#error ECDH is disabled.
#endif
-#include <openssl/bn.h>
#include <openssl/ec.h>
#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index c7633bac7f..d61e54f184 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -77,6 +77,7 @@
#include <openssl/err.h>
#include <openssl/sha.h>
#include <openssl/obj_mac.h>
+#include <openssl/bn.h>
static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key, EC_KEY *ecdh,
void *(*KDF)(void *in, size_t inlen, void *out, size_t outlen));