More KNF.

10 files changed, 109 insertions, 104 deletions

diff --git a/lib/libssl/src/crypto/bio/b_dump.c b/lib/libssl/src/crypto/bio/b_dump.c
index 32d523563ea..090cfc2b5f4 100644
--- a/lib/libssl/src/crypto/bio/b_dump.c
+++ b/lib/libssl/src/crypto/bio/b_dump.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,14 +49,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
-/* 
+/*
  * Stolen from tjh's ssl/ssl_trc.c stuff.
  */
 
diff --git a/lib/libssl/src/crypto/bio/b_print.c b/lib/libssl/src/crypto/bio/b_print.c
index b3b0d45ee68..55a5ca1a327 100644
--- a/lib/libssl/src/crypto/bio/b_print.c
+++ b/lib/libssl/src/crypto/bio/b_print.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
 # endif
 #endif
 
-/* 
+/*
  * Stolen from tjh's ssl/ssl_trc.c stuff.
  */
 
@@ -336,7 +336,7 @@ _dopr(char **sbuffer, char **buffer, size_t *maxlen, size_t *retlen,
 				else
 					fvalue = va_arg(args, double);
 				fmtfp(sbuffer, buffer, &currlen, maxlen,
-				fvalue, min, max, flags);
+				    fvalue, min, max, flags);
 				break;
 			case 'E':
 				flags |= DP_F_UP;
@@ -356,7 +356,7 @@ _dopr(char **sbuffer, char **buffer, size_t *maxlen, size_t *retlen,
 				break;
 			case 'c':
 				doapr_outch(sbuffer, buffer, &currlen, maxlen,
-				va_arg(args, int));
+				    va_arg(args, int));
 				break;
 			case 's':
 				strvalue = va_arg(args, char *);
