[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  9ee27200c9a396369e47ba1cd60a5a7486777e55 (commit)
      from  c2500f658bbf378a94a76420ea7ef3d2bff17f9c (commit)


- Log -----------------------------------------------------------------
commit 9ee27200c9a396369e47ba1cd60a5a7486777e55
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Jul 13 10:41:57 2017 +1000

    Remove trailing blanks.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3918)

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

Summary of changes:
 include/openssl/ssl.h   | 4 ++--
 test/handshake_helper.c | 2 +-
 test/testutil/tap_bio.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 22e6dca..5d8442c 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. All rights reserved.
  *
@@ -285,7 +285,7 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx);
 /*
  * Some values are reserved until OpenSSL 1.2.0 because they were previously
  * included in SSL_OP_ALL in a 1.1.x release.
- *  
+ *
  * Reserved value (until OpenSSL 1.2.0)                  0x00000001U
  * Reserved value (until OpenSSL 1.2.0)                  0x00000002U
  */
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index af5ccfc..67facdc 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
diff --git a/test/testutil/tap_bio.c b/test/testutil/tap_bio.c
index 43c95c0..f78dfb8 100644
--- a/test/testutil/tap_bio.c
+++ b/test/testutil/tap_bio.c
@@ -122,7 +122,7 @@ err:
 static long tap_ctrl(BIO *b, int cmd, long num, void *ptr)
 {
     BIO *next = BIO_next(b);
- 
+
     switch (cmd) {
     case BIO_CTRL_RESET:
         BIO_set_data(b, NULL);