From: deraadt <deraadt@openbsd.org>
Date: Mon, 14 Jul 2014 00:35:10 +0000 (+0000)
Subject: whitespace
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e77e8d07f1ac1a63e242f3586068a6acdc8230c2;p=openbsd

whitespace
---

diff --git a/lib/libssl/doc/openssl.cnf b/lib/libssl/doc/openssl.cnf
index 7250aacf2c2..ed4bde52e8a 100644
--- a/lib/libssl/doc/openssl.cnf
+++ b/lib/libssl/doc/openssl.cnf
@@ -14,7 +14,7 @@ oid_section		= new_oids
 # To use this configuration file with the "-extfile" option of the
 # "openssl x509" utility, name here the section containing the
 # X.509v3 extensions to use:
-# extensions		= 
+# extensions		=
 # (Alternatively, use a configuration file that has only
 # X.509v3 extensions in its main [= default] section.)
 
@@ -111,7 +111,7 @@ x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 # input_password = secret
 # output_password = secret
 
-# This sets a mask for permitted string types. There are several options. 
+# This sets a mask for permitted string types. There are several options.
 # default: PrintableString, T61String, BMPString.
 # pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
 # utf8only: only UTF8Strings (PKIX recommendation after 2004).
diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c
index fdbd436acc4..051f6f80a60 100644
--- a/lib/libssl/src/apps/apps.c
+++ b/lib/libssl/src/apps/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.66 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: apps.c,v 1.67 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1800,7 +1800,7 @@ parse_name(char *subject, long chtype, int multirdn)
 	int *mval;
 
 	/*
-	 * Buffer to copy the types and values into. Due to escaping the 
+	 * Buffer to copy the types and values into. Due to escaping the
 	 * copy can only become shorter.
 	 */
 	buflen = strlen(subject) + 1;
diff --git a/lib/libssl/src/apps/asn1pars.c b/lib/libssl/src/apps/asn1pars.c
index 1cedb6ad00d..6df27cd6d03 100644
--- a/lib/libssl/src/apps/asn1pars.c
+++ b/lib/libssl/src/apps/asn1pars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1pars.c,v 1.26 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: asn1pars.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -343,7 +343,7 @@ end:
 	if (osk != NULL)
 		sk_OPENSSL_STRING_free(osk);
 	OBJ_cleanup();
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c
index ae711a2e076..06d0c37c527 100644
--- a/lib/libssl/src/apps/ca.c
+++ b/lib/libssl/src/apps/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.63 2014/07/13 16:03:09 beck Exp $ */
+/* $OpenBSD: ca.c,v 1.64 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1369,7 +1369,7 @@ err:
 	NCONF_free(conf);
 	NCONF_free(extconf);
 	OBJ_cleanup();
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/ciphers.c b/lib/libssl/src/apps/ciphers.c
index d63fca6c7a3..4d594fbaf4d 100644
--- a/lib/libssl/src/apps/ciphers.c
+++ b/lib/libssl/src/apps/ciphers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciphers.c,v 1.25 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: ciphers.c,v 1.26 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -187,6 +187,6 @@ end:
 		SSL_free(ssl);
 	if (STDout != NULL)
 		BIO_free_all(STDout);
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/crl.c b/lib/libssl/src/apps/crl.c
index 05fd0878a44..57c87b67b76 100644
--- a/lib/libssl/src/apps/crl.c
+++ b/lib/libssl/src/apps/crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crl.c,v 1.24 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: crl.c,v 1.25 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -371,7 +371,7 @@ end:
 		X509_STORE_CTX_cleanup(&ctx);
 		X509_STORE_free(store);
 	}
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/crl2p7.c b/lib/libssl/src/apps/crl2p7.c
index 137851bd8a3..de638a7ce25 100644
--- a/lib/libssl/src/apps/crl2p7.c
+++ b/lib/libssl/src/apps/crl2p7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crl2p7.c,v 1.19 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: crl2p7.c,v 1.20 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -257,7 +257,7 @@ end:
 	if (crl != NULL)
 		X509_CRL_free(crl);
 
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/dgst.c b/lib/libssl/src/apps/dgst.c
index f9693fce16c..e19b9590776 100644
--- a/lib/libssl/src/apps/dgst.c
+++ b/lib/libssl/src/apps/dgst.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dgst.c,v 1.38 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dgst.c,v 1.39 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -467,7 +467,7 @@ end:
 	free(sigbuf);
 	if (bmd != NULL)
 		BIO_free(bmd);
-	
+
 	return (err);
 }
 
diff --git a/lib/libssl/src/apps/dh.c b/lib/libssl/src/apps/dh.c
index 5687c3cf2a7..1485dedb555 100644
--- a/lib/libssl/src/apps/dh.c
+++ b/lib/libssl/src/apps/dh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.24 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dh.c,v 1.25 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -303,7 +303,7 @@ end:
 		BIO_free_all(out);
 	if (dh != NULL)
 		DH_free(dh);
-	
+
 	return (ret);
 }
 #endif
diff --git a/lib/libssl/src/apps/dhparam.c b/lib/libssl/src/apps/dhparam.c
index b6b38f9b8f2..23fb2a57898 100644
--- a/lib/libssl/src/apps/dhparam.c
+++ b/lib/libssl/src/apps/dhparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhparam.c,v 1.32 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dhparam.c,v 1.33 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -447,7 +447,7 @@ end:
 		BIO_free_all(out);
 	if (dh != NULL)
 		DH_free(dh);
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/dsa.c b/lib/libssl/src/apps/dsa.c
index ab98c145a9d..287ecc4cda8 100644
--- a/lib/libssl/src/apps/dsa.c
+++ b/lib/libssl/src/apps/dsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.c,v 1.27 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dsa.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -328,6 +328,6 @@ end:
 		DSA_free(dsa);
 	free(passin);
 	free(passout);
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/dsaparam.c b/lib/libssl/src/apps/dsaparam.c
index 2322040a1ed..5980da69b0e 100644
--- a/lib/libssl/src/apps/dsaparam.c
+++ b/lib/libssl/src/apps/dsaparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsaparam.c,v 1.33 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: dsaparam.c,v 1.34 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -388,7 +388,7 @@ end:
 		BIO_free_all(out);
 	if (dsa != NULL)
 		DSA_free(dsa);
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/ec.c b/lib/libssl/src/apps/ec.c
index 89e6f293504..e60fddf99e4 100644
--- a/lib/libssl/src/apps/ec.c
+++ b/lib/libssl/src/apps/ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.c,v 1.15 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: ec.c,v 1.16 2014/07/14 00:35:10 deraadt Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -336,7 +336,7 @@ end:
 		EC_KEY_free(eckey);
 	free(passin);
 	free(passout);
-	
+
 	return (ret);
 }
 #endif
diff --git a/lib/libssl/src/apps/ecparam.c b/lib/libssl/src/apps/ecparam.c
index c7d4647852a..e8e843ed20e 100644
--- a/lib/libssl/src/apps/ecparam.c
+++ b/lib/libssl/src/apps/ecparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecparam.c,v 1.22 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: ecparam.c,v 1.23 2014/07/14 00:35:10 deraadt Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -115,7 +115,7 @@ static int ecparam_print_var(BIO *, BIGNUM *, const char *, int, unsigned char *
 
 int ecparam_main(int, char **);
 
-int 
+int
 ecparam_main(int argc, char **argv)
 {
 	EC_GROUP *group = NULL;
@@ -584,11 +584,11 @@ end:
 		BIO_free_all(out);
 	if (group != NULL)
 		EC_GROUP_free(group);
-	
+
 	return (ret);
 }
 
-static int 
+static int
 ecparam_print_var(BIO * out, BIGNUM * in, const char *var,
     int len, unsigned char *buffer)
 {
diff --git a/lib/libssl/src/apps/enc.c b/lib/libssl/src/apps/enc.c
index 6b3aea554f2..34642909185 100644
--- a/lib/libssl/src/apps/enc.c
+++ b/lib/libssl/src/apps/enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enc.c,v 1.37 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: enc.c,v 1.38 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,7 +78,7 @@ int set_hex(char *in, unsigned char *out, int size);
 #define BSIZE	(8*1024)
 #define	PROG	enc_main
 
-static void 
+static void
 show_ciphers(const OBJ_NAME * name, void *bio_)
 {
 	BIO *bio = bio_;
@@ -97,7 +97,7 @@ show_ciphers(const OBJ_NAME * name, void *bio_)
 
 int enc_main(int, char **);
 
-int 
+int
 enc_main(int argc, char **argv)
 {
 	static const char magic[] = "Salted__";
@@ -613,11 +613,11 @@ end:
 		BIO_free(bzl);
 #endif
 	free(pass);
-	
+
 	return (ret);
 }
 
-int 
+int
 set_hex(char *in, unsigned char *out, int size)
 {
 	int i, n;
diff --git a/lib/libssl/src/apps/engine.c b/lib/libssl/src/apps/engine.c
index 90404b57491..4b33ee45cea 100644
--- a/lib/libssl/src/apps/engine.c
+++ b/lib/libssl/src/apps/engine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.c,v 1.26 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: engine.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
  * project 2000.
  */
