diff options
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_ameth.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index d2d4683ec0..f718a8101a 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/rsa/rsa_ameth.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_ameth.c,v 1.44 2023/11/08 16:05:18 tb Exp $ */ | 1 | /* $OpenBSD: rsa_ameth.c,v 1.45 2023/11/08 16:07:59 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -909,7 +909,7 @@ rsa_alg_set_pss_padding(X509_ALGOR *alg, EVP_PKEY_CTX *pkey_ctx) | |||
909 | 909 | ||
910 | #ifndef OPENSSL_NO_CMS | 910 | #ifndef OPENSSL_NO_CMS |
911 | static int | 911 | static int |
912 | rsa_alg_set_oaep_padding(X509_ALGOR *alg, EVP_PKEY_CTX *pkctx) | 912 | rsa_alg_set_oaep_padding(X509_ALGOR *alg, EVP_PKEY_CTX *pkey_ctx) |
913 | { | 913 | { |
914 | const EVP_MD *md, *mgf1md; | 914 | const EVP_MD *md, *mgf1md; |
915 | RSA_OAEP_PARAMS *oaep = NULL; | 915 | RSA_OAEP_PARAMS *oaep = NULL; |
@@ -918,11 +918,11 @@ rsa_alg_set_oaep_padding(X509_ALGOR *alg, EVP_PKEY_CTX *pkctx) | |||
918 | int labellen; | 918 | int labellen; |
919 | int ret = 0; | 919 | int ret = 0; |
920 | 920 | ||
921 | if (EVP_PKEY_CTX_get_rsa_oaep_md(pkctx, &md) <= 0) | 921 | if (EVP_PKEY_CTX_get_rsa_oaep_md(pkey_ctx, &md) <= 0) |
922 | goto err; | 922 | goto err; |
923 | if (EVP_PKEY_CTX_get_rsa_mgf1_md(pkctx, &mgf1md) <= 0) | 923 | if (EVP_PKEY_CTX_get_rsa_mgf1_md(pkey_ctx, &mgf1md) <= 0) |
924 | goto err; | 924 | goto err; |
925 | labellen = EVP_PKEY_CTX_get0_rsa_oaep_label(pkctx, &label); | 925 | labellen = EVP_PKEY_CTX_get0_rsa_oaep_label(pkey_ctx, &label); |
926 | if (labellen < 0) | 926 | if (labellen < 0) |
927 | goto err; | 927 | goto err; |
928 | 928 | ||
@@ -1116,11 +1116,11 @@ static int | |||
1116 | rsa_cms_encrypt(CMS_RecipientInfo *ri) | 1116 | rsa_cms_encrypt(CMS_RecipientInfo *ri) |
1117 | { | 1117 | { |
1118 | X509_ALGOR *alg; | 1118 | X509_ALGOR *alg; |
1119 | EVP_PKEY_CTX *pkctx; | 1119 | EVP_PKEY_CTX *pkey_ctx; |
1120 | int pad_mode = RSA_PKCS1_PADDING; | 1120 | int pad_mode = RSA_PKCS1_PADDING; |
1121 | 1121 | ||
1122 | if ((pkctx = CMS_RecipientInfo_get0_pkey_ctx(ri)) != NULL) { | 1122 | if ((pkey_ctx = CMS_RecipientInfo_get0_pkey_ctx(ri)) != NULL) { |
1123 | if (EVP_PKEY_CTX_get_rsa_padding(pkctx, &pad_mode) <= 0) | 1123 | if (EVP_PKEY_CTX_get_rsa_padding(pkey_ctx, &pad_mode) <= 0) |
1124 | return 0; | 1124 | return 0; |
1125 | } | 1125 | } |
1126 | 1126 | ||
@@ -1129,7 +1129,7 @@ rsa_cms_encrypt(CMS_RecipientInfo *ri) | |||
1129 | if (pad_mode == RSA_PKCS1_PADDING) | 1129 | if (pad_mode == RSA_PKCS1_PADDING) |
1130 | return rsa_alg_set_pkcs1_padding(alg); | 1130 | return rsa_alg_set_pkcs1_padding(alg); |
1131 | if (pad_mode == RSA_PKCS1_OAEP_PADDING) | 1131 | if (pad_mode == RSA_PKCS1_OAEP_PADDING) |
1132 | return rsa_alg_set_oaep_padding(alg, pkctx); | 1132 | return rsa_alg_set_oaep_padding(alg, pkey_ctx); |
1133 | 1133 | ||
1134 | return 0; | 1134 | return 0; |
1135 | } | 1135 | } |