[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  1ac64327dfd8d20072a34e73116ab222d77a24d0 (commit)
      from  86522324d2a398ad3ed2f648a66b62b0a6176258 (commit)


- Log -----------------------------------------------------------------
commit 1ac64327dfd8d20072a34e73116ab222d77a24d0
Author: Nan Xiao <nan at chinadtrace.org>
Date:   Tue Mar 30 16:30:47 2021 +0800

    Remove unnecessary setting SSL_MODE_AUTO_RETRY
    
    Since SSL_MODE_AUTO_RETRY is enabled by default, no need to set
    it explicitly.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14742)

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

Summary of changes:
 apps/cmp.c              | 2 --
 apps/ocsp.c             | 1 -
 apps/s_time.c           | 1 -
 demos/bio/client-arg.c  | 3 ---
 demos/bio/client-conf.c | 3 ---
 doc/man3/BIO_f_ssl.pod  | 4 ----
 6 files changed, 14 deletions(-)

diff --git a/apps/cmp.c b/apps/cmp.c
index 2112df0186..8a996f6dce 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -1191,8 +1191,6 @@ static SSL_CTX *setup_ssl_ctx(OSSL_CMP_CTX *ctx, ENGINE *engine)
     if (ssl_ctx == NULL)
         return NULL;
 
-    SSL_CTX_set_mode(ssl_ctx, SSL_MODE_AUTO_RETRY);
-
     if (opt_tls_trusted != NULL) {
         trust_store = load_certstore(opt_tls_trusted, opt_otherpass,
                                      "trusted TLS certificates", vpm);
diff --git a/apps/ocsp.c b/apps/ocsp.c
index bd509d98a7..cd3a3bd695 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1202,7 +1202,6 @@ OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,
             BIO_printf(bio_err, "Error creating SSL context.\n");
             goto end;
         }
-        SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
     }
 
     resp = (OCSP_RESPONSE *)
diff --git a/apps/s_time.c b/apps/s_time.c
index 60861642f5..251f16ebc3 100644
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -246,7 +246,6 @@ int s_time_main(int argc, char **argv)
     if ((ctx = SSL_CTX_new(meth)) == NULL)
         goto end;
 
-    SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
     SSL_CTX_set_quiet_shutdown(ctx, 1);
     if (SSL_CTX_set_min_proto_version(ctx, min_version) == 0)
         goto end;
diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index 27c4c98f96..c35b9233a4 100644
--- a/demos/bio/client-arg.c
+++ b/demos/bio/client-arg.c
@@ -80,9 +80,6 @@ int main(int argc, char **argv)
         goto end;
     }
 
-    /* Don't want any retries */
-    SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
-
     /* We might want to do other things with ssl here */
 
     BIO_set_conn_hostname(sbio, connect_str);
diff --git a/demos/bio/client-conf.c b/demos/bio/client-conf.c
index 270df377e7..da6548e6a3 100644
--- a/demos/bio/client-conf.c
+++ b/demos/bio/client-conf.c
@@ -88,9 +88,6 @@ int main(int argc, char **argv)
         goto end;
     }
 
-    /* Don't want any retries */
-    SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
-
     /* We might want to do other things with ssl here */
 
     BIO_set_conn_hostname(sbio, connect_str);
diff --git a/doc/man3/BIO_f_ssl.pod b/doc/man3/BIO_f_ssl.pod
index 8eee317c7a..7ed179e453 100644
--- a/doc/man3/BIO_f_ssl.pod
+++ b/doc/man3/BIO_f_ssl.pod
@@ -174,9 +174,6 @@ unencrypted example in L<BIO_s_connect(3)>.
      exit(1);
  }
 
- /* Don't want any retries */
- SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
-
  /* XXX We might want to do other things with ssl here */
 
  /* An empty host part means the loopback address */
@@ -234,7 +231,6 @@ a client and also echoes the request to standard output.
      exit(1);
  }
 
- SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
  bbio = BIO_new(BIO_f_buffer());
  sbio = BIO_push(bbio, sbio);
  acpt = BIO_new_accept("4433");