aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crypto/asn1/a_enum.c1
-rw-r--r--crypto/asn1/a_int.c1
-rw-r--r--crypto/asn1/asn1.h4
-rw-r--r--crypto/asn1/t_spki.c1
-rw-r--r--crypto/asn1/x_bignum.c1
-rw-r--r--crypto/asn1/x_long.c1
-rw-r--r--crypto/dh/dh.h5
-rw-r--r--crypto/dsa/dsa.h2
-rw-r--r--crypto/ec/ec.h4
-rw-r--r--crypto/ec/ec_lcl.h1
-rw-r--r--crypto/ec/ectest.c1
-rw-r--r--crypto/ecdh/ecdh.h4
-rw-r--r--crypto/ecdh/ech_ossl.c1
-rw-r--r--crypto/ecdsa/ecdsa.h4
-rw-r--r--crypto/ecdsa/ecs_lib.c1
-rw-r--r--crypto/ecdsa/ecs_ossl.c1
-rw-r--r--crypto/evp/evp_pkey.c1
-rw-r--r--crypto/pkcs12/p12_key.c2
-rw-r--r--crypto/rsa/rsa.h4
-rw-r--r--crypto/rsa/rsa_test.c1
-rw-r--r--crypto/x509v3/v3_utl.c1
21 files changed, 33 insertions, 9 deletions
diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c
index d9db53f01d..49f9e994be 100644
--- a/crypto/asn1/a_enum.c
+++ b/crypto/asn1/a_enum.c
@@ -59,6 +59,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/asn1.h>
+#include <openssl/bn.h>
/*
* Code for ENUMERATED type: identical to INTEGER apart from a different tag.
diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c
index 5d76de79ba..c81fa00c4c 100644
--- a/crypto/asn1/a_int.c
+++ b/crypto/asn1/a_int.c
@@ -59,6 +59,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/asn1.h>
+#include <openssl/bn.h>
ASN1_INTEGER *ASN1_INTEGER_dup(ASN1_INTEGER *x)
{ return M_ASN1_INTEGER_dup(x);}
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index dbf0f636e2..f7bb935e07 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -64,13 +64,15 @@
#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#endif
-#include <openssl/bn.h>
#include <openssl/stack.h>
#include <openssl/safestack.h>
#include <openssl/symhacks.h>
#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
#ifdef OPENSSL_BUILD_SHLIBCRYPTO
# undef OPENSSL_EXTERN
diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c
index 67b0cc9f00..e84bae6438 100644
--- a/crypto/asn1/t_spki.c
+++ b/crypto/asn1/t_spki.c
@@ -62,6 +62,7 @@
#include <openssl/asn1.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
+#include <openssl/bn.h>
/* Print out an SPKI */
diff --git a/crypto/asn1/x_bignum.c b/crypto/asn1/x_bignum.c
index a80532cefc..869c05d931 100644
--- a/crypto/asn1/x_bignum.c
+++ b/crypto/asn1/x_bignum.c
@@ -59,6 +59,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/asn1t.h>
+#include <openssl/bn.h>
/* Custom primitive type for BIGNUM handling. This reads in an ASN1_INTEGER as a
* BIGNUM directly. Currently it ignores the sign which isn't a problem since all
diff --git a/crypto/asn1/x_long.c b/crypto/asn1/x_long.c
index 71774fa33d..0db233cb95 100644
--- a/crypto/asn1/x_long.c
+++ b/crypto/asn1/x_long.c
@@ -59,6 +59,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/asn1t.h>
+#include <openssl/bn.h>
/* Custom primitive type for long handling. This converts between an ASN1_INTEGER
* and a long directly.
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h
index 28a1b4208d..312340e9f3 100644
--- a/crypto/dh/dh.h
+++ b/crypto/dh/dh.h
@@ -68,9 +68,10 @@
#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#endif
-#include <openssl/bn.h>
-#include <openssl/crypto.h>
#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
#define DH_FLAG_CACHE_MONT_P 0x01
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index cdb19457fb..068e18cb18 100644
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -74,11 +74,11 @@
#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#endif
-#include <openssl/bn.h>
#include <openssl/crypto.h>
#include <openssl/ossl_typ.h>
#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
#endif
diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index db15a81938..b3267df62b 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -78,9 +78,11 @@
#error EC is disabled.
#endif
-#include <openssl/bn.h>
#include <openssl/asn1.h>
#include <openssl/symhacks.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
#ifdef __cplusplus
extern "C" {
diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h
index 9becad8283..30632ba915 100644
--- a/crypto/ec/ec_lcl.h
+++ b/crypto/ec/ec_lcl.h
@@ -74,6 +74,7 @@
#include <openssl/obj_mac.h>
#include <openssl/ec.h>
+#include <openssl/bn.h>
#if defined(__SUNPRO_C)
# if __SUNPRO_C >= 0x520
diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 9944d632c9..b96feae7f3 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -93,6 +93,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
#include <openssl/obj_mac.h>
#include <openssl/objects.h>
#include <openssl/rand.h>
+#include <openssl/bn.h>
#define ABORT do { \
fflush(stdout); \
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));
diff --git a/crypto/ecdsa/ecdsa.h b/crypto/ecdsa/ecdsa.h
index a57ba0f14f..e6081bb2af 100644
--- a/crypto/ecdsa/ecdsa.h
+++ b/crypto/ecdsa/ecdsa.h
@@ -65,9 +65,11 @@
#error ECDSA 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/ecdsa/ecs_lib.c b/crypto/ecdsa/ecs_lib.c
index 6ce5d927ca..d553ea1cd6 100644
--- a/crypto/ecdsa/ecs_lib.c
+++ b/crypto/ecdsa/ecs_lib.c
@@ -57,6 +57,7 @@
#include "ecdsa.h"
#include <openssl/engine.h>
#include <openssl/err.h>
+#include <openssl/bn.h>
const char *ECDSA_version="ECDSA" OPENSSL_VERSION_PTEXT;
diff --git a/crypto/ecdsa/ecs_ossl.c b/crypto/ecdsa/ecs_ossl.c
index 7e4b61fdef..712f666641 100644
--- a/crypto/ecdsa/ecs_ossl.c
+++ b/crypto/ecdsa/ecs_ossl.c
@@ -59,6 +59,7 @@
#include "ecdsa.h"
#include <openssl/err.h>
#include <openssl/obj_mac.h>
+#include <openssl/bn.h>
static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dlen,
EC_KEY *eckey);
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index dd63e09e55..e81b810dea 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -63,6 +63,7 @@
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/dsa.h>
+#include <openssl/bn.h>
#ifndef OPENSSL_NO_DSA
static int dsa_pkey2pkcs8(PKCS8_PRIV_KEY_INFO *p8inf, EVP_PKEY *pkey);
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index 9196a34b4a..18e72d0a1b 100644
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -59,7 +59,7 @@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/pkcs12.h>
-
+#include <openssl/bn.h>
/* Uncomment out this line to get debugging info about key generation */
/*#define DEBUG_KEYGEN*/
diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 5bf862cd68..00a7873f92 100644
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -64,9 +64,11 @@
#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#endif
-#include <openssl/bn.h>
#include <openssl/crypto.h>
#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
#ifdef OPENSSL_NO_RSA
#error RSA is disabled.
diff --git a/crypto/rsa/rsa_test.c b/crypto/rsa/rsa_test.c
index 236842a634..6f0a28aa25 100644
--- a/crypto/rsa/rsa_test.c
+++ b/crypto/rsa/rsa_test.c
@@ -8,6 +8,7 @@
#include <openssl/crypto.h>
#include <openssl/err.h>
#include <openssl/rand.h>
+#include <openssl/bn.h>
#ifdef OPENSSL_NO_RSA
int main(int argc, char *argv[])
{
diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index a2bb7b0043..191cfef1a5 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -63,6 +63,7 @@
#include "cryptlib.h"
#include <openssl/conf.h>
#include <openssl/x509v3.h>
+#include <openssl/bn.h>
static char *strip_spaces(char *name);
static int sk_strcmp(const char * const *a, const char * const *b);