@@ -671,7 +671,7 @@ fmtfp(char **sbuffer, char **buffer, size_t *currlen, size_t *maxlen,
 		doapr_outch(sbuffer, buffer, currlen, maxlen, signvalue);
 
 	while (iplace > 0)
-	doapr_outch(sbuffer, buffer, currlen, maxlen, iconvert[--iplace]);
+		doapr_outch(sbuffer, buffer, currlen, maxlen, iconvert[--iplace]);
 
 	/*
 	 * Decimal point. This should probably use locale to find the correct
@@ -681,7 +681,7 @@ fmtfp(char **sbuffer, char **buffer, size_t *currlen, size_t *maxlen,
 		doapr_outch(sbuffer, buffer, currlen, maxlen, '.');
 
 		while (fplace > 0)
-		doapr_outch(sbuffer, buffer, currlen, maxlen, fconvert[--fplace]);
+			doapr_outch(sbuffer, buffer, currlen, maxlen, fconvert[--fplace]);
 	}
 	while (zpadlen > 0) {
 		doapr_outch(sbuffer, buffer, currlen, maxlen, '0');
diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c
index 2a9159ec558..cd62f889abd 100644
--- a/lib/libssl/src/crypto/bio/b_sock.c
+++ b/lib/libssl/src/crypto/bio/b_sock.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -240,7 +240,7 @@ BIO_sock_error(int sock)
 	 * a cast it will choke the compiler: if you do have a cast then
 	 * you can either go for (char *) or (void *).
 	 */
-	i = getsockopt(sock, SOL_SOCKET, SO_ERROR,(void *)&j,(void *)&size);
+	i = getsockopt(sock, SOL_SOCKET, SO_ERROR, (void *)&j, (void *)&size);
 	if (i < 0)
 		return (1);
 	else
@@ -317,12 +317,14 @@ static struct hostent
 	memset(ret->h_addr_list, 0, i*sizeof(char *));
 
 	j = strlen(a->h_name) + 1;
-	if ((ret->h_name = OPENSSL_malloc(j)) == NULL) goto err;
-		memcpy((char *)ret->h_name, a->h_name, j);
+	if ((ret->h_name = OPENSSL_malloc(j)) == NULL)
+		goto err;
+	memcpy((char *)ret->h_name, a->h_name, j);
 	for (i = 0; a->h_aliases[i] != NULL; i++) {
 		j = strlen(a->h_aliases[i]) + 1;
-		if ((ret->h_aliases[i] = OPENSSL_malloc(j)) == NULL) goto err;
-			memcpy(ret->h_aliases[i], a->h_aliases[i], j);
+		if ((ret->h_aliases[i] = OPENSSL_malloc(j)) == NULL)
+			goto err;
+		memcpy(ret->h_aliases[i], a->h_aliases[i], j);
 	}
 	ret->h_length = a->h_length;
 	ret->h_addrtype = a->h_addrtype;
@@ -367,7 +369,8 @@ ghbn_free(struct hostent *a)
 #endif
 
 struct hostent
-*BIO_gethostbyname(const char *name) {
+*BIO_gethostbyname(const char *name)
+{
 #if 1
 	/* Caching gethostbyname() results forever is wrong,
 	 * so we have to let the true gethostbyname() worry about this */
@@ -504,7 +507,7 @@ BIO_socket_ioctl(int fd, long type, void *arg)
 	int i;
 
 #ifdef __DJGPP__
-	i = ioctl(fd, type,(char *)arg);
+	i = ioctl(fd, type, (char *)arg);
 #else
 # if defined(OPENSSL_SYS_VMS)
 	/* 2011-02-18 SMS.
@@ -562,7 +565,7 @@ get_ip(const char *str, unsigned char ip[4])
 			num++;
 			ok = 0;
 		} else if (c == '\0' && (num == 3) && ok)
-		break;
+			break;
 		else
 			return (0);
 	}
@@ -618,8 +621,8 @@ BIO_get_accept_socket(char *host, int bind_mode)
 		static union {
 			void *p;
 			int (WSAAPI *f)(const char *, const char *,
-			const struct addrinfo *,
-			struct addrinfo **);
+			    const struct addrinfo *,
+			    struct addrinfo **);
 		} p_getaddrinfo = {NULL};
 		static union {
 			void *p;
@@ -630,9 +633,10 @@ BIO_get_accept_socket(char *host, int bind_mode)
 		if (p_getaddrinfo.p == NULL) {
 			if ((p_getaddrinfo.p = DSO_global_lookup("getaddrinfo"))==NULL ||
 			    (p_freeaddrinfo.p = DSO_global_lookup("freeaddrinfo"))==NULL)
-			p_getaddrinfo.p = (void*) - 1;
+				p_getaddrinfo.p = (void*) - 1;
 		}
-		if (p_getaddrinfo.p == (void *) - 1) break;
+		if (p_getaddrinfo.p == (void *) - 1)
+			break;
 
 		/* '::port' enforces IPv6 wildcard listener. Some OSes,
 		 * e.g. Solaris, default to IPv6 without any hint. Also
@@ -680,8 +684,7 @@ BIO_get_accept_socket(char *host, int bind_mode)
 	else {
 		if (!BIO_get_host_ip(h, &(ip[0])))
 			goto err;
-		l = (unsigned long)
-		    ((unsigned long)ip[0]<<24L)|
+		l = (unsigned long)((unsigned long)ip[0]<<24L)|
 		    ((unsigned long)ip[1]<<16L)|
 		    ((unsigned long)ip[2]<< 8L)|
 		    ((unsigned long)ip[3]);
@@ -701,7 +704,7 @@ again:
 	if (bind_mode == BIO_BIND_REUSEADDR) {
 		int i = 1;
 
-		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR,(char *)&i, sizeof(i));
+		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&i, sizeof(i));
 		bind_mode = BIO_BIND_NORMAL;
 	}
 #endif
@@ -709,8 +712,7 @@ again:
 #ifdef SO_REUSEADDR
 		err_num = errno;
 		if ((bind_mode == BIO_BIND_REUSEADDR_IF_UNUSED) &&
-		(err_num == EADDRINUSE))
-		{
+		    (err_num == EADDRINUSE)) {
 			client = server;
 			if (h == NULL || strcmp(h, "*") == 0) {
 #if OPENSSL_USE_IPV6
@@ -807,15 +809,16 @@ BIO_accept(int sock, char **addr)
 	sa.len.s = 0;
 	sa.len.i = sizeof(sa.from);
 	memset(&sa.from, 0, sizeof(sa.from));
-	ret = accept(sock, &sa.from.sa,(void *)&sa.len);
+	ret = accept(sock, &sa.from.sa, (void *)&sa.len);
 	if (sizeof(sa.len.i) != sizeof(sa.len.s) && sa.len.i == 0) {
 		OPENSSL_assert(sa.len.s <= sizeof(sa.from));
 		sa.len.i = (int)sa.len.s;
 		/* use sa.len.i from this point */
 	}
 	if (ret == -1) {
-		if (BIO_sock_should_retry(ret)) return -2;
-			SYSerr(SYS_F_ACCEPT, errno);
+		if (BIO_sock_should_retry(ret))
+			return -2;
+		SYSerr(SYS_F_ACCEPT, errno);
 		BIOerr(BIO_F_BIO_ACCEPT, BIO_R_ACCEPT_ERROR);
 		goto end;
 	}
@@ -830,7 +833,7 @@ BIO_accept(int sock, char **addr)
 		static union {
 			void *p;
 			int (WSAAPI *f)(const struct sockaddr *,
-			    size_t/*socklen_t*/, char *, size_t,
+			size_t/*socklen_t*/, char *, size_t,
 			    char *, size_t, int);
 		} p_getnameinfo = {NULL};
 		/* 2nd argument to getnameinfo is specified to
@@ -900,7 +903,7 @@ BIO_set_tcp_ndelay(int s, int on)
 #endif
 #endif
 
-	ret = setsockopt(s, opt, TCP_NODELAY,(char *)&on, sizeof(on));
+	ret = setsockopt(s, opt, TCP_NODELAY, (char *)&on, sizeof(on));
 #endif
 	return (ret == 0);
 }
diff --git a/lib/libssl/src/crypto/bio/bf_buff.c b/lib/libssl/src/crypto/bio/bf_buff.c
index 9518cf977e0..937a1c58d56 100644
--- a/lib/libssl/src/crypto/bio/bf_buff.c
+++ b/lib/libssl/src/crypto/bio/bf_buff.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -247,7 +247,7 @@ start:
 		/* we now have a full buffer needing flushing */
 		for (;;) {
 			i = BIO_write(b->next_bio, &(ctx->obuf[ctx->obuf_off]),
-			ctx->obuf_len);
+			    ctx->obuf_len);
 			if (i <= 0) {
 				BIO_copy_next_retry(b);
 
@@ -283,7 +283,7 @@ start:
 			return (num);
 	}
 
-	/* copy the rest into the buffer since we have only a small 
+	/* copy the rest into the buffer since we have only a small
 	 * amount left */
 	goto start;
 }
@@ -348,7 +348,7 @@ buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
 		}
 		ctx->ibuf_off = 0;
 		ctx->ibuf_len = (int)num;