@@ -87,13 +87,13 @@ static const char *engine_usage[] = {
 	NULL
 };
 
-static void 
+static void
 identity(char *ptr)
 {
 	return;
 }
 
-static int 
+static int
 append_buf(char **buf, const char *s, int *size, int step)
 {
 	int l = strlen(s);
@@ -122,7 +122,7 @@ append_buf(char **buf, const char *s, int *size, int step)
 	return 1;
 }
 
-static int 
+static int
 util_flags(BIO * bio_out, unsigned int flags, const char *indent)
 {
 	int started = 0, err = 0;
@@ -181,7 +181,7 @@ util_flags(BIO * bio_out, unsigned int flags, const char *indent)
 	return 1;
 }
 
-static int 
+static int
 util_verbose(ENGINE * e, int verbose, BIO * bio_out, const char *indent)
 {
 	static const int line_wrap = 78;
@@ -277,7 +277,7 @@ err:
 	return ret;
 }
 
-static void 
+static void
 util_do_cmds(ENGINE * e, STACK_OF(OPENSSL_STRING) * cmds,
     BIO * bio_out, const char *indent)
 {
@@ -319,7 +319,7 @@ util_do_cmds(ENGINE * e, STACK_OF(OPENSSL_STRING) * cmds,
 
 int engine_main(int, char **);
 
-int 
+int
 engine_main(int argc, char **argv)
 {
 	int ret = 1, i;
@@ -488,7 +488,7 @@ end:
 	sk_OPENSSL_STRING_pop_free(post_cmds, identity);
 	if (bio_out != NULL)
 		BIO_free_all(bio_out);
-	
+
 	return (ret);
 }
 #endif
diff --git a/lib/libssl/src/apps/errstr.c b/lib/libssl/src/apps/errstr.c
index fd81818490e..2f4087d1228 100644
--- a/lib/libssl/src/apps/errstr.c
+++ b/lib/libssl/src/apps/errstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: errstr.c,v 1.18 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: errstr.c,v 1.19 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -103,6 +103,6 @@ errstr_main(int argc, char **argv)
 			ret++;
 		}
 	}
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/gendh.c b/lib/libssl/src/apps/gendh.c
index 5e7e44d7982..2cce6cf50b7 100644
--- a/lib/libssl/src/apps/gendh.c
+++ b/lib/libssl/src/apps/gendh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gendh.c,v 1.27 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: gendh.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -180,7 +180,7 @@ end:
 		BIO_free_all(out);
 	if (dh != NULL)
 		DH_free(dh);
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/gendsa.c b/lib/libssl/src/apps/gendsa.c
index 485462c2928..919b40af833 100644
--- a/lib/libssl/src/apps/gendsa.c
+++ b/lib/libssl/src/apps/gendsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gendsa.c,v 1.29 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: gendsa.c,v 1.30 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -226,6 +226,6 @@ end:
 	if (dsa != NULL)
 		DSA_free(dsa);
 	free(passout);
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/genpkey.c b/lib/libssl/src/apps/genpkey.c
index d386a87cb2c..23e32e49f04 100644
--- a/lib/libssl/src/apps/genpkey.c
+++ b/lib/libssl/src/apps/genpkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genpkey.c,v 1.12 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: genpkey.c,v 1.13 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -69,7 +69,7 @@
 #include <openssl/engine.h>
 #endif
 
