From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 26 Jan 2023 06:22:14 +0000 (+0200)
Subject: lib-dcrypt: Return after loading JWK key
X-Git-Tag: 2.4.0~3156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1a268889110e0451e775cb542f48669ceccd49d;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Return after loading JWK key

Otherwise we try to load it as PEM key, which will fail.

Broken in d352e5545a9422f3b0d74fd40d94c9f9a0770fb7
---

diff --git a/src/lib-dcrypt/dcrypt-openssl3.c b/src/lib-dcrypt/dcrypt-openssl3.c
index 51e7f8e067..6b5f26428a 100644
--- a/src/lib-dcrypt/dcrypt-openssl3.c
+++ b/src/lib-dcrypt/dcrypt-openssl3.c
@@ -2440,6 +2440,7 @@ dcrypt_openssl_load_public_key(struct dcrypt_public_key **key_r,
 		T_BEGIN {
 			ret = dcrypt_openssl_load_public_key_jwk(key_r, data, error_r);
 		} T_END_PASS_STR_IF(!ret, error_r);
+		return ret;
 	}
 	if (format == DCRYPT_FORMAT_DOVECOT) {
 		bool ret;