-		memcpy(ctx->ibuf, ptr,(int)num);
+		memcpy(ctx->ibuf, ptr, (int)num);
 		ret = 1;
 		break;
 	case BIO_C_SET_BUFF_SIZE:
@@ -417,8 +417,8 @@ buffer_ctrl(BIO *b, int cmd, long num, void *ptr)
 			BIO_clear_retry_flags(b);
 			if (ctx->obuf_len > 0) {
 				r = BIO_write(b->next_bio,
-				&(ctx->obuf[ctx->obuf_off]),
-				ctx->obuf_len);
+				    &(ctx->obuf[ctx->obuf_off]),
+				    ctx->obuf_len);
 #if 0
 				fprintf(stderr, "FLUSH [%3d] %3d -> %3d\n", ctx->obuf_off, ctx->obuf_len, r);
 #endif
diff --git a/lib/libssl/src/crypto/bio/bf_lbuf.c b/lib/libssl/src/crypto/bio/bf_lbuf.c
index 838839f1bf4..006ed9d91cd 100644
--- a/lib/libssl/src/crypto/bio/bf_lbuf.c
+++ b/lib/libssl/src/crypto/bio/bf_lbuf.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -333,7 +333,7 @@ linebuffer_ctrl(BIO *b, int cmd, long num, void *ptr)
 			BIO_clear_retry_flags(b);
 			if (ctx->obuf_len > 0) {
 				r = BIO_write(b->next_bio,
-				ctx->obuf, ctx->obuf_len);
+				    ctx->obuf, ctx->obuf_len);
 #if 0
 				fprintf(stderr, "FLUSH %3d -> %3d\n", ctx->obuf_len, r);
 #endif