-static int 
+static int
 init_keygen_file(BIO * err, EVP_PKEY_CTX ** pctx, const char *file,
     ENGINE * e);
 static int genpkey_cb(EVP_PKEY_CTX * ctx);
diff --git a/lib/libssl/src/apps/genrsa.c b/lib/libssl/src/apps/genrsa.c
index dba1d8ccad4..9115a0b3a8a 100644
--- a/lib/libssl/src/apps/genrsa.c
+++ b/lib/libssl/src/apps/genrsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genrsa.c,v 1.36 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: genrsa.c,v 1.37 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -263,7 +263,7 @@ err:
 	free(passout);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/nseq.c b/lib/libssl/src/apps/nseq.c
index b830ced719c..154b6a5685b 100644
--- a/lib/libssl/src/apps/nseq.c
+++ b/lib/libssl/src/apps/nseq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nseq.c,v 1.15 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: nseq.c,v 1.16 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -66,7 +66,7 @@
 
 int nseq_main(int, char **);
 
-int 
+int
 nseq_main(int argc, char **argv)
 {
 	char **args, *infile = NULL, *outfile = NULL;
diff --git a/lib/libssl/src/apps/openssl.cnf b/lib/libssl/src/apps/openssl.cnf
index 7250aacf2c2..ed4bde52e8a 100644
--- a/lib/libssl/src/apps/openssl.cnf
+++ b/lib/libssl/src/apps/openssl.cnf
@@ -14,7 +14,7 @@ oid_section		= new_oids
 # To use this configuration file with the "-extfile" option of the
 # "openssl x509" utility, name here the section containing the
 # X.509v3 extensions to use:
-# extensions		= 
+# extensions		=
 # (Alternatively, use a configuration file that has only
 # X.509v3 extensions in its main [= default] section.)
 
@@ -111,7 +111,7 @@ x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 # input_password = secret
 # output_password = secret
 
-# This sets a mask for permitted string types. There are several options. 
+# This sets a mask for permitted string types. There are several options.
 # default: PrintableString, T61String, BMPString.
 # pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
 # utf8only: only UTF8Strings (PKIX recommendation after 2004).
diff --git a/lib/libssl/src/apps/passwd.c b/lib/libssl/src/apps/passwd.c
index bc77b495403..b9a74bbd0cb 100644
--- a/lib/libssl/src/apps/passwd.c
+++ b/lib/libssl/src/apps/passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: passwd.c,v 1.22 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: passwd.c,v 1.23 2014/07/14 00:35:10 deraadt Exp $ */
 
 #if defined OPENSSL_NO_MD5
 #define NO_MD5CRYPT_1
@@ -36,7 +36,7 @@ static unsigned const char cov_2char[64] = {
 	0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
 };
 
-static int 
+static int
 do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
     char *passwd, BIO * out, int quiet, int table, int reverse,
     size_t pw_maxlen, int usecrypt, int use1, int useapr1);
@@ -55,7 +55,7 @@ do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 
 int passwd_main(int, char **);
 
-int 
+int
 passwd_main(int argc, char **argv)
 {
 	int ret = 1;
@@ -246,7 +246,7 @@ err:
 		BIO_free(in);
 	if (out)
 		BIO_free_all(out);
-	
+
 	return (ret);
 }
 
@@ -366,7 +366,7 @@ md5crypt(const char *passwd, const char *magic, const char *salt)
 #endif
 
 
-static int 
+static int
 do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
     char *passwd, BIO * out, int quiet, int table, int reverse,
     size_t pw_maxlen, int usecrypt, int use1, int useapr1)
@@ -449,7 +449,7 @@ err:
 }
 #else
 
-int 
+int
 passwd_main(int argc, char **argv)
 {
 	fputs("Program not available.\n", stderr)
diff --git a/lib/libssl/src/apps/pkcs12.c b/lib/libssl/src/apps/pkcs12.c
index 35a5dd5bcc2..9899fa6950d 100644
--- a/lib/libssl/src/apps/pkcs12.c
+++ b/lib/libssl/src/apps/pkcs12.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs12.c,v 1.37 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkcs12.c,v 1.38 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -610,11 +610,11 @@ end:
 		sk_OPENSSL_STRING_free(canames);
 	free(passin);
 	free(passout);
-	
+
 	return (ret);
 }
 
-int 
+int
 dump_certs_keys_p12(BIO * out, PKCS12 * p12, char *pass,
     int passlen, int options, char *pempass)
 {
@@ -661,7 +661,7 @@ err:
 	return ret;
 }
 
