From: Pauli Date: Thu, 8 Aug 2024 01:40:49 +0000 (+1000) Subject: fips: change from function call to macro in rsa_enc.c X-Git-Tag: openssl-3.4.0-alpha1~177 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e316edd71a4cc480620b4c52e37114ca174f168;p=thirdparty%2Fopenssl.git fips: change from function call to macro in rsa_enc.c Use of the function instead of the macro for the indicator unapproved check was noted in: https://github.com/openssl/openssl/pull/25070#discussion_r1706564363 Fix things to use the macro properly. Reviewed-by: Shane Lontis Reviewed-by: Tom Cosgrove (Merged from https://github.com/openssl/openssl/pull/25134) --- diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c index 0860ef7890d..9a6c3032fe7 100644 --- a/providers/implementations/asymciphers/rsa_enc.c +++ b/providers/implementations/asymciphers/rsa_enc.c @@ -161,8 +161,7 @@ static int rsa_encrypt(void *vprsactx, unsigned char *out, size_t *outlen, #ifdef FIPS_MODULE if ((prsactx->pad_mode == RSA_PKCS1_PADDING || prsactx->pad_mode == RSA_PKCS1_WITH_TLS_PADDING) - && !ossl_FIPS_IND_on_unapproved(OSSL_FIPS_IND_GET(prsactx), - OSSL_FIPS_IND_SETTABLE1, + && !OSSL_FIPS_IND_ON_UNAPPROVED(prsactx, OSSL_FIPS_IND_SETTABLE1, prsactx->libctx, "RSA Encrypt", "PKCS#1 v1.5 padding", FIPS_rsa_pkcs15_padding_disabled)) {