[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  1aa7ecd0d3f6d9c3739cf2e2d87673a3be03b352 (commit)
      from  bf23b9a163658496c3cabb1d0a00a88b94aede0a (commit)


- Log -----------------------------------------------------------------
commit 1aa7ecd0d3f6d9c3739cf2e2d87673a3be03b352
Author: panda <daniel.phan36 at gmail.com>
Date:   Mon Mar 8 13:12:42 2021 -0800

    Check SSL_set1_chain error in set_cert_cb
    
    CLA: trivial
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14469)

-----------------------------------------------------------------------

Summary of changes:
 apps/lib/s_cb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index 6737eca13e..0ca9038738 100644
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -952,7 +952,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;