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/dsa | |
| parent | 5bafb04d2e8a792afbc97395410ef3291f3fbc8b (diff) | |
| download | openssl-53e95716f5c11a8a9cbdcbbb3be0e8e538b5a2ea.tar.gz | |
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/dsa')
| -rw-r--r-- | crypto/dsa/dsa.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h index 34d070421e..8feb2a1582 100644 --- a/crypto/dsa/dsa.h +++ b/crypto/dsa/dsa.h @@ -77,7 +77,7 @@ #include <openssl/crypto.h> #include <openssl/ossl_typ.h> -#ifndef OPENSSL_NO_DEPRECATED +#ifdef OPENSSL_USE_DEPRECATED #include <openssl/bn.h> #ifndef OPENSSL_NO_DH # include <openssl/dh.h> @@ -236,12 +236,12 @@ DSA * d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length); DSA * d2i_DSAparams(DSA **a, const unsigned char **pp, long length); /* Deprecated version */ -#ifndef OPENSSL_NO_DEPRECATED -DSA * DSA_generate_parameters(int bits, +#ifdef OPENSSL_USE_DEPRECATED +DECLARE_DEPRECATED(DSA * DSA_generate_parameters(int bits, unsigned char *seed,int seed_len, int *counter_ret, unsigned long *h_ret,void - (*callback)(int, int, void *),void *cb_arg); -#endif /* !defined(OPENSSL_NO_DEPRECATED) */ + (*callback)(int, int, void *),void *cb_arg)); +#endif /* defined(OPENSSL_USE_DEPRECATED) */ /* New version */ int DSA_generate_parameters_ex(DSA *dsa, int bits, |