From: slontis Date: Fri, 17 Feb 2023 03:00:12 +0000 (+1000) Subject: Remove ossl_rsa_pss_params_30_set_maskgenalg(). X-Git-Tag: openssl-3.2.0-alpha1~1211 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1735531c8ba7542e5fb2fe2f0becddb595955ace;p=thirdparty%2Fopenssl.git Remove ossl_rsa_pss_params_30_set_maskgenalg(). This is an unused internal function. It should be added back in if there is a need to set this value to something other than NID_mgf1 (which is not likely). Reviewed-by: Hugo Landau Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/20321) --- diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c index b59b44c421f..75fdef1f8c2 100644 --- a/crypto/rsa/rsa_pss.c +++ b/crypto/rsa/rsa_pss.c @@ -334,15 +334,6 @@ int ossl_rsa_pss_params_30_set_hashalg(RSA_PSS_PARAMS_30 *rsa_pss_params, return 1; } -int ossl_rsa_pss_params_30_set_maskgenalg(RSA_PSS_PARAMS_30 *rsa_pss_params, - int maskgenalg_nid) -{ - if (rsa_pss_params == NULL) - return 0; - rsa_pss_params->mask_gen.algorithm_nid = maskgenalg_nid; - return 1; -} - int ossl_rsa_pss_params_30_set_maskgenhashalg(RSA_PSS_PARAMS_30 *rsa_pss_params, int maskgenhashalg_nid) { diff --git a/include/crypto/rsa.h b/include/crypto/rsa.h index f267e5d9d1c..c9f9f84cea8 100644 --- a/include/crypto/rsa.h +++ b/include/crypto/rsa.h @@ -34,8 +34,6 @@ int ossl_rsa_pss_params_30_copy(RSA_PSS_PARAMS_30 *to, int ossl_rsa_pss_params_30_is_unrestricted(const RSA_PSS_PARAMS_30 *rsa_pss_params); int ossl_rsa_pss_params_30_set_hashalg(RSA_PSS_PARAMS_30 *rsa_pss_params, int hashalg_nid); -int ossl_rsa_pss_params_30_set_maskgenalg(RSA_PSS_PARAMS_30 *rsa_pss_params, - int maskgenalg_nid); int ossl_rsa_pss_params_30_set_maskgenhashalg(RSA_PSS_PARAMS_30 *rsa_pss_params, int maskgenhashalg_nid); int ossl_rsa_pss_params_30_set_saltlen(RSA_PSS_PARAMS_30 *rsa_pss_params,