More KNF.

6 files changed, 122 insertions, 90 deletions

diff --git a/src/lib/libssl/src/ssl/t1_meth.c b/src/lib/libssl/src/ssl/t1_meth.c
index cf62fe5c3d..49fe9624a2 100644
--- a/src/lib/libssl/src/ssl/t1_meth.c
+++ b/src/lib/libssl/src/ssl/t1_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/src/lib/libssl/src/ssl/t1_reneg.c b/src/lib/libssl/src/ssl/t1_reneg.c
index 86e0e61ffb..e08e7fedc6 100644
--- a/src/lib/libssl/src/ssl/t1_reneg.c
+++ b/src/lib/libssl/src/ssl/t1_reneg.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
@@ -119,7 +119,8 @@ ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
 {
         if (p) {
                 if ((s->s3->previous_client_finished_len + 1) > maxlen) {
-                        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATE_EXT_TOO_LONG);
+                        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT,
+                            SSL_R_RENEGOTIATE_EXT_TOO_LONG);
                         return 0;
                 }
 
@@ -128,10 +129,11 @@ ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
                 p++;
 
                 memcpy(p, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len);
+                    s->s3->previous_client_finished_len);
+
 #ifdef OPENSSL_RI_DEBUG
                 fprintf(stderr, "%s RI extension sent by client\n",
-                s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
+                    s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
 #endif
         }
 
@@ -150,7 +152,8 @@ ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Parse the length byte */
         if (len < 1) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
@@ -159,27 +162,31 @@ ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Consistency check */
         if ((ilen + 1) != len) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
 
         /* Check that the extension matches */
         if (ilen != s->s3->previous_client_finished_len) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
 
         if (memcmp(d, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len)) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+            s->s3->previous_client_finished_len)) {
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
+
 #ifdef OPENSSL_RI_DEBUG
         fprintf(stderr, "%s RI extension received by server\n",
-        ilen ? "Non-empty" : "Empty");
+            ilen ? "Non-empty" : "Empty");
 #endif
 
         s->s3->send_connection_binding = 1;
@@ -194,29 +201,32 @@ ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
 {
         if (p) {
                 if ((s->s3->previous_client_finished_len +
-                        s->s3->previous_server_finished_len + 1) > maxlen) {
-                        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATE_EXT_TOO_LONG);
+                    s->s3->previous_server_finished_len + 1) > maxlen) {
+                        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT,
+                            SSL_R_RENEGOTIATE_EXT_TOO_LONG);
                         return 0;
                 }
 
                 /* Length byte */
-                *p = s->s3->previous_client_finished_len + s->s3->previous_server_finished_len;
+                *p = s->s3->previous_client_finished_len +
+                    s->s3->previous_server_finished_len;
                 p++;
 
                 memcpy(p, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len);
+                    s->s3->previous_client_finished_len);
                 p += s->s3->previous_client_finished_len;
 
                 memcpy(p, s->s3->previous_server_finished,
-                s->s3->previous_server_finished_len);
+                    s->s3->previous_server_finished_len);
+
 #ifdef OPENSSL_RI_DEBUG
                 fprintf(stderr, "%s RI extension sent by server\n",
-                s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
+                    s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
 #endif
         }
 
-        *len = s->s3->previous_client_finished_len
-        + s->s3->previous_server_finished_len + 1;
+        *len = s->s3->previous_client_finished_len +
+            s->s3->previous_server_finished_len + 1;
 
         return 1;
 }
@@ -227,8 +237,8 @@ int
 ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
     int *al)
 {
-        int expected_len = s->s3->previous_client_finished_len
-        + s->s3->previous_server_finished_len;
+        int expected_len = s->s3->previous_client_finished_len +
+            s->s3->previous_server_finished_len;
         int ilen;
 
         /* Check for logic errors */
@@ -237,7 +247,8 @@ ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Parse the length byte */
         if (len < 1) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
@@ -246,32 +257,37 @@ ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Consistency check */
         if (ilen + 1 != len) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
 
         /* Check that the extension matches */
         if (ilen != expected_len) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
 
         if (memcmp(d, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len)) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+            s->s3->previous_client_finished_len)) {
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
         d += s->s3->previous_client_finished_len;
 
         if (memcmp(d, s->s3->previous_server_finished,
-                s->s3->previous_server_finished_len)) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+            s->s3->previous_server_finished_len)) {
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
+
 #ifdef OPENSSL_RI_DEBUG
         fprintf(stderr, "%s RI extension received by client\n",
             ilen ? "Non-empty" : "Empty");
diff --git a/src/lib/libssl/src/ssl/t1_srvr.c b/src/lib/libssl/src/ssl/t1_srvr.c
index c0d186e425..01220072f1 100644
--- a/src/lib/libssl/src/ssl/t1_srvr.c
+++ b/src/lib/libssl/src/ssl/t1_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
diff --git a/src/lib/libssl/t1_meth.c b/src/lib/libssl/t1_meth.c
index cf62fe5c3d..49fe9624a2 100644
--- a/src/lib/libssl/t1_meth.c
+++ b/src/lib/libssl/t1_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/src/lib/libssl/t1_reneg.c b/src/lib/libssl/t1_reneg.c
index 86e0e61ffb..e08e7fedc6 100644
--- a/src/lib/libssl/t1_reneg.c
+++ b/src/lib/libssl/t1_reneg.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
@@ -119,7 +119,8 @@ ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
 {
         if (p) {
                 if ((s->s3->previous_client_finished_len + 1) > maxlen) {
-                        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATE_EXT_TOO_LONG);
+                        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT,
+                            SSL_R_RENEGOTIATE_EXT_TOO_LONG);
                         return 0;
                 }
 
@@ -128,10 +129,11 @@ ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
                 p++;
 
                 memcpy(p, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len);
+                    s->s3->previous_client_finished_len);
+
 #ifdef OPENSSL_RI_DEBUG
                 fprintf(stderr, "%s RI extension sent by client\n",
-                s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
+                    s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
 #endif
         }
 
