diff options
author | Geoff Thorpe <geoff@openssl.org> | 2004-05-17 19:14:22 +0000 |
---|---|---|
committer | Geoff Thorpe <geoff@openssl.org> | 2004-05-17 19:14:22 +0000 |
commit | 0f814687b95e5980744240b7a81672c89c255340 (patch) | |
tree | 7e65ceeb8d939a4ab4dbadb5170bb879a6c361cd | |
parent | f0eae953e2a02a92674e39f5ff087c1f67afd7dc (diff) | |
download | openssl-0f814687b95e5980744240b7a81672c89c255340.zip openssl-0f814687b95e5980744240b7a81672c89c255340.tar.gz openssl-0f814687b95e5980744240b7a81672c89c255340.tar.bz2 |
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.
-rw-r--r-- | crypto/asn1/a_enum.c | 1 | ||||
-rw-r--r-- | crypto/asn1/a_int.c | 1 | ||||
-rw-r--r-- | crypto/asn1/asn1.h | 4 | ||||
-rw-r--r-- | crypto/asn1/t_spki.c | 1 | ||||
-rw-r--r-- | crypto/asn1/x_bignum.c | 1 | ||||
-rw-r--r-- | crypto/asn1/x_long.c | 1 | ||||
-rw-r--r-- | crypto/dh/dh.h | 5 | ||||
-rw-r--r-- | crypto/dsa/dsa.h | 2 | ||||
-rw-r--r-- | crypto/ec/ec.h | 4 | ||||
-rw-r--r-- | crypto/ec/ec_lcl.h | 1 | ||||
-rw-r--r-- | crypto/ec/ectest.c | 1 | ||||
-rw-r--r-- | crypto/ecdh/ecdh.h | 4 | ||||
-rw-r--r-- | crypto/ecdh/ech_ossl.c | 1 | ||||
-rw-r--r-- | crypto/ecdsa/ecdsa.h | 4 | ||||
-rw-r--r-- | crypto/ecdsa/ecs_lib.c | 1 | ||||
-rw-r--r-- | crypto/ecdsa/ecs_ossl.c | 1 | ||||
-rw-r--r-- | crypto/evp/evp_pkey.c | 1 | ||||
-rw-r--r-- | crypto/pkcs12/p12_key.c | 2 | ||||
-rw-r--r-- | crypto/rsa/rsa.h | 4 | ||||
-rw-r--r-- | crypto/rsa/rsa_test.c | 1 | ||||
-rw-r--r-- | crypto/x509v3/v3_utl.c | 1 |
21 files changed, 33 insertions, 9 deletions
diff --git a/crypto/asn1/a_enum.c b/crypto/asn1/a_enum.c index d9db53f..49f9e99 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 5d76de7..c81fa00 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 dbf0f63..f7bb935 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 67b0cc9..e84bae6 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 a80532c..869c05d 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 71774fa..0db233c 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 28a1b42..312340e 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 cdb1945..068e18c 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 db15a81..b3267df 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 9becad8..30632ba 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 9944d63..b96feae 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 1a62a21..f9189e0 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 c7633ba..d61e54f 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 a57ba0f..e6081bb 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 6ce5d92..d553ea1 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 7e4b61f..712f666 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 dd63e09..e81b810 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 9196a34..18e72d0 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 5bf862c..00a7873 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 236842a..6f0a28a 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 a2bb7b0..191cfef 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); |