From: jsing <jsing@openbsd.org>
Date: Sat, 19 Apr 2014 17:03:41 +0000 (+0000)
Subject: More KNF.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b17801d2af9988fab598d3cb04897f3eaff7ecc1;p=openbsd

More KNF.
---

diff --git a/lib/libssl/s23_clnt.c b/lib/libssl/s23_clnt.c
index 65e2be0c8c2..293b1e5da26 100644
--- a/lib/libssl/s23_clnt.c
+++ b/lib/libssl/s23_clnt.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 @@
  * 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
diff --git a/lib/libssl/s23_lib.c b/lib/libssl/s23_lib.c
index 226af4b3cb7..2a8d9157d2f 100644
--- a/lib/libssl/s23_lib.c
+++ b/lib/libssl/s23_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
diff --git a/lib/libssl/s23_pkt.c b/lib/libssl/s23_pkt.c
index 28d07a22122..7e270ed59fc 100644
--- a/lib/libssl/s23_pkt.c
+++ b/lib/libssl/s23_pkt.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
@@ -100,8 +100,8 @@ ssl23_read_bytes(SSL *s, int n)
 
 		for (;;) {
 			s->rwstate = SSL_READING;
-			j = BIO_read(s->rbio,(char *)&(p[s->packet_length]),
-			n - s->packet_length);
+			j = BIO_read(s->rbio, (char *)&(p[s->packet_length]),
+			    n - s->packet_length);
 			if (j <= 0)
 				return (j);
 			s->rwstate = SSL_NOTHING;
diff --git a/lib/libssl/s23_srvr.c b/lib/libssl/s23_srvr.c
index 665907ee128..1f17c19c06d 100644
--- a/lib/libssl/s23_srvr.c
+++ b/lib/libssl/s23_srvr.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 @@
  * 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
@@ -307,8 +307,8 @@ ssl23_get_client_hello(SSL *s)
 		} else if ((p[0] == SSL3_RT_HANDSHAKE) &&
 		    (p[1] == SSL3_VERSION_MAJOR) &&
 		    (p[5] == SSL3_MT_CLIENT_HELLO) &&
-		    ((p[3] == 0 && p[4] < 5 /* silly record length? */)
-		    || (p[9] >= p[1]))) {
+		    ((p[3] == 0 && p[4] < 5 /* silly record length? */) ||
+		    (p[9] >= p[1]))) {
 			/*
 			 * SSLv3 or tls1 header
 			 */
@@ -397,7 +397,7 @@ ssl23_get_client_hello(SSL *s)
 		ssl3_finish_mac(s, s->packet + 2, s->packet_length - 2);
 		if (s->msg_callback)
 			s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2,
-			    s->packet_length-2, s, s->msg_callback_arg);
+			    s->packet_length - 2, s, s->msg_callback_arg);
 
 		p = s->packet;
 		p += 5;
@@ -405,8 +405,7 @@ ssl23_get_client_hello(SSL *s)
 		n2s(p, sil);
 		n2s(p, cl);
 		d = (unsigned char *)s->init_buf->data;
