[openssl] OpenSSL_1_1_1-stable update

[tomas at openssl.org]

The branch OpenSSL_1_1_1-stable has been updated
       via  46dc0bca6cd623c42489c57e62c69cf568335664 (commit)
      from  7712b43c24514f82d6f0def5240a799bc011e9fe (commit)


- Log -----------------------------------------------------------------
commit 46dc0bca6cd623c42489c57e62c69cf568335664
Author: Nan Xiao <nan at chinadtrace.org>
Date:   Mon Mar 29 17:24:01 2021 +0800

    Remove unnecessary BIO_do_handshake()s
    
    Since BIO_do_connect() and BIO_do_handshake() are same, no
    need to invoke BIO_do_handshake() once more after BIO_do_connect().
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14725)
    
    (cherry picked from commit 975e37cd016f86985d16f1ee646e88213494854a)

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

Summary of changes:
 demos/bio/client-arg.c  | 6 ------
 demos/bio/client-conf.c | 6 ------
 doc/man3/BIO_f_ssl.pod  | 5 -----
 3 files changed, 17 deletions(-)

diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index e8d5e46ab5..6b35a45ff4 100644
--- a/demos/bio/client-arg.c
+++ b/demos/bio/client-arg.c
@@ -94,12 +94,6 @@ int main(int argc, char **argv)
         goto end;
     }
 
-    if (BIO_do_handshake(sbio) <= 0) {
-        fprintf(stderr, "Error establishing SSL connection\n");
-        ERR_print_errors_fp(stderr);
-        goto end;
-    }
-
     /* Could examine ssl here to get connection info */
 
     BIO_puts(sbio, "GET / HTTP/1.0\n\n");
diff --git a/demos/bio/client-conf.c b/demos/bio/client-conf.c
index e819030eec..930cd372f8 100644
--- a/demos/bio/client-conf.c
+++ b/demos/bio/client-conf.c
@@ -102,12 +102,6 @@ int main(int argc, char **argv)
         goto end;
     }
 
-    if (BIO_do_handshake(sbio) <= 0) {
-        fprintf(stderr, "Error establishing SSL connection\n");
-        ERR_print_errors_fp(stderr);
-        goto end;
-    }
-
     /* Could examine ssl here to get connection info */
 
     BIO_puts(sbio, "GET / HTTP/1.0\n\n");
diff --git a/doc/man3/BIO_f_ssl.pod b/doc/man3/BIO_f_ssl.pod
index 59cccbd4e5..6e37aa27f2 100644
--- a/doc/man3/BIO_f_ssl.pod
+++ b/doc/man3/BIO_f_ssl.pod
@@ -185,11 +185,6 @@ unencrypted example in L<BIO_s_connect(3)>.
      ERR_print_errors_fp(stderr);
      exit(1);
  }
- if (BIO_do_handshake(sbio) <= 0) {
-     fprintf(stderr, "Error establishing SSL connection\n");
-     ERR_print_errors_fp(stderr);
-     exit(1);
- }
 
  /* XXX Could examine ssl here to get connection info */