From 89be72422d9a0799ce1019dad0166b263c652feb Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 8 Nov 2023 16:05:18 +0000 Subject: [PATCH] Some simple cosmetics in rsa_alg_set_oaep_padding() Rename rv into ret and split it on its own line, move labellen a bit down add some empty lines. To match style elsewhere. Most of this was requested by jsing --- lib/libcrypto/rsa/rsa_ameth.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libcrypto/rsa/rsa_ameth.c b/lib/libcrypto/rsa/rsa_ameth.c index 43e66ce02a5..d2d4683ec0c 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.43 2023/11/08 16:02:41 tb Exp $ */ +/* $OpenBSD: rsa_ameth.c,v 1.44 2023/11/08 16:05:18 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -914,8 +914,9 @@ rsa_alg_set_oaep_padding(X509_ALGOR *alg, EVP_PKEY_CTX *pkctx) const EVP_MD *md, *mgf1md; RSA_OAEP_PARAMS *oaep = NULL; ASN1_STRING *os = NULL; - int rv = 0, labellen; unsigned char *label; + int labellen; + int ret = 0; if (EVP_PKEY_CTX_get_rsa_oaep_md(pkctx, &md) <= 0) goto err; @@ -955,11 +956,14 @@ rsa_alg_set_oaep_padding(X509_ALGOR *alg, EVP_PKEY_CTX *pkctx) goto err; X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaesOaep), V_ASN1_SEQUENCE, os); os = NULL; - rv = 1; + + ret = 1; + err: RSA_OAEP_PARAMS_free(oaep); ASN1_STRING_free(os); - return rv; + + return ret; } static int -- 2.20.1