From d95a89266b204559e1a601806fd57d817d601bb9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 4 Dec 2024 07:17:43 +0100 Subject: [PATCH] openssl: remove three "Useless Assignments" Pointed out by CodeSonar Closes #15679 --- lib/vtls/openssl.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index d2021ebbdb..1b0e8dd5f0 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -1203,14 +1203,12 @@ static int use_privatekey_blob(SSL_CTX *ctx, const struct curl_blob *blob, (void *)key_passwd); else if(type == SSL_FILETYPE_ASN1) pkey = d2i_PrivateKey_bio(in, NULL); - else { - ret = 0; + else goto end; - } - if(!pkey) { - ret = 0; + + if(!pkey) goto end; - } + ret = SSL_CTX_use_PrivateKey(ctx, pkey); EVP_PKEY_free(pkey); end: @@ -1237,11 +1235,8 @@ use_certificate_chain_blob(SSL_CTX *ctx, const struct curl_blob *blob, x = PEM_read_bio_X509_AUX(in, NULL, passwd_callback, (void *)key_passwd); - - if(!x) { - ret = 0; + if(!x) goto end; - } ret = SSL_CTX_use_certificate(ctx, x); -- 2.47.3