diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2016-06-28 22:51:51 +0200 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-06-29 09:56:39 -0400 |
commit | 6b4a77f56e14c002ce3cf960f622682be3b8424b (patch) | |
tree | 5fbdcaa46159cf3183f17e913f50b46c94e80080 | |
parent | 0485d5406a3b76dd02e73c1c7dcabebe64f9f8a2 (diff) |
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)
-rw-r--r-- | apps/apps.c | 4 | ||||
-rw-r--r-- | apps/req.c | 2 | ||||
-rw-r--r-- | apps/ts.c | 4 | ||||
-rw-r--r-- | doc/crypto/OPENSSL_malloc.pod | 2 | ||||
-rw-r--r-- | test/bioprinttest.c | 2 | ||||
-rw-r--r-- | test/ecdhtest_cavs.h | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/apps/apps.c b/apps/apps.c index ec1cfe9927..32304255f7 100644 --- 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 3e6cb07460..f1ee9515a4 100644 --- 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)) { @@ -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 cd89897b60..9760135ee9 100644 --- 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 6f591a1a18..b2d26225e5 100644 --- 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 ab3ac22f2e..fee701185b 100644 --- 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 */ |