From 4bd8b24045e1b044a2696b0675a9120ac0384567 Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Tue, 16 Jul 2019 20:35:42 +1000
Subject: [PATCH] remove end of line spaces

Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/9397)
---
 apps/s_client.c            | 4 ++--
 crypto/evp/e_aes.c         | 4 ++--
 crypto/initthread.c        | 2 +-
 include/openssl/core.h     | 2 +-
 providers/common/provlib.c | 2 +-
 providers/fips/fipsprov.c  | 4 ++--
 test/testutil/driver.c     | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index a9a6552706..016df7c657 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2017,7 +2017,7 @@ int s_client_main(int argc, char **argv)
 
     if (!noservername && (servername != NULL || dane_tlsa_domain == NULL)) {
         if (servername == NULL) {
-            if(host == NULL || is_dNS_name(host)) 
+            if(host == NULL || is_dNS_name(host))
                 servername = (host == NULL) ? "localhost" : host;
         }
         if (servername != NULL && !SSL_set_tlsext_host_name(con, servername)) {
@@ -3552,7 +3552,7 @@ static char *base64encode (const void *buf, size_t len)
 }
 
 /*
- * Host dNS Name verifier: used for checking that the hostname is in dNS format 
+ * Host dNS Name verifier: used for checking that the hostname is in dNS format
  * before setting it as SNI
  */
 static int is_dNS_name(const char *host)
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index cb05bce32f..d687a2cac3 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -267,7 +267,7 @@ static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
         /*
          * Verify that the two keys are different.
-         * 
+         *
          * This addresses Rogaway's vulnerability.
          * See comment in aes_xts_init_key() below.
          */
@@ -599,7 +599,7 @@ static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
         /*
          * Verify that the two keys are different.
-         * 
+         *
          * This addresses Rogaway's vulnerability.
          * See comment in aes_xts_init_key() below.
          */
diff --git a/crypto/initthread.c b/crypto/initthread.c
index 99cd96ceb8..b3f45b9dc4 100644
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -21,7 +21,7 @@
  * we have our own copy of ossl_init_thread_start, which cascades notifications
  * about threads stopping from libcrypto to all the code in the FIPS provider
  * that needs to know about it.
- * 
+ *
  * The FIPS provider tells libcrypto about which threads it is interested in
  * by calling "c_thread_start" which is a function pointer created during
  * provider initialisation (i.e. OSSL_init_provider).
diff --git a/include/openssl/core.h b/include/openssl/core.h
index 848b71431a..e9bc4891cb 100644
--- a/include/openssl/core.h
+++ b/include/openssl/core.h
@@ -146,7 +146,7 @@ struct ossl_param_st {
 /*
  * Typedef for the thread stop handling callback. Used both internally and by
  * providers.
- * 
+ *
  * Providers may register for notifications about threads stopping by
  * registering a callback to hear about such events. Providers register the
  * callback using the OSSL_FUNC_CORE_THREAD_START function in the |in| dispatch
diff --git a/providers/common/provlib.c b/providers/common/provlib.c
index 43da7cdaba..2bab77dba0 100644
--- a/providers/common/provlib.c
+++ b/providers/common/provlib.c
@@ -16,6 +16,6 @@
  */
 const char *ossl_prov_util_nid_to_name(int nid)
 {
-   return OBJ_nid2sn(nid); 
+   return OBJ_nid2sn(nid);
 }
 
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index 8978d1bc5b..c1fbe4a3f5 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -132,7 +132,7 @@ static int dummy_evp_call(void *provctx)
         || !BN_add(a, a, b)
         || BN_cmp(a, b) != 0)
         goto err;
-    
+
     if (RAND_DRBG_bytes(drbg, randbuf, sizeof(randbuf)) <= 0)
         goto err;
 
@@ -143,7 +143,7 @@ static int dummy_evp_call(void *provctx)
  err:
     BN_CTX_end(bnctx);
     BN_CTX_free(bnctx);
-    
+
     EVP_MD_CTX_free(ctx);
     EVP_MD_meth_free(sha256);
     return ret;
diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 2904a4fbd0..40ed3736c5 100644
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -162,9 +162,9 @@ static int check_single_test_params(char *name, char *testname, char *itname)
             if (strcmp(name, all_tests[i].test_case_name) == 0) {
                 single_test = 1 + i;
                 break;
-            } 
+            }
         }
-        if (i >= num_tests) 
+        if (i >= num_tests)
             single_test = atoi(name);
     }
 
-- 
2.25.1