From 53e95716f5c11a8a9cbdcbbb3be0e8e538b5a2ea Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Wed, 17 Dec 2014 13:30:41 +0000
Subject: Change all instances of OPENSSL_NO_DEPRECATED to
 OPENSSL_USE_DEPRECATED Introduce use of DECLARE_DEPRECATED

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 crypto/dsa/dsa.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'crypto/dsa')

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,
-- 
cgit v1.2.3