Use DEPRECATEDIN_1_2_0 macro for DSA_sign_setup declaration

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6467)

diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c
index 7057ea5ab9287a2cbe8fffa7aa22958186f26d12..d8e2781f9c539a0592cfe48c1d45bf72536089f4 100644 (file)
--- a/crypto/dsa/dsa_sign.c
+++ b/crypto/dsa/dsa_sign.c
@@ -16,7 +16,9 @@ DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
     return dsa->meth->dsa_do_sign(dgst, dlen, dsa);
 }
 
     return dsa->meth->dsa_do_sign(dgst, dlen, dsa);
 }
 

+#if OPENSSL_API_COMPAT < 0x10200000L

 int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
 {
     return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp);
 }
 int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
 {
     return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp);
 }

+#endif

diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index e1be0ad82ec2d272add2ba3f61e8326b2d39b9d6..f347f71421ba963790bb91a5ca5e1ad25ee62d08 100644 (file)
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -99,7 +99,7 @@ int DSA_size(const DSA *);
 int DSA_bits(const DSA *d);
 int DSA_security_bits(const DSA *d);
         /* next 4 return -1 on error */
 int DSA_bits(const DSA *d);
 int DSA_security_bits(const DSA *d);
         /* next 4 return -1 on error */

-int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
+DEPRECATEDIN_1_2_0(int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp))

 int DSA_sign(int type, const unsigned char *dgst, int dlen,
              unsigned char *sig, unsigned int *siglen, DSA *dsa);
 int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
 int DSA_sign(int type, const unsigned char *dgst, int dlen,
              unsigned char *sig, unsigned int *siglen, DSA *dsa);
 int DSA_verify(int type, const unsigned char *dgst, int dgst_len,

diff --git a/util/libcrypto.num b/util/libcrypto.num
index f5122e2cfae440fdc87cd48638b874e160cd19f8..9ca14763bff79a54ccb53da52c265e52022003c2 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -728,7 +728,7 @@ BIO_snprintf                            726 1_1_0   EXIST::FUNCTION:
 EC_POINT_hex2point                      727    1_1_0   EXIST::FUNCTION:EC
 X509v3_get_ext_by_critical              728    1_1_0   EXIST::FUNCTION:
 ENGINE_get_default_RSA                  729    1_1_0   EXIST::FUNCTION:ENGINE
 EC_POINT_hex2point                      727    1_1_0   EXIST::FUNCTION:EC
 X509v3_get_ext_by_critical              728    1_1_0   EXIST::FUNCTION:
 ENGINE_get_default_RSA                  729    1_1_0   EXIST::FUNCTION:ENGINE

-DSA_sign_setup                          730    1_1_0   EXIST::FUNCTION:DSA
+DSA_sign_setup                          730    1_1_0   EXIST::FUNCTION:DEPRECATEDIN_1_2_0,DSA

 OPENSSL_sk_new_null                     731    1_1_0   EXIST::FUNCTION:
 PEM_read_PKCS8                          732    1_1_0   EXIST::FUNCTION:STDIO
 BN_mod_sqr                              733    1_1_0   EXIST::FUNCTION:
 OPENSSL_sk_new_null                     731    1_1_0   EXIST::FUNCTION:
 PEM_read_PKCS8                          732    1_1_0   EXIST::FUNCTION:STDIO
 BN_mod_sqr                              733    1_1_0   EXIST::FUNCTION: