diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
| commit | cf1b7d96647d55e533f779e476e3d4371f40445a (patch) | |
| tree | f7d6534cf77223190eaefe68d9e192d3d1246206 /crypto/dh/dh.h | |
| parent | 649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff) | |
| download | openssl-cf1b7d96647d55e533f779e476e3d4371f40445a.tar.gz | |
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting
with "OPENSSL_" to avoid conflicts with other packages and by making
sure e_os2.h will cover all platform-specific cases together with
opensslconf.h.
I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.
Diffstat (limited to 'crypto/dh/dh.h')
| -rw-r--r-- | crypto/dh/dh.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index 7e732e1c32..2b9a059373 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -59,11 +59,11 @@ #ifndef HEADER_DH_H #define HEADER_DH_H -#ifdef NO_DH +#ifdef OPENSSL_NO_DH #error DH is disabled. #endif -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif #include <openssl/bn.h> @@ -178,10 +178,10 @@ int DH_generate_key(DH *dh); int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh); DH * d2i_DHparams(DH **a,const unsigned char **pp, long length); int i2d_DHparams(const DH *a,unsigned char **pp); -#ifndef NO_FP_API +#ifndef OPENSSL_NO_FP_API int DHparams_print_fp(FILE *fp, const DH *x); #endif -#ifndef NO_BIO +#ifndef OPENSSL_NO_BIO int DHparams_print(BIO *bp, const DH *x); #else int DHparams_print(char *bp, const DH *x); |