-		if ((csl + sil + cl + 11) != s->packet_length)
-		{
+		if ((csl + sil + cl + 11) != s->packet_length) {
 			/*
 			 * We can't have TLS extensions in SSL 2.0 format
 			 * Client Hello, can we ? Error condition should be
@@ -482,7 +481,8 @@ ssl23_get_client_hello(SSL *s)
 	if ((type == 2) || (type == 3)) {
 		/* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */
 
-		if (!ssl_init_wbio_buffer(s, 1)) goto err;
+		if (!ssl_init_wbio_buffer(s, 1))
+			goto err;
 
 		/* we are in this state */
 		s->state = SSL3_ST_SR_CLNT_HELLO_A;
diff --git a/lib/libssl/src/ssl/kssl.c b/lib/libssl/src/ssl/kssl.c
index a0beabe7536..b71753c1912 100644
--- a/lib/libssl/src/ssl/kssl.c
+++ b/lib/libssl/src/ssl/kssl.c
@@ -9,7 +9,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
@@ -145,7 +145,7 @@ kssl_map_enc(krb5_enctype enctype)
 **	"62 xx 30 yy" (APPLICATION-2, SEQUENCE), where xx-yy =~ 2, and
 **	xx and yy are possibly multi-byte length fields.
 */
-static int 
+static int
 kssl_test_confound(unsigned char *p)
 {
 	int 	len = 2;
@@ -194,7 +194,7 @@ kssl_test_confound(unsigned char *p)
 		break;
 	}
 
-	return (xx - len == yy) ? 1: 0;
+	return (xx - len == yy) ? 1 : 0;
 }
 
 /*	Allocate, fill, and return cksumlens array of checksum lengths.
@@ -203,7 +203,7 @@ kssl_test_confound(unsigned char *p)
 **
 **      The krb5_cksumarray[] was an internal variable that has since been
 **      replaced by a more general method for storing the data.  It should
-**      not be used.  Instead we use real API calls and make a guess for 
+**      not be used.  Instead we use real API calls and make a guess for
 **      what the highest assigned CKSUMTYPE_ constant is.  As of 1.2.2
 **      it is 0x000c (CKSUMTYPE_HMAC_SHA1_DES3).  So we will use 0x0010.
 */
@@ -258,7 +258,7 @@ kssl_skip_confound(krb5_enctype etype, unsigned char *a)
 	static size_t 	*cksumlens = NULL;
 	unsigned char	*test_auth;
 
-	conlen = (etype) ? 8: 0;
+	conlen = (etype) ? 8 : 0;
 
 	if (!cksumlens && !(cksumlens = populate_cksumlens()))
 		return NULL;
@@ -342,7 +342,7 @@ print_krb5_keyblock(char *label, krb5_keyblock *keyblk)
 	}
 #ifdef KRB5_HEIMDAL
 	printf("%s\n\t[et%d:%d]: ", label, keyblk->keytype,
-	keyblk->keyvalue->length);
+	    keyblk->keyvalue->length);
 	for (i = 0; i < (int)keyblk->keyvalue->length; i++) {
 		printf("%02x",(unsigned char *)(keyblk->keyvalue->contents)[i]);
 	}
@@ -369,7 +369,7 @@ print_krb5_princ(char *label, krb5_principal_data *princ)
 	if (princ == NULL)
 		return;
 	for (ui = 0; ui < (int)princ->realm.length; ui++)
-	    putchar(princ->realm.data[ui]);
+		putchar(princ->realm.data[ui]);
 	printf(" (nametype %d) has %d strings:\n", princ->type, princ->length);
 	for (i = 0; i < (int)princ->length; i++) {
 		printf("\t%d [%d]: ", i, princ->data[i].length);
@@ -420,7 +420,7 @@ kssl_cget_tkt(
 	}
 
 	if ((krb5rc = krb5_init_context(&krb5context)) != 0) {
-		(void) snprintf(kssl_err->text,KSSL_ERR_MAX,
+		(void) snprintf(kssl_err->text, KSSL_ERR_MAX,
 		    "krb5_init_context() fails: %d\n", krb5rc);
 		kssl_err->reason = SSL_R_KRB5_C_INIT;
 		goto err;
@@ -428,12 +428,12 @@ kssl_cget_tkt(
 
 	if ((krb5rc = krb5_sname_to_principal(krb5context,
 	    kssl_ctx->service_host,
-	    (kssl_ctx->service_name)? kssl_ctx->service_name: KRB5SVC,
-            KRB5_NT_SRV_HST, &krb5creds.server)) != 0) {
-		(void) snprintf(kssl_err->text,KSSL_ERR_MAX,
+	    (kssl_ctx->service_name) ? kssl_ctx->service_name : KRB5SVC,
+	    KRB5_NT_SRV_HST, &krb5creds.server)) != 0) {
+		(void) snprintf(kssl_err->text, KSSL_ERR_MAX,
 		    "krb5_sname_to_principal() fails for %s/%s\n",
-		    kssl_ctx->service_host,
-		    (kssl_ctx->service_name)? kssl_ctx->service_name: KRB5SVC);
+		    kssl_ctx->service_host, (kssl_ctx->service_name) ?
+		    kssl_ctx->service_name : KRB5SVC);
 		kssl_err->reason = SSL_R_KRB5_C_INIT;
 		goto err;
 	}
@@ -445,12 +445,11 @@ kssl_cget_tkt(
 	}
 
 	if ((krb5rc = krb5_cc_get_principal(krb5context, krb5ccdef,
-                &krb5creds.client)) != 0)
-                {
+	    &krb5creds.client)) != 0) {
 		kssl_err_set(kssl_err, SSL_R_KRB5_C_CC_PRINC,
-                        "krb5_cc_get_principal() fails.\n");
+		    "krb5_cc_get_principal() fails.\n");
 		goto err;
