diff options
author | Richard Levitte <levitte@openssl.org> | 2000-06-09 10:41:35 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2000-06-09 10:41:35 +0000 |
commit | ef33b97050f8157234abe6d5f2da3da1cdda6d68 (patch) | |
tree | a2bb6602fdec189c9acae86bba54d7c1aaac4148 /crypto/dh/dh.h | |
parent | 814ed26cfa66945a537f2764f543340845e561a5 (diff) | |
download | openssl-ef33b97050f8157234abe6d5f2da3da1cdda6d68.tar.gz |
Using checks of the existence of HEADER_{foo}_H in other header files
was a really bad idea. For example, the following:
#include <x509.h>
#include <bio.h>
#include <asn1.h>
would make sure that things like ASN1_UTCTIME_print() wasn't defined
unless you moved the inclusion of bio.h to above the inclusion of
x509.h. The reason is that x509.h includes asn1.h, and the
declaration of ASN1_UTCTIME_print() depended on the definition of
HEADER_BIO_H. That's what I call an obscure bug.
Instead, this change makes sure that whatever header files are needed
for the correct process of one header file are included automagically,
and that the definitions of, for example, BIO-related things are
dependent on the absence of the NO_{foo} macros. This is also
consistent with the way parts of OpenSSL can be excluded at will.
Diffstat (limited to 'crypto/dh/dh.h')
-rw-r--r-- | crypto/dh/dh.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index 19bd570309..a15fc1c65f 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -63,6 +63,9 @@ #error DH is disabled. #endif +#ifndef NO_BIO +#include <openssl/bio.h> +#endif #include <openssl/bn.h> #include <openssl/crypto.h> @@ -169,7 +172,7 @@ int i2d_DHparams(DH *a,unsigned char **pp); #ifndef NO_FP_API int DHparams_print_fp(FILE *fp, DH *x); #endif -#ifdef HEADER_BIO_H +#ifndef NO_BIO int DHparams_print(BIO *bp, DH *x); #else int DHparams_print(char *bp, DH *x); |