From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 3 Nov 2022 11:46:11 +0000 (+0200)
Subject: lib-dcrypt: Remove pointless else-if
X-Git-Tag: 2.4.0~3442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af92f696c38ef9ac59b03a068fce1f15b3ebafc1;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Remove pointless else-if
---

diff --git a/src/lib-dcrypt/dcrypt-openssl1.c b/src/lib-dcrypt/dcrypt-openssl1.c
index 6d9ad3a1fd..07875a5819 100644
--- a/src/lib-dcrypt/dcrypt-openssl1.c
+++ b/src/lib-dcrypt/dcrypt-openssl1.c
@@ -1885,7 +1885,7 @@ dcrypt_openssl_load_private_key_jwk(struct dcrypt_private_key **key_r,
 
 	if (!ret)
 		*error_r = t_strdup_printf("Cannot load JWK private key: %s", error);
-	else if (ret) {
+	else {
 		*key_r = i_new(struct dcrypt_private_key, 1);
 		(*key_r)->key = pkey;
 		(*key_r)->ref++;
@@ -1943,7 +1943,7 @@ dcrypt_openssl_load_public_key_jwk(struct dcrypt_public_key **key_r,
 
 	if (!ret)
 		*error_r = t_strdup_printf("Cannot load JWK public key: %s", error);
-	else if (ret) {
+	else {
 		*key_r = i_new(struct dcrypt_public_key, 1);
 		(*key_r)->key = pkey;
 		(*key_r)->ref++;
diff --git a/src/lib-dcrypt/dcrypt-openssl3.c b/src/lib-dcrypt/dcrypt-openssl3.c
index b1049616bf..1b3534a331 100644
--- a/src/lib-dcrypt/dcrypt-openssl3.c
+++ b/src/lib-dcrypt/dcrypt-openssl3.c
@@ -1831,7 +1831,7 @@ dcrypt_openssl_load_private_key_jwk(struct dcrypt_private_key **key_r,
 
 	if (!ret)
 		*error_r = t_strdup_printf("Cannot load JWK private key: %s", error);
-	else if (ret) {
+	else {
 		*key_r = i_new(struct dcrypt_private_key, 1);
 		(*key_r)->key = pkey;
 		(*key_r)->ref++;
@@ -1889,7 +1889,7 @@ dcrypt_openssl_load_public_key_jwk(struct dcrypt_public_key **key_r,
 
 	if (!ret)
 		*error_r = t_strdup_printf("Cannot load JWK public key: %s", error);
-	else if (ret) {
+	else {
 		*key_r = i_new(struct dcrypt_public_key, 1);
 		(*key_r)->key = pkey;
 		(*key_r)->ref++;