@@ -150,7 +152,8 @@ ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Parse the length byte */
         if (len < 1) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
@@ -159,27 +162,31 @@ ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Consistency check */
         if ((ilen + 1) != len) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
 
         /* Check that the extension matches */
         if (ilen != s->s3->previous_client_finished_len) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
 
         if (memcmp(d, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len)) {
-                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+            s->s3->previous_client_finished_len)) {
+                SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
+
 #ifdef OPENSSL_RI_DEBUG
         fprintf(stderr, "%s RI extension received by server\n",
-        ilen ? "Non-empty" : "Empty");
+            ilen ? "Non-empty" : "Empty");
 #endif
 
         s->s3->send_connection_binding = 1;
@@ -194,29 +201,32 @@ ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
 {
         if (p) {
                 if ((s->s3->previous_client_finished_len +
-                        s->s3->previous_server_finished_len + 1) > maxlen) {
-                        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATE_EXT_TOO_LONG);
+                    s->s3->previous_server_finished_len + 1) > maxlen) {
+                        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT,
+                            SSL_R_RENEGOTIATE_EXT_TOO_LONG);
                         return 0;
                 }
 
                 /* Length byte */
-                *p = s->s3->previous_client_finished_len + s->s3->previous_server_finished_len;
+                *p = s->s3->previous_client_finished_len +
+                    s->s3->previous_server_finished_len;
                 p++;
 
                 memcpy(p, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len);
+                    s->s3->previous_client_finished_len);
                 p += s->s3->previous_client_finished_len;
 
                 memcpy(p, s->s3->previous_server_finished,
-                s->s3->previous_server_finished_len);
+                    s->s3->previous_server_finished_len);
+
 #ifdef OPENSSL_RI_DEBUG
                 fprintf(stderr, "%s RI extension sent by server\n",
-                s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
+                    s->s3->previous_client_finished_len ? "Non-empty" : "Empty");
 #endif
         }
 
-        *len = s->s3->previous_client_finished_len
-        + s->s3->previous_server_finished_len + 1;
+        *len = s->s3->previous_client_finished_len +
+            s->s3->previous_server_finished_len + 1;
 
         return 1;
 }
@@ -227,8 +237,8 @@ int
 ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
     int *al)
 {
-        int expected_len = s->s3->previous_client_finished_len
-        + s->s3->previous_server_finished_len;
+        int expected_len = s->s3->previous_client_finished_len +
+            s->s3->previous_server_finished_len;
         int ilen;
 
         /* Check for logic errors */
@@ -237,7 +247,8 @@ ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Parse the length byte */
         if (len < 1) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
@@ -246,32 +257,37 @@ ssl_parse_serverhello_renegotiate_ext(SSL *s, unsigned char *d, int len,
 
         /* Consistency check */
         if (ilen + 1 != len) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_ENCODING_ERR);
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_ENCODING_ERR);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
 
         /* Check that the extension matches */
         if (ilen != expected_len) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
 
         if (memcmp(d, s->s3->previous_client_finished,
-                s->s3->previous_client_finished_len)) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+            s->s3->previous_client_finished_len)) {
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_HANDSHAKE_FAILURE;
                 return 0;
         }
         d += s->s3->previous_client_finished_len;
 
         if (memcmp(d, s->s3->previous_server_finished,
-                s->s3->previous_server_finished_len)) {
-                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT, SSL_R_RENEGOTIATION_MISMATCH);
+            s->s3->previous_server_finished_len)) {
+                SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
+                    SSL_R_RENEGOTIATION_MISMATCH);
                 *al = SSL_AD_ILLEGAL_PARAMETER;
                 return 0;
         }
+
 #ifdef OPENSSL_RI_DEBUG
         fprintf(stderr, "%s RI extension received by client\n",
             ilen ? "Non-empty" : "Empty");
diff --git a/src/lib/libssl/t1_srvr.c b/src/lib/libssl/t1_srvr.c
index c0d186e425..01220072f1 100644
--- a/src/lib/libssl/t1_srvr.c
+++ b/src/lib/libssl/t1_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