summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2023-11-07 22:32:10 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2023-11-07 22:32:10 +0000
commit360243767e22abbfd6a55fd48979002f9ebd9090 (patch)
tree22d7925c64d4e45080757ca54b4ba27bc32638ab /lib
parent5216b005a2e45f9b1b9b5a49785819e7a5764f87 (diff)
Move CMS_RecipientInfo_get0_pkey_ctx() to first use of pkctx
Diffstat (limited to 'lib')
-rw-r--r--lib/libcrypto/rsa/rsa_ameth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libcrypto/rsa/rsa_ameth.c b/lib/libcrypto/rsa/rsa_ameth.c
index b4dbff26839..7533264add5 100644
--- a/lib/libcrypto/rsa/rsa_ameth.c
+++ b/lib/libcrypto/rsa/rsa_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_ameth.c,v 1.40 2023/11/07 16:22:04 tb Exp $ */
+/* $OpenBSD: rsa_ameth.c,v 1.41 2023/11/07 22:32:09 tb Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@@ -1061,13 +1061,13 @@ rsa_cms_encrypt(CMS_RecipientInfo *ri)
RSA_OAEP_PARAMS *oaep = NULL;
ASN1_STRING *os = NULL;
X509_ALGOR *alg;
- EVP_PKEY_CTX *pkctx = CMS_RecipientInfo_get0_pkey_ctx(ri);
+ EVP_PKEY_CTX *pkctx;
int pad_mode = RSA_PKCS1_PADDING, rv = 0, labellen;
unsigned char *label;
if (CMS_RecipientInfo_ktri_get0_algs(ri, NULL, NULL, &alg) <= 0)
return 0;
- if (pkctx) {
+ if ((pkctx = CMS_RecipientInfo_get0_pkey_ctx(ri)) != NULL) {
if (EVP_PKEY_CTX_get_rsa_padding(pkctx, &pad_mode) <= 0)
return 0;
}