diff --git a/lib/libssl/src/crypto/bio/bf_nbio.c b/lib/libssl/src/crypto/bio/bf_nbio.c
index 76f8f319504..d181f518ec2 100644
--- a/lib/libssl/src/crypto/bio/bf_nbio.c
+++ b/lib/libssl/src/crypto/bio/bf_nbio.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/libssl/src/crypto/bio/bf_null.c b/lib/libssl/src/crypto/bio/bf_null.c
index 354731c0c74..ada677c91e1 100644
--- a/lib/libssl/src/crypto/bio/bf_null.c
+++ b/lib/libssl/src/crypto/bio/bf_null.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/libssl/src/crypto/bio/bio_cb.c b/lib/libssl/src/crypto/bio/bio_cb.c
index 3e110f3751a..00f41b1de1e 100644
--- a/lib/libssl/src/crypto/bio/bio_cb.c
+++ b/lib/libssl/src/crypto/bio/bio_cb.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -87,7 +87,7 @@ BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi, long argl,
 		if (bio->method->type & BIO_TYPE_DESCRIPTOR)
 			(void) snprintf(p, p_maxlen,
 			    "read(%d,%lu) - %s fd=%d\n",
-			    bio->num,(unsigned long)argi,
+			    bio->num, (unsigned long)argi,
 			    bio->method->name, bio->num);
 		else
 			(void) snprintf(p, p_maxlen, "read(%d,%lu) - %s\n",
diff --git a/lib/libssl/src/crypto/bio/bio_err.c b/lib/libssl/src/crypto/bio/bio_err.c
index 86e9a3082ba..cd6f787a6b4 100644
--- a/lib/libssl/src/crypto/bio/bio_err.c
+++ b/lib/libssl/src/crypto/bio/bio_err.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -68,7 +68,7 @@
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_BIO,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_BIO,0,reason)
 
