From: panda <daniel.phan36@gmail.com>
Date: Mon, 8 Mar 2021 21:12:42 +0000 (-0800)
Subject: Check SSL_set1_chain error in set_cert_cb
X-Git-Tag: OpenSSL_1_1_1k~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=081a7061f3da07318c4b0f5de67b82285630bf6b;p=thirdparty%2Fopenssl.git

Check SSL_set1_chain error in set_cert_cb

CLA: trivial

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14469)

(cherry picked from commit 1aa7ecd0d3f6d9c3739cf2e2d87673a3be03b352)
---

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 6406ddfb9e1..7241df4978f 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -934,7 +934,8 @@ static int set_cert_cb(SSL *ssl, void *arg)
                 if (!SSL_build_cert_chain(ssl, 0))
                     return 0;
             } else if (exc->chain != NULL) {
-                SSL_set1_chain(ssl, exc->chain);
+                if (!SSL_set1_chain(ssl, exc->chain))
+                    return 0;
             }
         }
         exc = exc->prev;