From: Matt Caswell <matt@openssl.org>
Date: Fri, 26 Jun 2020 19:44:27 +0000 (+0100)
Subject: Fix an incorrect error flow in add_provider_groups
X-Git-Tag: openssl-3.0.0-alpha5~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90a74d8c4331c363d68ecd1168bc5344f7ba9be8;p=thirdparty%2Fopenssl.git

Fix an incorrect error flow in add_provider_groups

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12292)
---

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index c9097fcc448..41228d58e9d 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -334,7 +334,7 @@ static int add_provider_groups(const OSSL_PARAM params[], void *data)
     p = OSSL_PARAM_locate_const(params, OSSL_CAPABILITY_TLS_GROUP_MAX_TLS);
     if (p == NULL || !OSSL_PARAM_get_int(p, &ginf->maxtls)) {
         SSLerr(0, ERR_R_PASSED_INVALID_ARGUMENT);
-        return 0;
+        goto err;
     }
 
     p = OSSL_PARAM_locate_const(params, OSSL_CAPABILITY_TLS_GROUP_MIN_DTLS);