[openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  35774d5594af9beeb73792742b7ed901d202be70 (commit)
      from  6763f9c7e62aeba0d083be1608c88d85110976cb (commit)


- Log -----------------------------------------------------------------
commit 35774d5594af9beeb73792742b7ed901d202be70
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Mon May 4 11:50:25 2020 -0700

    Fix up whitespace nits introduced by PR #11416
    
    Expand a couple literal tabs, and de-indent the body of a function.
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/11728)

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

Summary of changes:
 ssl/ssl_lib.c   | 10 +++++-----
 ssl/ssl_local.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index fde726e0ba..fef50eea7f 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2305,11 +2305,11 @@ int SSL_renegotiate_pending(const SSL *s)
 
 int SSL_new_session_ticket(SSL *s)
 {
-        if (SSL_in_init(s) || SSL_IS_FIRST_HANDSHAKE(s) || !s->server
-                || !SSL_IS_TLS13(s))
-            return 0;
-        s->ext.extra_tickets_expected++;
-        return 1;
+    if (SSL_in_init(s) || SSL_IS_FIRST_HANDSHAKE(s) || !s->server
+            || !SSL_IS_TLS13(s))
+        return 0;
+    s->ext.extra_tickets_expected++;
+    return 1;
 }
 
 long SSL_ctrl(SSL *s, int cmd, long larg, void *parg)
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index de7e9fde48..e938504d3e 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -1539,8 +1539,8 @@ struct ssl_st {
 
         /* RFC4507 session ticket expected to be received or sent */
         int ticket_expected;
-	/* TLS 1.3 tickets requested by the application. */
-	int extra_tickets_expected;
+        /* TLS 1.3 tickets requested by the application. */
+        int extra_tickets_expected;
 # ifndef OPENSSL_NO_EC
         size_t ecpointformats_len;
         /* our list */