Whitespace cleanup in apps

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1264)

diff --git a/apps/apps.c b/apps/apps.c
index ec1cfe9927b12942787707d9a3b7f6a7cb9d3390..32304255f71583ee47167d59801ddff29dd15de4 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -926,7 +926,7 @@ void* app_malloc(int sz, const char *what)
 }
 
 /*
- * Initialize or extend, if *certs != NULL,  a certificate stack.
+ * Initialize or extend, if *certs != NULL, a certificate stack.
  */
 int load_certs(const char *file, STACK_OF(X509) **certs, int format,
                const char *pass, const char *desc)
@@ -935,7 +935,7 @@ int load_certs(const char *file, STACK_OF(X509) **certs, int format,
 }
 
 /*
- * Initialize or extend, if *crls != NULL,  a certificate stack.
+ * Initialize or extend, if *crls != NULL, a certificate stack.
  */
 int load_crls(const char *file, STACK_OF(X509_CRL) **crls, int format,
               const char *pass, const char *desc)

diff --git a/apps/req.c b/apps/req.c
index 3e6cb074608b68211f1e1719f83df8bdcf9ceffc..f1ee9515a44b62fea0e69784fe232df77053db8a 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -327,7 +327,7 @@ int req_main(int argc, char **argv)
     if (!nmflag_set)
         nmflag = XN_FLAG_ONELINE;
 
-    /* TODO: simplify this as pkey is still always NULL here */ 
+    /* TODO: simplify this as pkey is still always NULL here */
     private = newreq && (pkey == NULL) ? 1 : 0;
 
     if (!app_passwd(passargin, passargout, &passin, &passout)) {

diff --git a/apps/ts.c b/apps/ts.c
index 80f14bd821eaa52d387c79df97fb41c223e291d8..1ae57d253558f247dda4a6d75add9c0c8cfafa62 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -323,7 +323,7 @@ int ts_main(int argc, char **argv)
         if ((in == NULL) || !EXACTLY_ONE(queryfile, data, digest))
             goto opthelp;
         ret = !verify_command(data, digest, queryfile, in, token_in,
-                              CApath, CAfile, untrusted, 
+                              CApath, CAfile, untrusted,
                               vpmtouched ? vpm : NULL);
     }
 
@@ -964,7 +964,7 @@ static X509_STORE *create_cert_store(char *CApath, char *CAfile, X509_VERIFY_PAR
         }
     }
 
-    if (vpm != NULL) 
+    if (vpm != NULL)
         X509_STORE_set1_param(cert_ctx, vpm);
 
     return cert_ctx;

diff --git a/doc/crypto/OPENSSL_malloc.pod b/doc/crypto/OPENSSL_malloc.pod
index cd89897b60e29b93a11b1eb144852410ec533647..9760135ee907dae5f7f1bed0902dcc28381dcdec 100644 (file)
--- a/doc/crypto/OPENSSL_malloc.pod
+++ b/doc/crypto/OPENSSL_malloc.pod
@@ -103,7 +103,7 @@ OPENSSL_cleanse() fills B<ptr> of size B<len> with a string of 0's.
 Use OPENSSL_cleanse() with care if the memory is a mapping of a file.
 If the storage controller uses write compression, then its possible
 that sensitive tail bytes will survive zeroization because the block of
-zeros will be compressed. If the storage controller uses wear levelling,
+zeros will be compressed. If the storage controller uses wear leveling,
 then the old sensitive data will not be overwritten; rather, a block of
 0's will be written at a new physical location.
 

diff --git a/test/bioprinttest.c b/test/bioprinttest.c
index 6f591a1a18e17fcf54dd8544cd3d02eed203c988..b2d26225e52cb54bfedd2808423b2eed97262d48 100644 (file)
--- a/test/bioprinttest.c
+++ b/test/bioprinttest.c
@@ -197,7 +197,7 @@ int main(int argc, char **argv)
         dofptest(test++, 66.0 + frac, width, prec, &fail);
         dofptest(test++, 666.0 + frac, width, prec, &fail);
         dofptest(test++, 6666.0 + frac, width, prec, &fail);
-        dofptest(test++, 66666.0 + frac, width, prec, &fail); 
+        dofptest(test++, 66666.0 + frac, width, prec, &fail);
     }
 
     /* Test excessively big number. Should fail */

diff --git a/test/ecdhtest_cavs.h b/test/ecdhtest_cavs.h
index ab3ac22f2ec731b128c973146057110bc435dda4..fee701185bb65be50ddd1d86cc8bad95ae488a6e 100644 (file)
--- a/test/ecdhtest_cavs.h
+++ b/test/ecdhtest_cavs.h
@@ -10,10 +10,10 @@
 #ifndef ECDHTEST_CAVS_H
 #define ECDHTEST_CAVS_H
 
-/* 
+/*
  * co-factor ECDH KATs for NIST SP800-56A
  * http://csrc.nist.gov/groups/STM/cavp/component-testing.html#ECCCDH
- * $ sha256sum KAS_ECC_CDH_PrimitiveTest.txt 
+ * $ sha256sum KAS_ECC_CDH_PrimitiveTest.txt
  * 456068d3f8aad8ac62a03d19ed3173f00ad51f42b51aeab4753c20f30c01cf23  KAS_ECC_CDH_PrimitiveTest.txt
  */