-		}
+	}
 
 	if ((krb5rc = krb5_get_credentials(krb5context, 0, krb5ccdef,
 	    &krb5creds, &krb5credsp)) != 0) {
@@ -494,12 +493,12 @@ kssl_cget_tkt(
 		ap_req = (KRB5_APREQBODY *) d2i_KRB5_APREQ(NULL, &p, arlen);
 		if (ap_req) {
 			authenp->length = i2d_KRB5_ENCDATA(
-			ap_req->authenticator, NULL);
+			    ap_req->authenticator, NULL);
 			if (authenp->length &&
 			    (authenp->data = malloc(authenp->length))) {
 				unsigned char	*adp = (unsigned char *)authenp->data;
 				authenp->length = i2d_KRB5_ENCDATA(
-				ap_req->authenticator, &adp);
+				    ap_req->authenticator, &adp);
 			}
 		}
 
@@ -522,7 +521,7 @@ kssl_cget_tkt(
 	else
 		krb5rc = 0;
 
-	err:
+err:
 #ifdef KSSL_DEBUG
 	kssl_ctx_show(kssl_ctx);
 #endif	/* KSSL_DEBUG */
@@ -557,7 +556,7 @@ kssl_TKT2tkt(
 	/* OUT    */	krb5_ticket	**krb5ticket,
 	/* OUT    */	KSSL_ERR *kssl_err  )
 {
-        krb5_error_code			krb5rc = KRB5KRB_ERR_GENERIC;
+	krb5_error_code			krb5rc = KRB5KRB_ERR_GENERIC;
 	krb5_ticket 			*new5ticket = NULL;
 	ASN1_GENERALSTRING		*gstr_svc, *gstr_host;
 
@@ -609,8 +608,8 @@ kssl_TKT2tkt(
 		return KRB5KRB_ERR_GENERIC;
 	} else {
 		memcpy(new5ticket->enc_part.ciphertext.data,
-		asn1ticket->encdata->cipher->data,
-		asn1ticket->encdata->cipher->length);
+		    asn1ticket->encdata->cipher->data,
+		    asn1ticket->encdata->cipher->length);
 	}
 
 	*krb5ticket = new5ticket;
@@ -632,8 +631,8 @@ kssl_sget_tkt(
 	/* OUT    */	krb5_ticket_times	*ttimes,
 	/* OUT    */	KSSL_ERR		*kssl_err  )
 {
-        krb5_error_code			krb5rc = KRB5KRB_ERR_GENERIC;
-        static krb5_context		krb5context = NULL;
+	krb5_error_code			krb5rc = KRB5KRB_ERR_GENERIC;
+	static krb5_context		krb5context = NULL;
 	static krb5_auth_context	krb5auth_context = NULL;
 	krb5_ticket 			*krb5ticket = NULL;
 	KRB5_TKTBODY 			*asn1ticket = NULL;
@@ -641,7 +640,7 @@ kssl_sget_tkt(
 	krb5_keytab 			krb5keytab = NULL;
 	krb5_keytab_entry		kt_entry;
 	krb5_principal			krb5server;
-        krb5_rcache                     rcache = NULL;
+	krb5_rcache                     rcache = NULL;
 
 	kssl_err_set(kssl_err, 0, "");
 
@@ -788,13 +787,13 @@ kssl_sget_tkt(
 			krb5_address **paddr = krb5ticket->enc_part2->caddrs;
 			printf("Decrypted ticket fields:\n");
 			printf("\tflags: %X, transit-type: %X",
-			krb5ticket->enc_part2->flags,
-			krb5ticket->enc_part2->transited.tr_type);
+			    krb5ticket->enc_part2->flags,
+			    krb5ticket->enc_part2->transited.tr_type);
 			print_krb5_data("\ttransit-data: ",
-			&(krb5ticket->enc_part2->transited.tr_contents));
+			    &(krb5ticket->enc_part2->transited.tr_contents));
 			printf("\tcaddrs: %p, authdata: %p\n",
-			krb5ticket->enc_part2->caddrs,
-			krb5ticket->enc_part2->authorization_data);
+			    krb5ticket->enc_part2->caddrs,
+			    krb5ticket->enc_part2->authorization_data);
 			if (paddr) {
 				printf("\tcaddrs:\n");
 				for (i = 0; paddr[i] != NULL; i++) {
@@ -805,9 +804,9 @@ kssl_sget_tkt(
 				}
 			}
 			printf("\tstart/auth/end times: %d / %d / %d\n",
-			krb5ticket->enc_part2->times.starttime,
-			krb5ticket->enc_part2->times.authtime,
-			krb5ticket->enc_part2->times.endtime);
+			    krb5ticket->enc_part2->times.starttime,
+			    krb5ticket->enc_part2->times.authtime,
+			    krb5ticket->enc_part2->times.endtime);
 		}
 #endif	/* KSSL_DEBUG */
 	}
