Commit 0f814687 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

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.
parent f0eae953

crypto/asn1/a_enum.c

+1 −0
Original line number Diff line number Diff line
@@ -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.

crypto/asn1/a_int.c

+1 −0
Original line number Diff line number Diff line
@@ -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);}

crypto/asn1/asn1.h

+3 −1
Original line number Diff line number Diff line
@@ -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

crypto/asn1/t_spki.c

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#include <openssl/asn1.h>

#include <openssl/rsa.h>

#include <openssl/dsa.h>

#include <openssl/bn.h>



/* Print out an SPKI */

crypto/asn1/x_bignum.c

+1 −0
Original line number Diff line number Diff line
@@ -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