[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  56d362881eb9173d74f89aa8c4c4b42bc3397a17 (commit)
      from  b4ff66223b53ad9d2f5b4efd75bf8d52cc59c8dd (commit)


- Log -----------------------------------------------------------------
commit 56d362881eb9173d74f89aa8c4c4b42bc3397a17
Author: Paul Yang <yang.yang at baishancloud.com>
Date:   Fri Dec 15 15:01:20 2017 +0800

    Remove spaces at end of line in ssl/statem
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    GH: #4934

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

Summary of changes:
 ssl/statem/extensions.c      | 2 +-
 ssl/statem/extensions_clnt.c | 2 +-
 ssl/statem/extensions_srvr.c | 2 +-
 ssl/statem/statem_srvr.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 28f7ada..505337a 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -1047,7 +1047,7 @@ static int final_alpn(SSL *s, unsigned int context, int sent)
      * we also have to do this before we decide whether to accept early_data.
      * In TLSv1.3 we've already negotiated our cipher so we do this call now.
      * For < TLSv1.3 we defer it until after cipher negotiation.
-     * 
+     *
      * On failure SSLfatal() already called.
      */
     return tls_handle_alpn(s);
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 2b39459..dbb8812 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -1202,7 +1202,7 @@ int tls_parse_stoc_maxfragmentlen(SSL *s, PACKET *pkt, unsigned int context,
     unsigned int value;
 
     if (PACKET_remaining(pkt) != 1 || !PACKET_get_1(pkt, &value)) {
-        SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PARSE_STOC_MAXFRAGMENTLEN, 
+        SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PARSE_STOC_MAXFRAGMENTLEN,
                  SSL_R_BAD_EXTENSION);
         return 0;
     }
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index d34a7c5..30cbf9e 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -1081,7 +1081,7 @@ EXT_RETURN tls_construct_stoc_status_request(SSL *s, WPACKET *pkt,
      */
     if (SSL_IS_TLS13(s) && !tls_construct_cert_status_body(s, pkt)) {
        /* SSLfatal() already called */
-       return EXT_RETURN_FAIL; 
+       return EXT_RETURN_FAIL;
     }
     if (!WPACKET_close(pkt)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR,
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 249ee40..f24f05f 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -654,7 +654,7 @@ WORK_STATE ossl_statem_server_pre_work(SSL *s, WORK_STATE wst)
              * Actually this is the end of the handshake, but we're going
              * straight into writing the session ticket out. So we finish off
              * the handshake, but keep the various buffers active.
-             * 
+             *
              * Calls SSLfatal as required.
              */
             return tls_finish_handshake(s, wst, 0);