-static ERR_STRING_DATA BIO_str_functs[]= {
+static ERR_STRING_DATA BIO_str_functs[] = {
 	{ERR_FUNC(BIO_F_ACPT_STATE),	"ACPT_STATE"},
 	{ERR_FUNC(BIO_F_BIO_ACCEPT),	"BIO_accept"},
 	{ERR_FUNC(BIO_F_BIO_BER_GET_HEADER),	"BIO_BER_GET_HEADER"},
@@ -105,7 +105,7 @@ static ERR_STRING_DATA BIO_str_functs[]= {
 	{0, NULL}
 };
 
-static ERR_STRING_DATA BIO_str_reasons[]= {
+static ERR_STRING_DATA BIO_str_reasons[] = {
 	{ERR_REASON(BIO_R_ACCEPT_ERROR)          , "accept error"},
 	{ERR_REASON(BIO_R_BAD_FOPEN_MODE)        , "bad fopen mode"},
 	{ERR_REASON(BIO_R_BAD_HOSTNAME_LOOKUP)   , "bad hostname lookup"},
diff --git a/lib/libssl/src/crypto/bio/bio_lib.c b/lib/libssl/src/crypto/bio/bio_lib.c
index 9e8fb7913a8..90f1b1c1eff 100644
--- a/lib/libssl/src/crypto/bio/bio_lib.c
+++ b/lib/libssl/src/crypto/bio/bio_lib.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -338,8 +338,8 @@ BIO_indent(BIO *b, int indent, int max)
 	if (indent > max)
 		indent = max;
 	while (indent--)
-	if (BIO_puts(b, " ") != 1)
-		return 0;
+		if (BIO_puts(b, " ") != 1)
+			return 0;
 	return 1;
 }
 
@@ -349,7 +349,7 @@ BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg)
 	int i;
 
 	i = iarg;
-	return (BIO_ctrl(b, cmd, larg,(char *)&i));
+	return (BIO_ctrl(b, cmd, larg, (char *)&i));
 }
 
 char
@@ -357,7 +357,7 @@ char
 {
 	char *p = NULL;
 
-	if (BIO_ctrl(b, cmd, larg,(char *)&p) <= 0)
+	if (BIO_ctrl(b, cmd, larg, (char *)&p) <= 0)
 		return (NULL);
 	else
 		return (p);
@@ -408,13 +408,13 @@ BIO_callback_ctrl(BIO *b, int cmd,
 	cb = b->callback;
 
 	if ((cb != NULL) &&
-	    ((ret = cb(b, BIO_CB_CTRL,(void *)&fp, cmd, 0, 1L)) <= 0))
+	    ((ret = cb(b, BIO_CB_CTRL, (void *)&fp, cmd, 0, 1L)) <= 0))
 		return (ret);
 
 	ret = b->method->callback_ctrl(b, cmd, fp);
 
 	if (cb != NULL)
-		ret = cb(b, BIO_CB_CTRL|BIO_CB_RETURN,(void *)&fp, cmd, 0, ret);
+		ret = cb(b, BIO_CB_CTRL|BIO_CB_RETURN, (void *)&fp, cmd, 0, ret);
 	return (ret);
 }
 
@@ -444,7 +444,7 @@ BIO
 		return (bio);
 	lb = b;
 	while (lb->next_bio != NULL)
-	lb = lb->next_bio;
+		lb = lb->next_bio;
 	lb->next_bio = bio;
 	if (bio != NULL)
 		bio->prev_bio = lb;
@@ -482,8 +482,9 @@ BIO
 
 	b = last = bio;
 	for (;;) {
-		if (!BIO_should_retry(b)) break;
-			last = b;
+		if (!BIO_should_retry(b))
+			break;
+		last = b;
 		b = b->next_bio;
 		if (b == NULL)
 			break;
@@ -552,8 +553,9 @@ BIO
 	BIO *ret = NULL, *eoc = NULL, *bio, *new_bio;
 
 	for (bio = in; bio != NULL; bio = bio->next_bio) {
-		if ((new_bio = BIO_new(bio->method)) == NULL) goto err;
-			new_bio->callback = bio->callback;
+		if ((new_bio = BIO_new(bio->method)) == NULL)
+			goto err;
+		new_bio->callback = bio->callback;
 		new_bio->cb_arg = bio->cb_arg;
 		new_bio->init = bio->init;
 		new_bio->shutdown = bio->shutdown;
@@ -562,7 +564,7 @@ BIO
 		/* This will let SSL_s_sock() work with stdin/stdout */
 		new_bio->num = bio->num;
 
-		if (!BIO_dup_state(bio,(char *)new_bio)) {
+		if (!BIO_dup_state(bio, (char *)new_bio)) {
 			BIO_free(new_bio);
 			goto err;
 		}