diff options
| author | Matt Caswell <matt@openssl.org> | 2014-12-17 13:30:41 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-12-18 19:57:14 +0000 |
| commit | 53e95716f5c11a8a9cbdcbbb3be0e8e538b5a2ea (patch) | |
| tree | bc12310b023becd6c88c456b5b59a2b301eeed4d /crypto/dh/dh.h | |
| parent | 5bafb04d2e8a792afbc97395410ef3291f3fbc8b (diff) | |
Change all instances of OPENSSL_NO_DEPRECATED to OPENSSL_USE_DEPRECATED
Introduce use of DECLARE_DEPRECATED
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/dh/dh.h')
| -rw-r--r-- | crypto/dh/dh.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index beaeac9212..3f7dca1284 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -69,7 +69,7 @@ #include <openssl/bio.h> #endif #include <openssl/ossl_typ.h> -#ifndef OPENSSL_NO_DEPRECATED +#ifdef OPENSSL_USE_DEPRECATED #include <openssl/bn.h> #endif @@ -204,10 +204,10 @@ int DH_set_ex_data(DH *d, int idx, void *arg); void *DH_get_ex_data(DH *d, int idx); /* Deprecated version */ -#ifndef OPENSSL_NO_DEPRECATED -DH * DH_generate_parameters(int prime_len,int generator, - void (*callback)(int,int,void *),void *cb_arg); -#endif /* !defined(OPENSSL_NO_DEPRECATED) */ +#ifdef OPENSSL_USE_DEPRECATED +DECLARE_DEPRECATED(DH * DH_generate_parameters(int prime_len,int generator, + void (*callback)(int,int,void *),void *cb_arg)); +#endif /* defined(OPENSSL_USE_DEPRECATED) */ /* New version */ int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb); |