-int 
+int
 dump_certs_pkeys_bags(BIO * out, STACK_OF(PKCS12_SAFEBAG) * bags,
     char *pass, int passlen, int options, char *pempass)
 {
@@ -676,7 +676,7 @@ dump_certs_pkeys_bags(BIO * out, STACK_OF(PKCS12_SAFEBAG) * bags,
 	return 1;
 }
 
-int 
+int
 dump_certs_pkeys_bag(BIO * out, PKCS12_SAFEBAG * bag, char *pass,
     int passlen, int options, char *pempass)
 {
@@ -760,7 +760,7 @@ dump_certs_pkeys_bag(BIO * out, PKCS12_SAFEBAG * bag, char *pass,
 
 /* Hope this is OK .... */
 
-int 
+int
 get_cert_chain(X509 * cert, X509_STORE * store, STACK_OF(X509) ** chain)
 {
 	X509_STORE_CTX store_ctx;
@@ -792,7 +792,7 @@ err:
 	return i;
 }
 
-int 
+int
 alg_print(BIO * x, X509_ALGOR * alg)
 {
 	PBEPARAM *pbe;
@@ -810,7 +810,7 @@ alg_print(BIO * x, X509_ALGOR * alg)
 
 /* Load all certificates from a given file */
 
-int 
+int
 cert_load(BIO * in, STACK_OF(X509) * sk)
 {
 	int ret;
@@ -827,7 +827,7 @@ cert_load(BIO * in, STACK_OF(X509) * sk)
 
 /* Generalised attribute print: handle PKCS#8 and bag attributes */
 
-int 
+int
 print_attribs(BIO * out, STACK_OF(X509_ATTRIBUTE) * attrlst, const char *name)
 {
 	X509_ATTRIBUTE *attr;
@@ -885,7 +885,7 @@ print_attribs(BIO * out, STACK_OF(X509_ATTRIBUTE) * attrlst, const char *name)
 	return 1;
 }
 
-void 
+void
 hex_prin(BIO * out, unsigned char *buf, int len)
 {
 	int i;
@@ -893,7 +893,7 @@ hex_prin(BIO * out, unsigned char *buf, int len)
 		BIO_printf(out, "%02X ", buf[i]);
 }
 
-static int 
+static int
 set_pbe(BIO * err, int *ppbe, const char *str)
 {
 	if (!str)
diff --git a/lib/libssl/src/apps/pkcs7.c b/lib/libssl/src/apps/pkcs7.c
index 2e3377537b0..34b9d512c4a 100644
--- a/lib/libssl/src/apps/pkcs7.c
+++ b/lib/libssl/src/apps/pkcs7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.c,v 1.20 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkcs7.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -79,7 +79,7 @@
 
 int pkcs7_main(int, char **);
 
-int 
+int
 pkcs7_main(int argc, char **argv)
 {
 	PKCS7 *p7 = NULL;
@@ -279,6 +279,6 @@ end:
 		BIO_free(in);
 	if (out != NULL)
 		BIO_free_all(out);
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/pkcs8.c b/lib/libssl/src/apps/pkcs8.c
index f33cd89ab10..9b0b15baac6 100644
--- a/lib/libssl/src/apps/pkcs8.c
+++ b/lib/libssl/src/apps/pkcs8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs8.c,v 1.20 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -68,7 +68,7 @@
 
 int pkcs8_main(int, char **);
 
-int 
+int
 pkcs8_main(int argc, char **argv)
 {
 	ENGINE *e = NULL;
diff --git a/lib/libssl/src/apps/pkey.c b/lib/libssl/src/apps/pkey.c
index 1769f62b0b2..a419e3007f9 100644
--- a/lib/libssl/src/apps/pkey.c
+++ b/lib/libssl/src/apps/pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkey.c,v 1.10 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkey.c,v 1.11 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -67,7 +67,7 @@
 
 int pkey_main(int, char **);
 
-int 
+int
 pkey_main(int argc, char **argv)
 {
 	ENGINE *e = NULL;
diff --git a/lib/libssl/src/apps/pkeyparam.c b/lib/libssl/src/apps/pkeyparam.c
index 6b1ce3d482d..3ae73efb681 100644
--- a/lib/libssl/src/apps/pkeyparam.c
+++ b/lib/libssl/src/apps/pkeyparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyparam.c,v 1.8 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkeyparam.c,v 1.9 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -67,7 +67,7 @@
 
 int pkeyparam_main(int, char **);
 
-int 
+int
 pkeyparam_main(int argc, char **argv)
 {
 	char **args, *infile = NULL, *outfile = NULL;
diff --git a/lib/libssl/src/apps/pkeyutl.c b/lib/libssl/src/apps/pkeyutl.c
index fa1a6639282..df173f4374f 100644
--- a/lib/libssl/src/apps/pkeyutl.c
+++ b/lib/libssl/src/apps/pkeyutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyutl.c,v 1.13 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: pkeyutl.c,v 1.14 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -83,7 +83,7 @@ static int do_keyop(EVP_PKEY_CTX * ctx, int pkey_op,
 
 int pkeyutl_main(int argc, char **);
 
-int 
+int
 pkeyutl_main(int argc, char **argv)
 {
 	BIO *in = NULL, *out = NULL;
@@ -327,7 +327,7 @@ end:
 	return ret;
 }
 
-static void 
+static void
 usage()
 {
 	BIO_printf(bio_err, "Usage: pkeyutl [options]\n");
@@ -446,7 +446,7 @@ end:
 
 }
 
-static int 
+static int
 setup_peer(BIO * err, EVP_PKEY_CTX * ctx, int peerform,
     const char *file)
 {
@@ -471,7 +471,7 @@ setup_peer(BIO * err, EVP_PKEY_CTX * ctx, int peerform,
 	return ret;
 }
 
-static int 
+static int
 do_keyop(EVP_PKEY_CTX * ctx, int pkey_op,
     unsigned char *out, size_t * poutlen,
     unsigned char *in, size_t inlen)
diff --git a/lib/libssl/src/apps/prime.c b/lib/libssl/src/apps/prime.c
index 9918db06c7d..710939f08da 100644
--- a/lib/libssl/src/apps/prime.c
+++ b/lib/libssl/src/apps/prime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prime.c,v 1.11 2014/06/28 04:39:41 deraadt Exp $ */
+/* $OpenBSD: prime.c,v 1.12 2014/07/14 00:35:10 deraadt Exp $ */
 /* ====================================================================
  * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
  *
@@ -57,7 +57,7 @@
 
 int prime_main(int, char **);
 
-int 
+int
 prime_main(int argc, char **argv)
 {
 	int hex = 0;
diff --git a/lib/libssl/src/apps/rand.c b/lib/libssl/src/apps/rand.c
index f4a7c020fdd..9d7aba4d86b 100644
--- a/lib/libssl/src/apps/rand.c
+++ b/lib/libssl/src/apps/rand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rand.c,v 1.21 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: rand.c,v 1.22 2014/07/14 00:35:10 deraadt Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
  *
@@ -71,7 +71,7 @@
 
 int rand_main(int, char **);
 
-int 
+int
 rand_main(int argc, char **argv)
 {
 	int i, r, ret = 1;
@@ -189,6 +189,6 @@ err:
 	ERR_print_errors(bio_err);
 	if (out)
 		BIO_free_all(out);
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/req.c b/lib/libssl/src/apps/req.c
index 81a58ca54be..7c2ce58f88b 100644
--- a/lib/libssl/src/apps/req.c
+++ b/lib/libssl/src/apps/req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: req.c,v 1.45 2014/07/09 21:02:35 tedu Exp $ */
+/* $OpenBSD: req.c,v 1.46 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -909,11 +909,11 @@ end:
 	if (passargout && passout)
 		free(passout);
 	OBJ_cleanup();
-	
+
 	return (ex);
 }
 
-static int 
+static int
 make_REQ(X509_REQ * req, EVP_PKEY * pkey, char *subj, int multirdn,
     int attribs, unsigned long chtype)
 {
@@ -978,7 +978,7 @@ err:
  * subject is expected to be in the format /type0=value0/type1=value1/type2=...
  * where characters may be escaped by \
  */
-static int 
+static int
 build_subject(X509_REQ * req, char *subject, unsigned long chtype, int multirdn)
 {
 	X509_NAME *n;
@@ -995,7 +995,7 @@ build_subject(X509_REQ * req, char *subject, unsigned long chtype, int multirdn)
 }
 
 
-static int 
+static int
 prompt_info(X509_REQ * req,
     STACK_OF(CONF_VALUE) * dn_sk, char *dn_sect,
     STACK_OF(CONF_VALUE) * attr_sk, char *attr_sect, int attribs,
@@ -1180,7 +1180,7 @@ start2:			for (;;) {
 
 }
 
-static int 
+static int
 auto_info(X509_REQ * req, STACK_OF(CONF_VALUE) * dn_sk,
     STACK_OF(CONF_VALUE) * attr_sk, int attribs, unsigned long chtype)
 {
@@ -1235,7 +1235,7 @@ auto_info(X509_REQ * req, STACK_OF(CONF_VALUE) * dn_sk,
 }
 
 
-static int 
+static int
 add_DN_object(X509_NAME * n, char *text, const char *def, char *value,
     int nid, int n_min, int n_max, unsigned long chtype, int mval)
 {
@@ -1286,7 +1286,7 @@ err:
 	return (ret);
 }
 
-static int 
+static int
 add_attribute_object(X509_REQ * req, char *text, const char *def,
     char *value, int nid, int n_min,
     int n_max, unsigned long chtype)
@@ -1343,7 +1343,7 @@ err:
 	return (0);
 }
 
-static int 
+static int
 req_check_len(int len, int n_min, int n_max)
 {
 	if ((n_min > 0) && (len < n_min)) {
@@ -1358,7 +1358,7 @@ req_check_len(int len, int n_min, int n_max)
 }
 
 /* Check if the end of a string matches 'end' */
-static int 
+static int
 check_end(const char *str, const char *end)
 {
 	int elen, slen;
@@ -1392,7 +1392,7 @@ set_keygen_ctx(BIO * err, const char *gstr, int *pkey_type,
 		if (errstr) {
 			BIO_printf(err, "bad algorithm %s: %s\n", gstr, errstr);
 			return NULL;
-		} 
+		}
 		*pkeylen = keylen;
 	} else if (!strncmp(gstr, "param:", 6))
 		paramfile = gstr + 6;
@@ -1429,7 +1429,7 @@ set_keygen_ctx(BIO * err, const char *gstr, int *pkey_type,
 				if (errstr) {
 					BIO_printf(err, "bad algorithm %s: %s\n",
 					    p + 1, errstr);
-					return NULL;					
+					return NULL;
 				}
 				*pkeylen = keylen;
 			} else
@@ -1516,7 +1516,7 @@ set_keygen_ctx(BIO * err, const char *gstr, int *pkey_type,
 	return gctx;
 }
 
-static int 
+static int
 genpkey_cb(EVP_PKEY_CTX * ctx)
 {
 	char c = '*';
@@ -1536,7 +1536,7 @@ genpkey_cb(EVP_PKEY_CTX * ctx)
 	return 1;
 }
 
-static int 
+static int
 do_sign_init(BIO * err, EVP_MD_CTX * ctx, EVP_PKEY * pkey,
     const EVP_MD * md, STACK_OF(OPENSSL_STRING) * sigopts)
 {
@@ -1556,7 +1556,7 @@ do_sign_init(BIO * err, EVP_MD_CTX * ctx, EVP_PKEY * pkey,
 	return 1;
 }
 
-int 
+int
 do_X509_sign(BIO * err, X509 * x, EVP_PKEY * pkey, const EVP_MD * md,
     STACK_OF(OPENSSL_STRING) * sigopts)
 {
@@ -1571,7 +1571,7 @@ do_X509_sign(BIO * err, X509 * x, EVP_PKEY * pkey, const EVP_MD * md,
 }
 
 
-int 
+int
 do_X509_REQ_sign(BIO * err, X509_REQ * x, EVP_PKEY * pkey, const EVP_MD * md,
     STACK_OF(OPENSSL_STRING) * sigopts)
 {
@@ -1587,7 +1587,7 @@ do_X509_REQ_sign(BIO * err, X509_REQ * x, EVP_PKEY * pkey, const EVP_MD * md,
 
 
 
-int 
+int
 do_X509_CRL_sign(BIO * err, X509_CRL * x, EVP_PKEY * pkey, const EVP_MD * md,
     STACK_OF(OPENSSL_STRING) * sigopts)
 {
diff --git a/lib/libssl/src/apps/rsa.c b/lib/libssl/src/apps/rsa.c
index 798283755fd..1bb78e94a9a 100644
--- a/lib/libssl/src/apps/rsa.c
+++ b/lib/libssl/src/apps/rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.c,v 1.26 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: rsa.c,v 1.27 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -97,7 +97,7 @@
 
 int rsa_main(int, char **);
 
-int 
+int
 rsa_main(int argc, char **argv)
 {
 	ENGINE *e = NULL;
@@ -387,6 +387,6 @@ end:
 		RSA_free(rsa);
 	free(passin);
 	free(passout);
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/rsautl.c b/lib/libssl/src/apps/rsautl.c
index 966b7fe75ff..d961582fe4e 100644
--- a/lib/libssl/src/apps/rsautl.c
+++ b/lib/libssl/src/apps/rsautl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsautl.c,v 1.23 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: rsautl.c,v 1.24 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -80,7 +80,7 @@ static void usage(void);
 
 int rsautl_main(int argc, char **);
 
-int 
+int
 rsautl_main(int argc, char **argv)
 {
 	ENGINE *e = NULL;
@@ -313,7 +313,7 @@ end:
 	return ret;
 }
 
-static void 
+static void
 usage()
 {
 	BIO_printf(bio_err, "Usage: rsautl [options]\n");
diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c
index 355a66fd9b3..de1669794bc 100644
--- a/lib/libssl/src/apps/s_client.c
+++ b/lib/libssl/src/apps/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.68 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: s_client.c,v 1.69 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -199,7 +199,7 @@ static int c_quiet = 0;
 static int c_ign_eof = 0;
 
 
-static void 
+static void
 sc_usage(void)
 {
 	BIO_printf(bio_err, "usage: s_client args\n");
@@ -276,7 +276,7 @@ typedef struct tlsextctx_st {
 } tlsextctx;
 
 
-static int 
+static int
 ssl_servername_cb(SSL * s, int *ad, void *arg)
 {
 	tlsextctx *p = (tlsextctx *) arg;
@@ -303,7 +303,7 @@ typedef struct tlsextnextprotoctx_st {
 
 static tlsextnextprotoctx next_proto;
 
-static int 
+static int
 next_proto_cb(SSL * s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
 {
 	tlsextnextprotoctx *ctx = arg;
@@ -338,7 +338,7 @@ enum {
 
 int s_client_main(int, char **);
 
-int 
+int
 s_client_main(int argc, char **argv)
 {
 	unsigned int off = 0, clr = 0;
@@ -436,7 +436,7 @@ s_client_main(int argc, char **argv)
 				goto bad;
 			verify_depth = strtonum(*(++argv), 0, INT_MAX, &errstr);
 			if (errstr)
-				goto bad;			
+				goto bad;
 			BIO_printf(bio_err, "verify depth is %d\n", verify_depth);
 		} else if (strcmp(*argv, "-cert") == 0) {
 			if (--argc < 1)
@@ -1297,12 +1297,12 @@ end:
 		BIO_free(bio_c_out);
 		bio_c_out = NULL;
 	}
-	
+
 	return (ret);
 }
 
 
-static void 
+static void
 print_stuff(BIO * bio, SSL * s, int full)
 {
 	X509 *peer = NULL;
@@ -1478,7 +1478,7 @@ print_stuff(BIO * bio, SSL * s, int full)
 
 #ifndef OPENSSL_NO_TLSEXT
 
-static int 
+static int
 ocsp_resp_cb(SSL * s, void *arg)
 {
 	const unsigned char *p;
diff --git a/lib/libssl/src/apps/s_server.c b/lib/libssl/src/apps/s_server.c
index 75e7d833542..b6e16f31aee 100644
--- a/lib/libssl/src/apps/s_server.c
+++ b/lib/libssl/src/apps/s_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_server.c,v 1.60 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: s_server.c,v 1.61 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -185,7 +185,7 @@ static void close_accept_socket(void);
 static void sv_usage(void);
 static int init_ssl_connection(SSL * s);
 static void print_stats(BIO * bp, SSL_CTX * ctx);
-static int 
+static int
 generate_session_id(const SSL * ssl, unsigned char *id,
     unsigned int *id_len);
 #ifndef OPENSSL_NO_DH
@@ -282,7 +282,7 @@ static int cert_chain = 0;
 
 
 
-static void 
+static void
 s_server_init(void)
 {
 	accept_socket = -1;
@@ -312,7 +312,7 @@ s_server_init(void)
 #endif
 }
 
-static void 
+static void
 sv_usage(void)
 {
 	BIO_printf(bio_err, "usage: s_server [args ...]\n");
@@ -415,7 +415,7 @@ typedef struct tlsextctx_st {
 } tlsextctx;
 
 
-static int 
+static int
 ssl_servername_cb(SSL * s, int *ad, void *arg)
 {
 	tlsextctx *p = (tlsextctx *) arg;
@@ -461,7 +461,7 @@ static tlsextstatusctx tlscstatp = {NULL, NULL, NULL, 0, -1, NULL, 0};
  * considered "expired".
  */
 
-static int 
+static int
 cert_status_cb(SSL * s, void *arg)
 {
 	tlsextstatusctx *srctx = arg;
@@ -577,7 +577,7 @@ typedef struct tlsextnextprotoctx_st {
 	unsigned int len;
 } tlsextnextprotoctx;
 
-static int 
+static int
 next_proto_cb(SSL * s, const unsigned char **data, unsigned int *len, void *arg)
 {
 	tlsextnextprotoctx *next_proto = arg;
@@ -598,7 +598,7 @@ int s_server_main(int, char **);
 static char *srtp_profiles = NULL;
 #endif
 
-int 
+int
 s_server_main(int argc, char *argv[])
 {
 	X509_VERIFY_PARAM *vpm = NULL;
@@ -1315,11 +1315,11 @@ end:
 		BIO_free(bio_s_out);
 		bio_s_out = NULL;
 	}
-	
+
 	return (ret);
 }
 
-static void 
+static void
 print_stats(BIO * bio, SSL_CTX * ssl_ctx)
 {
 	BIO_printf(bio, "%4ld items in the session cache\n",
@@ -1345,7 +1345,7 @@ print_stats(BIO * bio, SSL_CTX * ssl_ctx)
 	    SSL_CTX_sess_get_cache_size(ssl_ctx));
 }
 
-static int 
+static int
 sv_body(char *hostname, int s, unsigned char *context)
 {
 	char *buf = NULL;
@@ -1653,7 +1653,7 @@ err:
 	return (ret);
 }
 
-static void 
+static void
 close_accept_socket(void)
 {
 	BIO_printf(bio_err, "shutdown accept socket\n");
@@ -1663,7 +1663,7 @@ close_accept_socket(void)
 	}
 }
 
-static int 
+static int
 init_ssl_connection(SSL * con)
 {
 	int i;
@@ -1779,7 +1779,7 @@ err:
 }
 #endif
 
-static int 
+static int
 www_body(char *hostname, int s, unsigned char *context)
 {
 	char *buf = NULL;
@@ -2128,7 +2128,7 @@ tmp_rsa_cb(SSL * s, int is_export, int keylength)
 }
 
 #define MAX_SESSION_ID_ATTEMPTS 10
-static int 
+static int
 generate_session_id(const SSL * ssl, unsigned char *id,
     unsigned int *id_len)
 {
diff --git a/lib/libssl/src/apps/s_time.c b/lib/libssl/src/apps/s_time.c
index c5fd05b828d..a150ff31531 100644
--- a/lib/libssl/src/apps/s_time.c
+++ b/lib/libssl/src/apps/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.33 2014/07/12 19:31:21 jsing Exp $ */
+/* $OpenBSD: s_time.c,v 1.34 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -123,7 +123,7 @@ static int st_bugs = 0;
 static int perform = 0;
 static int t_nbio = 0;
 
-static void 
+static void
 s_time_init(void)
 {
 	host = SSL_CONNECT_NAME;
@@ -147,7 +147,7 @@ s_time_init(void)
 /***********************************************************************
  * usage - display usage message
  */
-static void 
+static void
 s_time_usage(void)
 {
 	static const char umsg[] = "\
@@ -178,7 +178,7 @@ s_time_usage(void)
  *
  * Returns 0 if ok, -1 on bad args
  */
-static int 
+static int
 parseArgs(int argc, char **argv)
 {
 	int badop = 0;
@@ -301,7 +301,7 @@ bad:
 #define START	0
 #define STOP	1
 
-static double 
+static double
 tm_Time_F(int s)
 {
 	return app_tminterval(s, 1);
@@ -313,7 +313,7 @@ tm_Time_F(int s)
  */
 int s_time_main(int, char **);
 
-int 
+int
 s_time_main(int argc, char **argv)
 {
 	double totalTime = 0.0;
@@ -517,7 +517,7 @@ end:
 		SSL_CTX_free(tm_ctx);
 		tm_ctx = NULL;
 	}
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/sess_id.c b/lib/libssl/src/apps/sess_id.c
index cc5cf512145..e841003cf6c 100644
--- a/lib/libssl/src/apps/sess_id.c
+++ b/lib/libssl/src/apps/sess_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sess_id.c,v 1.18 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: sess_id.c,v 1.19 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ static SSL_SESSION *load_sess_id(char *file, int format);
 
 int sess_id_main(int, char **);
 
-int 
+int
 sess_id_main(int argc, char **argv)
 {
 	SSL_SESSION *x = NULL;
@@ -240,7 +240,7 @@ end:
 		BIO_free_all(out);
 	if (x != NULL)
 		SSL_SESSION_free(x);
-	
+
 	return (ret);
 }
 
diff --git a/lib/libssl/src/apps/smime.c b/lib/libssl/src/apps/smime.c
index 92e379d3e3d..8386f1e458c 100644
--- a/lib/libssl/src/apps/smime.c
+++ b/lib/libssl/src/apps/smime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smime.c,v 1.27 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: smime.c,v 1.28 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -84,7 +84,7 @@ static int smime_cb(int ok, X509_STORE_CTX * ctx);
 
 int smime_main(int, char **);
 
-int 
+int
 smime_main(int argc, char **argv)
 {
 	ENGINE *e = NULL;
@@ -660,7 +660,7 @@ end:
 	return (ret);
 }
 
-static int 
+static int
 save_certs(char *signerfile, STACK_OF(X509) * signers)
 {
 	int i;
@@ -679,7 +679,7 @@ save_certs(char *signerfile, STACK_OF(X509) * signers)
 
 /* Minimal callback just to output policy info (if any) */
 
-static int 
+static int
 smime_cb(int ok, X509_STORE_CTX * ctx)
 {
 	int error;
diff --git a/lib/libssl/src/apps/speed.c b/lib/libssl/src/apps/speed.c
index 1258cc25810..61b2157c28c 100644
--- a/lib/libssl/src/apps/speed.c
+++ b/lib/libssl/src/apps/speed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: speed.c,v 1.51 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: speed.c,v 1.52 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -165,7 +165,7 @@ static int usertime = 1;
 
 static double Time_F(int s);
 static void print_message(const char *s, long num, int length);
-static void 
+static void
 pkey_print_message(const char *str, const char *str2,
     long num, int bits, int sec);
 static void print_result(int alg, int run_no, int count, double time_used);
@@ -207,7 +207,7 @@ sig_done(int sig)
 #define STOP	1
 
 
-static double 
+static double
 Time_F(int s)
 {
 	return app_tminterval(s, usertime);
@@ -232,7 +232,7 @@ KDF1_SHA1(const void *in, size_t inlen, void *out, size_t * outlen)
 
 int speed_main(int, char **);
 
-int 
+int
 speed_main(int argc, char **argv)
 {
 	unsigned char *buf = NULL, *buf2 = NULL;
@@ -1934,11 +1934,11 @@ end:
 			EC_KEY_free(ecdh_b[i]);
 	}
 
-	
+
 	return (mret);
 }
 
-static void 
+static void
 print_message(const char *s, long num, int length)
 {
 	BIO_printf(bio_err, mr ? "+DT:%s:%d:%d\n"
@@ -1947,7 +1947,7 @@ print_message(const char *s, long num, int length)
 	alarm(SECONDS);
 }
 
-static void 
+static void
 pkey_print_message(const char *str, const char *str2, long num,
     int bits, int tm)
 {
@@ -1957,7 +1957,7 @@ pkey_print_message(const char *str, const char *str2, long num,
 	alarm(tm);
 }
 
-static void 
+static void
 print_result(int alg, int run_no, int count, double time_used)
 {
 	BIO_printf(bio_err, mr ? "+R:%d:%s:%f\n"
@@ -1993,7 +1993,7 @@ sstrsep(char **string, const char *delim)
 	return token;
 }
 
-static int 
+static int
 do_multi(int multi)
 {
 	int n;
diff --git a/lib/libssl/src/apps/spkac.c b/lib/libssl/src/apps/spkac.c
index 20492bb818e..3eef33061d2 100644
--- a/lib/libssl/src/apps/spkac.c
+++ b/lib/libssl/src/apps/spkac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkac.c,v 1.20 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: spkac.c,v 1.21 2014/07/14 00:35:10 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999. Based on an original idea by Massimiliano Pala
  * (madwolf@openca.org).
@@ -78,7 +78,7 @@
 
 int spkac_main(int, char **);
 
-int 
+int
 spkac_main(int argc, char **argv)
 {
 	ENGINE *e = NULL;
@@ -275,6 +275,6 @@ end:
 	BIO_free_all(out);
 	EVP_PKEY_free(pkey);
 	free(passin);
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/verify.c b/lib/libssl/src/apps/verify.c
index 1fae9dd933d..218270aa441 100644
--- a/lib/libssl/src/apps/verify.c
+++ b/lib/libssl/src/apps/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.25 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: verify.c,v 1.26 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -238,7 +238,7 @@ end:
 	sk_X509_pop_free(untrusted, X509_free);
 	sk_X509_pop_free(trusted, X509_free);
 	sk_X509_CRL_pop_free(crls, X509_CRL_free);
-	
+
 	return (ret < 0 ? 2 : ret);
 }
 
diff --git a/lib/libssl/src/apps/version.c b/lib/libssl/src/apps/version.c
index 2497a0618ef..4bb0ef558ca 100644
--- a/lib/libssl/src/apps/version.c
+++ b/lib/libssl/src/apps/version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.c,v 1.17 2014/06/12 15:49:27 deraadt Exp $ */
+/* $OpenBSD: version.c,v 1.18 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -203,6 +203,6 @@ version_main(int argc, char **argv)
 	if (dir)
 		printf("%s\n", SSLeay_version(SSLEAY_DIR));
 end:
-	
+
 	return (ret);
 }
diff --git a/lib/libssl/src/apps/x509.c b/lib/libssl/src/apps/x509.c
index 647aa9c0f84..6729ed412ce 100644
--- a/lib/libssl/src/apps/x509.c
+++ b/lib/libssl/src/apps/x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.c,v 1.48 2014/07/12 17:54:31 jsing Exp $ */
+/* $OpenBSD: x509.c,v 1.49 2014/07/14 00:35:10 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -933,7 +933,7 @@ end:
 	sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
 	sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
 	free(passin);
-	
+
 	return (ret);
 }