@@ -841,7 +840,7 @@ kssl_sget_tkt(
 	ttimes->endtime = krb5ticket->enc_part2->times.endtime;
 	ttimes->renew_till = krb5ticket->enc_part2->times.renew_till;
 
-	err:
+err:
 #ifdef KSSL_DEBUG
 	kssl_ctx_show(kssl_ctx);
 #endif	/* KSSL_DEBUG */
@@ -1126,7 +1125,7 @@ kssl_keytab_is_available(KSSL_CTX *kssl_ctx)
 	krb5_kt_free_entry(krb5context, &entry);
 	rc = 1;
 
-	exit:
+exit:
 	if (krb5keytab)
 		krb5_kt_close(krb5context, krb5keytab);
 	if (princ)
@@ -1175,7 +1174,7 @@ kssl_tgt_is_available(KSSL_CTX *kssl_ctx)
 
 	rc = 1;
 
-	err:
+err:
 #ifdef KSSL_DEBUG
 	kssl_ctx_show(kssl_ctx);
 #endif	/* KSSL_DEBUG */
@@ -1214,7 +1213,8 @@ kssl_krb5_free_data_contents(krb5_context context, krb5_data *data)
 **  return NULL on failure.
 */
 static struct tm *
-k_gmtime(ASN1_GENERALIZEDTIME *gtime, struct tm *k_tm) {
+k_gmtime(ASN1_GENERALIZEDTIME *gtime, struct tm *k_tm)
+{
 	char 		c, *p;
 
 	if (!k_tm)
@@ -1294,7 +1294,7 @@ get_rc_clockskew(krb5_context context)
 **  See Also: (Kerberos source)/krb5/lib/krb5/krb/valid_times.c
 **  20010420 VRS
 */
-krb5_error_code 
+krb5_error_code
 kssl_validate_times(krb5_timestamp atime, krb5_ticket_times *ttimes)
 {
 	krb5_deltat 	skew;
@@ -1333,7 +1333,7 @@ kssl_validate_times(krb5_timestamp atime, krb5_ticket_times *ttimes)
 
 /*  Decode and decrypt given DER-encoded authenticator, then pass
 **  authenticator ctime back in *atimep (or 0 if time unavailable).
-**  Returns krb5_error_code and kssl_err on error.  A NULL 
+**  Returns krb5_error_code and kssl_err on error.  A NULL
 **  authenticator (authentp->length == 0) is not considered an error.
 **  Note that kssl_check_authent() makes use of the KRB5 session key;
 **  you must call kssl_sget_tkt() to get the key before calling this routine.
@@ -1345,7 +1345,7 @@ kssl_check_authent(
 	/* OUT    */	krb5_timestamp	*atimep,
 	/* OUT    */    KSSL_ERR	*kssl_err  )
 {
-        krb5_error_code		krb5rc = 0;
+	krb5_error_code		krb5rc = 0;
 	KRB5_ENCDATA		*dec_authent = NULL;
 	KRB5_AUTHENTBODY	*auth = NULL;
 	krb5_enctype		enctype;
@@ -1394,7 +1394,7 @@ kssl_check_authent(
 
 	p = (unsigned char *)authentp->data;
 	if ((dec_authent = d2i_KRB5_ENCDATA(NULL, &p,
-		(long)authentp->length)) == NULL) {
+	    (long)authentp->length)) == NULL) {
 		kssl_err_set(kssl_err, SSL_R_KRB5_S_INIT,
 		    "Error decoding authenticator.\n");
 		krb5rc = KRB5KRB_AP_ERR_BAD_INTEGRITY;
@@ -1481,7 +1481,8 @@ kssl_check_authent(
 	printf("kssl_check_authent: returns %d for client time ", *atimep);
 	if (auth && auth->ctime && auth->ctime->length && auth->ctime->data)
 		printf("%.*s\n", auth->ctime->length, auth->ctime->data);
-	else	printf("NULL\n");
+	else
+		printf("NULL\n");
 #endif	/* KSSL_DEBUG */
 
 err:
@@ -1511,11 +1512,11 @@ kssl_build_principal_2(
 {
 	krb5_data		*p_data = NULL;
 	krb5_principal		new_p = NULL;
-        char			*new_r = NULL;
+	char			*new_r = NULL;
 
 	if ((p_data = (krb5_data *)calloc(2, sizeof(krb5_data))) == NULL ||
-	    (new_p = (krb5_principal)calloc(1, sizeof(krb5_principal_data)))
-	    == NULL)
+	    (new_p = (krb5_principal)calloc(1, sizeof(krb5_principal_data))) ==
+	    NULL)
 		goto err;
 	new_p->length = 2;
 	new_p->data = p_data;
@@ -1535,7 +1536,7 @@ kssl_build_principal_2(
 		goto err;
 	memcpy(new_p->data[1].data, host, hlen);
 	new_p->data[1].length = hlen;
-	
+
 	krb5_princ_type(context, new_p) = KRB5_NT_UNKNOWN;
 	*princ = new_p;
 	return 0;
@@ -1556,7 +1557,7 @@ void
 SSL_set0_kssl_ctx(SSL *s, KSSL_CTX *kctx)
 {
 	s->kssl_ctx = kctx;
-} 
+}
 
 KSSL_CTX *
 SSL_get0_kssl_ctx(SSL *s)
diff --git a/lib/libssl/src/ssl/kssl.h b/lib/libssl/src/ssl/kssl.h
index b61e3240c8a..ec75188a8e8 100644
--- a/lib/libssl/src/ssl/kssl.h
+++ b/lib/libssl/src/ssl/kssl.h
@@ -10,7 +10,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
diff --git a/lib/libssl/src/ssl/s23_clnt.c b/lib/libssl/src/ssl/s23_clnt.c
index 65e2be0c8c2..293b1e5da26 100644
--- a/lib/libssl/src/ssl/s23_clnt.c
+++ b/lib/libssl/src/ssl/s23_clnt.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 @@
  * 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
diff --git a/lib/libssl/src/ssl/s23_lib.c b/lib/libssl/src/ssl/s23_lib.c
index 226af4b3cb7..2a8d9157d2f 100644
--- a/lib/libssl/src/ssl/s23_lib.c
+++ b/lib/libssl/src/ssl/s23_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
diff --git a/lib/libssl/src/ssl/s23_meth.c b/lib/libssl/src/ssl/s23_meth.c
index ad9a513fd41..d19d96a9b7e 100644
--- a/lib/libssl/src/ssl/s23_meth.c
+++ b/lib/libssl/src/ssl/s23_meth.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/ssl/s23_pkt.c b/lib/libssl/src/ssl/s23_pkt.c
index 28d07a22122..7e270ed59fc 100644
--- a/lib/libssl/src/ssl/s23_pkt.c
+++ b/lib/libssl/src/ssl/s23_pkt.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
@@ -100,8 +100,8 @@ ssl23_read_bytes(SSL *s, int n)
 
 		for (;;) {
 			s->rwstate = SSL_READING;
-			j = BIO_read(s->rbio,(char *)&(p[s->packet_length]),
-			n - s->packet_length);
+			j = BIO_read(s->rbio, (char *)&(p[s->packet_length]),
+			    n - s->packet_length);
 			if (j <= 0)
 				return (j);
 			s->rwstate = SSL_NOTHING;
diff --git a/lib/libssl/src/ssl/s23_srvr.c b/lib/libssl/src/ssl/s23_srvr.c
index 665907ee128..1f17c19c06d 100644
--- a/lib/libssl/src/ssl/s23_srvr.c
+++ b/lib/libssl/src/ssl/s23_srvr.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 @@
  * 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
@@ -307,8 +307,8 @@ ssl23_get_client_hello(SSL *s)
 		} else if ((p[0] == SSL3_RT_HANDSHAKE) &&
 		    (p[1] == SSL3_VERSION_MAJOR) &&
 		    (p[5] == SSL3_MT_CLIENT_HELLO) &&
-		    ((p[3] == 0 && p[4] < 5 /* silly record length? */)
-		    || (p[9] >= p[1]))) {
+		    ((p[3] == 0 && p[4] < 5 /* silly record length? */) ||
+		    (p[9] >= p[1]))) {
 			/*
 			 * SSLv3 or tls1 header
 			 */
@@ -397,7 +397,7 @@ ssl23_get_client_hello(SSL *s)
 		ssl3_finish_mac(s, s->packet + 2, s->packet_length - 2);
 		if (s->msg_callback)
 			s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2,
-			    s->packet_length-2, s, s->msg_callback_arg);
+			    s->packet_length - 2, s, s->msg_callback_arg);
 
 		p = s->packet;
 		p += 5;
@@ -405,8 +405,7 @@ ssl23_get_client_hello(SSL *s)
 		n2s(p, sil);
 		n2s(p, cl);
 		d = (unsigned char *)s->init_buf->data;
-		if ((csl + sil + cl + 11) != s->packet_length)
-		{
+		if ((csl + sil + cl + 11) != s->packet_length) {
 			/*
 			 * We can't have TLS extensions in SSL 2.0 format
 			 * Client Hello, can we ? Error condition should be
@@ -482,7 +481,8 @@ ssl23_get_client_hello(SSL *s)
 	if ((type == 2) || (type == 3)) {
 		/* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */
 
-		if (!ssl_init_wbio_buffer(s, 1)) goto err;
+		if (!ssl_init_wbio_buffer(s, 1))
+			goto err;
 
 		/* we are in this state */
 		s->state = SSL3_ST_SR_CLNT_HELLO_A;
diff --git a/lib/libssl/src/ssl/tls1.h b/lib/libssl/src/ssl/tls1.h
index 43879f82af6..e05168cffe1 100644
--- a/lib/libssl/src/ssl/tls1.h
+++ b/lib/libssl/src/ssl/tls1.h
@@ -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 @@
  * 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
@@ -111,7 +111,7 @@
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
- * Portions of the attached software ("Contribution") are developed by 
+ * Portions of the attached software ("Contribution") are developed by
  * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
  *
  * The Contribution is licensed pursuant to the OpenSSL open source
@@ -148,8 +148,8 @@
  * OTHERWISE.
  */
 
-#ifndef HEADER_TLS1_H 
-#define HEADER_TLS1_H 
+#ifndef HEADER_TLS1_H
+#define HEADER_TLS1_H
 
 #include <openssl/buffer.h>
 
diff --git a/lib/libssl/src/ssl/tls_srp.c b/lib/libssl/src/ssl/tls_srp.c
index c585211cd0b..e03eabcef66 100644
--- a/lib/libssl/src/ssl/tls_srp.c
+++ b/lib/libssl/src/ssl/tls_srp.c
@@ -1,6 +1,6 @@
 /* ssl/tls_srp.c */
-/* Written by Christophe Renou (christophe.renou@edelweb.fr) with 
- * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) 
+/* Written by Christophe Renou (christophe.renou@edelweb.fr) with
+ * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr)
  * for the EdelKey project and contributed to the OpenSSL project 2004.
  */
 /* ====================================================================
@@ -11,7 +11,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
@@ -64,7 +64,8 @@
 #include <openssl/err.h>
 
 int
-SSL_CTX_SRP_CTX_free(struct ssl_ctx_st *ctx) {
+SSL_CTX_SRP_CTX_free(struct ssl_ctx_st *ctx)
+{
 	if (ctx == NULL)
 		return 0;
 	free(ctx->srp_ctx.login);
@@ -96,7 +97,8 @@ SSL_CTX_SRP_CTX_free(struct ssl_ctx_st *ctx) {
 }
 
 int
-SSL_SRP_CTX_free(struct ssl_st *s) {
+SSL_SRP_CTX_free(struct ssl_st *s)
+{
 	if (s == NULL)
 		return 0;
 	free(s->srp_ctx.login);
@@ -128,7 +130,8 @@ SSL_SRP_CTX_free(struct ssl_st *s) {
 }
 
 int
-SSL_SRP_CTX_init(struct ssl_st *s) {
+SSL_SRP_CTX_init(struct ssl_st *s)
+{
 	SSL_CTX *ctx;
 
 	if ((s == NULL) || ((ctx = s->ctx) == NULL))
@@ -194,7 +197,8 @@ err:
 }
 
 int
-SSL_CTX_SRP_CTX_init(struct ssl_ctx_st *ctx) {
+SSL_CTX_SRP_CTX_init(struct ssl_ctx_st *ctx)
+{
 	if (ctx == NULL)
 		return 0;
 
@@ -232,7 +236,7 @@ SSL_srp_server_param_with_username(SSL *s, int *ad)
 	*ad = SSL_AD_UNKNOWN_PSK_IDENTITY;
 	if ((s->srp_ctx.TLS_ext_srp_username_callback !=NULL) &&
 	    ((al = s->srp_ctx.TLS_ext_srp_username_callback(s, ad,
-	        s->srp_ctx.SRP_cb_arg)) != SSL_ERROR_NONE))
+	    s->srp_ctx.SRP_cb_arg)) != SSL_ERROR_NONE))
 		return al;
 
 	*ad = SSL_AD_INTERNAL_ERROR;
@@ -379,8 +383,9 @@ SRP_generate_client_master_secret(SSL *s, unsigned char *master_key)
 		goto err;
 
 	tmp_len = BN_num_bytes(K);
-	if ((tmp = malloc(tmp_len)) == NULL) goto err;
-		BN_bn2bin(K, tmp);
+	if ((tmp = malloc(tmp_len)) == NULL)
+		goto err;
+	BN_bn2bin(K, tmp);
 	ret = s->method->ssl3_enc->generate_master_secret(s, master_key,
 	    tmp, tmp_len);
 err:
@@ -477,14 +482,14 @@ int
 SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength)
 {
 	return tls1_ctx_ctrl(ctx, SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH, strength,
-	NULL);
+	    NULL);
 }
 
 int
 SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx, int (*cb)(SSL *, void *))
 {
 	return tls1_ctx_callback_ctrl(ctx, SSL_CTRL_SET_SRP_VERIFY_PARAM_CB,
-	(void (*)(void))cb);
+	    (void (*)(void))cb);
 }
 
 int
@@ -498,14 +503,14 @@ SSL_CTX_set_srp_username_callback(SSL_CTX *ctx,
     int (*cb)(SSL *, int *, void *))
 {
 	return tls1_ctx_callback_ctrl(ctx, SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB,
-	(void (*)(void))cb);
+	    (void (*)(void))cb);
 }
 
 int
 SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx, char *(*cb)(SSL *, void *))
 {
 	return tls1_ctx_callback_ctrl(ctx, SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB,
-	(void (*)(void))cb);
+	    (void (*)(void))cb);
 }
 
 #endif
diff --git a/lib/libssl/tls1.h b/lib/libssl/tls1.h
index 43879f82af6..e05168cffe1 100644
--- a/lib/libssl/tls1.h
+++ b/lib/libssl/tls1.h
@@ -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 @@
  * 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
@@ -111,7 +111,7 @@
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
- * Portions of the attached software ("Contribution") are developed by 
+ * Portions of the attached software ("Contribution") are developed by
  * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
  *
  * The Contribution is licensed pursuant to the OpenSSL open source
@@ -148,8 +148,8 @@
  * OTHERWISE.
  */
 
-#ifndef HEADER_TLS1_H 
-#define HEADER_TLS1_H 
+#ifndef HEADER_TLS1_H
+#define HEADER_TLS1_H
 
 #include <openssl/buffer.h>