[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  f570d33b02d824e2a3f676f718c4692572f45333 (commit)
      from  d0196ddcba60a69930d1b1fec579949c8788be34 (commit)


- Log -----------------------------------------------------------------
commit f570d33b02d824e2a3f676f718c4692572f45333
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Jun 2 17:19:23 2021 +0100

    Only call dtls1_start_timer() once
    
    The function dtls1_handle_timeout() calls dtls1_double_timeout() which
    was calling dtls1_start_timer(). However dtls1_start_timer() is also
    called directly by dtls1_handle_timeout(). We only need to start the timer
    once.
    
    Fixes #15561
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15595)

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

Summary of changes:
 ssl/d1_lib.c    | 3 +--
 ssl/ssl_local.h | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index f9ad4ed684..a986252866 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -342,12 +342,11 @@ int dtls1_is_timer_expired(SSL *s)
     return 1;
 }
 
-void dtls1_double_timeout(SSL *s)
+static void dtls1_double_timeout(SSL *s)
 {
     s->d1->timeout_duration_us *= 2;
     if (s->d1->timeout_duration_us > 60000000)
         s->d1->timeout_duration_us = 60000000;
-    dtls1_start_timer(s);
 }
 
 void dtls1_stop_timer(SSL *s)
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index b222fc6a2d..09413a44fa 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -2567,7 +2567,6 @@ __owur int dtls1_handle_timeout(SSL *s);
 void dtls1_start_timer(SSL *s);
 void dtls1_stop_timer(SSL *s);
 __owur int dtls1_is_timer_expired(SSL *s);
-void dtls1_double_timeout(SSL *s);
 __owur int dtls_raw_hello_verify_request(WPACKET *pkt, unsigned char *cookie,
                                          size_t cookie_len);
 __owur size_t dtls1_min_mtu(SSL *s);