[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  8c590a219fe30b97cfde2efdd8ea94c03a90a8c6 (commit)
      from  963eb12dbd551df71d7eb054e095c1b85f4aaab9 (commit)


- Log -----------------------------------------------------------------
commit 8c590a219fe30b97cfde2efdd8ea94c03a90a8c6
Author: Jiasheng Jiang <jiasheng at iscas.ac.cn>
Date:   Tue Oct 26 02:40:20 2021 +0000

    test/ssl_old_test.c: Do NULL pointer check before its use
    
    In openssl-3.0.0 and system provided, it is not reasonable to
    check null pointer after use. The order was accidentally reversed.
    Therefore, it is better to correct it.
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16915)

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

Summary of changes:
 test/ssl_old_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c
index 3ccc8e06e4..6a206d595e 100644
--- a/test/ssl_old_test.c
+++ b/test/ssl_old_test.c
@@ -1896,9 +1896,9 @@ int doit_localhost(SSL *s_ssl, SSL *c_ssl, int family, long count,
     BIO_snprintf(addr_str, sizeof(addr_str), ":%s", BIO_get_accept_port(acpt));
 
     client = BIO_new_connect(addr_str);
-    BIO_set_conn_ip_family(client, family);
     if (!client)
         goto err;
+    BIO_set_conn_ip_family(client, family);
 
     if (BIO_set_nbio(client, 1) <= 0)
         goto err;