From: Richard Levitte Date: Thu, 19 Nov 2020 07:13:00 +0000 (+0100) Subject: RSA: Fix guard mixup X-Git-Tag: openssl-3.0.0-alpha9~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac2c4f657efa120cb1e19342fbf556aca589f5a4;p=thirdparty%2Fopenssl.git RSA: Fix guard mixup A OSSL_DEPRECATEDIN_0_9_8 function was surrounded by a OPENSSL_NO_DEPRECATED_3_0 guard. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/13448) --- diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index 2681d1a5439..31bd0b239e8 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -246,13 +246,17 @@ OSSL_DEPRECATEDIN_3_0 int RSA_test_flags(const RSA *r, int flags); OSSL_DEPRECATEDIN_3_0 void RSA_set_flags(RSA *r, int flags); OSSL_DEPRECATEDIN_3_0 int RSA_get_version(RSA *r); OSSL_DEPRECATEDIN_3_0 ENGINE *RSA_get0_engine(const RSA *r); +# endif /* !OPENSSL_NO_DEPRECATED_3_0 */ /* Deprecated version */ +# ifndef OPENSSL_NO_DEPRECATED_0_9_8 OSSL_DEPRECATEDIN_0_9_8 RSA *RSA_generate_key(int bits, unsigned long e, void (*callback) (int, int, void *), void *cb_arg); +# endif /* New version */ +# ifndef OPENSSL_NO_DEPRECATED_3_0 OSSL_DEPRECATEDIN_3_0 int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); /* Multi-prime version */ diff --git a/util/libcrypto.num b/util/libcrypto.num index 4b4c675207c..75d98a5fda5 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -3200,7 +3200,7 @@ d2i_ASN1_OCTET_STRING 3265 3_0_0 EXIST::FUNCTION: ENGINE_set_load_pubkey_function 3266 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE BIO_vprintf 3267 3_0_0 EXIST::FUNCTION: CMS_RecipientInfo_decrypt 3268 3_0_0 EXIST::FUNCTION:CMS -RSA_generate_key 3269 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,RSA +RSA_generate_key 3269 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_0_9_8,RSA PKCS7_set0_type_other 3270 3_0_0 EXIST::FUNCTION: OCSP_REQUEST_new 3271 3_0_0 EXIST::FUNCTION:OCSP BIO_lookup 3272 3_0_0 EXIST::FUNCTION:SOCK