26 files changed, 176 insertions, 160 deletions
diff --git a/src/lib/libcrypto/cpt_err.c b/src/lib/libcrypto/cpt_err.c
index a8e94ccd16..5c1946c061 100644
--- a/src/lib/libcrypto/cpt_err.c
+++ b/src/lib/libcrypto/cpt_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_CRYPTO,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CRYPTO,0,reason)
-static ERR_STRING_DATA CRYPTO_str_functs[]= {
+static ERR_STRING_DATA CRYPTO_str_functs[] = {
        {ERR_FUNC(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX),    "CRYPTO_get_ex_new_index"},
        {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID),   "CRYPTO_get_new_dynlockid"},
        {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_LOCKID),      "CRYPTO_get_new_lockid"},
@@ -82,7 +82,7 @@ static ERR_STRING_DATA CRYPTO_str_functs[]= {
        {0, NULL}
 };
-static ERR_STRING_DATA CRYPTO_str_reasons[]= {
+static ERR_STRING_DATA CRYPTO_str_reasons[] = {
        {ERR_REASON(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"},
        {ERR_REASON(CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK), "no dynlock create callback"},
        {0, NULL}
diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h
index a785024159..f43aa30b41 100644
--- a/src/lib/libcrypto/cryptlib.h
+++ b/src/lib/libcrypto/cryptlib.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
@@ -65,8 +65,8 @@
 #include <unistd.h>
 #include <openssl/crypto.h>
-#include <openssl/buffer.h> 
+#include <openssl/buffer.h>
-#include <openssl/bio.h> 
+#include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/opensslconf.h>
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 0b7634cd9e..11c34d8bbe 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -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
@@ -58,21 +58,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:
@@ -87,10 +87,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
@@ -102,7 +102,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
@@ -110,7 +110,7 @@
 */
 /* ====================================================================
 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
 */
diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c
index 326216d084..38999ab670 100644
--- a/src/lib/libcrypto/cversion.c
+++ b/src/lib/libcrypto/cversion.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/libcrypto/ex_data.c b/src/lib/libcrypto/ex_data.c
index 0b27d57b45..77a91c4b04 100644
--- a/src/lib/libcrypto/ex_data.c
+++ b/src/lib/libcrypto/ex_data.c
@@ -34,21 +34,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:
@@ -63,10 +63,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
@@ -78,7 +78,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
@@ -92,7 +92,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
@@ -276,9 +276,9 @@ ex_data_check(void)
 {
        int toret = 1;
        CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
-        if (!ex_data
+        if (!ex_data &&
-                && (ex_data = lh_EX_CLASS_ITEM_new()) == NULL)
+            (ex_data = lh_EX_CLASS_ITEM_new()) == NULL)
-        toret = 0;
+                toret = 0;
        CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
        return toret;
 }
@@ -344,7 +344,7 @@ def_add_index(EX_CLASS_ITEM *item, long argl, void *argp,
 {
        int toret = -1;
        CRYPTO_EX_DATA_FUNCS *a = (CRYPTO_EX_DATA_FUNCS *)malloc(
-        sizeof(CRYPTO_EX_DATA_FUNCS));
+            sizeof(CRYPTO_EX_DATA_FUNCS));
        if (!a) {
                CRYPTOerr(CRYPTO_F_DEF_ADD_INDEX, ERR_R_MALLOC_FAILURE);
                return -1;
@@ -376,6 +376,7 @@ static int
 int_new_class(void)
 {
        int toret;
        CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
        toret = ex_class++;
        CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
@@ -395,9 +396,10 @@ int_cleanup(void)
 static int
 int_get_new_index(int class_index, long argl, void *argp,
    CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
-CRYPTO_EX_free *free_func)
+    CRYPTO_EX_free *free_func)
 {
        EX_CLASS_ITEM *item = def_get_class(class_index);
        if (!item)
                return -1;
        return def_add_index(item, argl, argp, new_func, dup_func, free_func);
@@ -408,13 +410,13 @@ CRYPTO_EX_free *free_func)
 * the global "ex_data" state (ie. class definitions), not thread-safe on 'ad'
 * itself. */
 static int
-int_new_ex_data(int class_index, void *obj,
+int_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
-    CRYPTO_EX_DATA *ad)
 {
        int mx, i;
        void *ptr;
        CRYPTO_EX_DATA_FUNCS **storage = NULL;
        EX_CLASS_ITEM *item = def_get_class(class_index);
        if (!item)
                /* error is already set */
                return 0;
@@ -426,7 +428,8 @@ int_new_ex_data(int class_index, void *obj,
                if (!storage)
                        goto skip;
                for (i = 0; i < mx; i++)
-                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i);
+                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
+                            item->meth, i);
        }
 skip:
        CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -438,7 +441,7 @@ skip:
                if (storage[i] && storage[i]->new_func) {
                        ptr = CRYPTO_get_ex_data(ad, i);
                        storage[i]->new_func(obj, ptr, ad, i,
-                        storage[i]->argl, storage[i]->argp);
+                            storage[i]->argl, storage[i]->argp);
                }
        }
        if (storage)
@@ -448,13 +451,13 @@ skip:
 /* Same thread-safety notes as for "int_new_ex_data" */
 static int
-int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
+int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from)
-    CRYPTO_EX_DATA *from)
 {
        int mx, j, i;
        char *ptr;
        CRYPTO_EX_DATA_FUNCS **storage = NULL;
        EX_CLASS_ITEM *item;
        if (!from->sk)
                /* 'to' should be "blank" which *is* just like 'from' */
                return 1;
@@ -470,7 +473,8 @@ int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
                if (!storage)
                        goto skip;
                for (i = 0; i < mx; i++)
-                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i);
+                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
+                            item->meth, i);
        }
 skip:
        CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -507,7 +511,8 @@ int_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
                if (!storage)
                        goto skip;
                for (i = 0; i < mx; i++)
-                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i);
+                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
+                            item->meth, i);
        }
 skip:
        CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -519,7 +524,7 @@ skip:
                if (storage[i] && storage[i]->free_func) {
                        ptr = CRYPTO_get_ex_data(ad, i);
                        storage[i]->free_func(obj, ptr, ad, i,
-                        storage[i]->argl, storage[i]->argp);
+                            storage[i]->argl, storage[i]->argp);
                }
        }
        if (storage)
@@ -563,7 +568,7 @@ CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
        IMPL_CHECK
        ret = EX_IMPL(get_new_index)(class_index,
-        argl, argp, new_func, dup_func, free_func);
+            argl, argp, new_func, dup_func, free_func);
        return ret;
 }
@@ -603,7 +608,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
        if (ad->sk == NULL) {
                if ((ad->sk = sk_void_new_null()) == NULL) {
-                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE);
+                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
+                            ERR_R_MALLOC_FAILURE);
                        return (0);
                }
        }
@@ -611,7 +617,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
        while (i <= idx) {
                if (!sk_void_push(ad->sk, NULL)) {
-                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE);
+                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
+                            ERR_R_MALLOC_FAILURE);
                        return (0);
                }
                i++;
diff --git a/src/lib/libcrypto/malloc-wrapper.c b/src/lib/libcrypto/malloc-wrapper.c
index c754df40e3..68af818230 100644
--- a/src/lib/libcrypto/malloc-wrapper.c
+++ b/src/lib/libcrypto/malloc-wrapper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc-wrapper.c,v 1.2 2014/04/17 20:44:45 tedu Exp $ */
+/* $OpenBSD: malloc-wrapper.c,v 1.3 2014/04/20 14:32:19 jsing Exp $ */
 /*
 * Copyright (c) 2014 Bob Beck
 *
@@ -154,7 +154,7 @@ CRYPTO_realloc(void *ptr, int num, const char *file, int line)
 void *
 CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file,
-int line)
+    int line)
 {
        void *ret = NULL;
diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h
index 3e02776d30..be097bfc70 100644
--- a/src/lib/libcrypto/md32_common.h
+++ b/src/lib/libcrypto/md32_common.h
@@ -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
@@ -377,7 +377,7 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
 * *either* case. Now declaring 'em long excuses the compiler
 * from keeping 32 MSBs zeroed resulting in 13% performance
 * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
- * Well, to be honest it should say that this *prevents* 
+ * Well, to be honest it should say that this *prevents*
 * performance degradation.
 *                              <appro@fy.chalmers.se>
 */
diff --git a/src/lib/libcrypto/mem_dbg.c b/src/lib/libcrypto/mem_dbg.c
index fad6a58496..3b51be61f7 100644
--- a/src/lib/libcrypto/mem_dbg.c
+++ b/src/lib/libcrypto/mem_dbg.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
@@ -127,7 +127,7 @@ CRYPTO_mem_ctrl(int mode)
 int
 CRYPTO_is_mem_check_on(void)
 {
-        return(0);
+        return (0);
 }
@@ -140,25 +140,25 @@ CRYPTO_dbg_set_options(long bits)
 long
 CRYPTO_dbg_get_options(void)
 {
-        return(0);
+        return (0);
 }
 int
 CRYPTO_push_info_(const char *info, const char *file, int line)
 {
-        return(0);
+        return (0);
 }
 int
 CRYPTO_pop_info(void)
 {
-        return(0);
+        return (0);
 }
 int
 CRYPTO_remove_all_info(void)
 {
-        return(0);
+        return (0);
 }
 void
diff --git a/src/lib/libcrypto/o_time.c b/src/lib/libcrypto/o_time.c
index 000372d35b..287aaae7ab 100644
--- a/src/lib/libcrypto/o_time.c
+++ b/src/lib/libcrypto/o_time.c
@@ -13,7 +13,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
@@ -192,19 +192,19 @@ check_time(long offset)
        gmtime_r(&t1, &tm1);
        OPENSSL_gmtime_adj(&tm1, 0, offset);
        if ((tm1.tm_year == tm2.tm_year) &&
-                (tm1.tm_mon == tm2.tm_mon) &&
+            (tm1.tm_mon == tm2.tm_mon) &&
-        (tm1.tm_mday == tm2.tm_mday) &&
+            (tm1.tm_mday == tm2.tm_mday) &&
-        (tm1.tm_hour == tm2.tm_hour) &&
+            (tm1.tm_hour == tm2.tm_hour) &&
-        (tm1.tm_min == tm2.tm_min) &&
+            (tm1.tm_min == tm2.tm_min) &&
-        (tm1.tm_sec == tm2.tm_sec))
+            (tm1.tm_sec == tm2.tm_sec))
-        return 1;
+                return 1;
        fprintf(stderr, "TIME ERROR!!\n");
        fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n",
-        tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
+            tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
-        tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
+            tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
        fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n",
-        tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
+            tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
-        tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
+            tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
        return 0;
 }
diff --git a/src/lib/libcrypto/o_time.h b/src/lib/libcrypto/o_time.h
index 4f8288f5d5..086f5d6e71 100644
--- a/src/lib/libcrypto/o_time.h
+++ b/src/lib/libcrypto/o_time.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/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h
index 3c360b0d9b..3a7a66edef 100644
--- a/src/lib/libcrypto/ossl_typ.h
+++ b/src/lib/libcrypto/ossl_typ.h
@@ -6,7 +6,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/src/lib/libcrypto/ppccap.c b/src/lib/libcrypto/ppccap.c
index 16cc9c445e..4d7dd38dd1 100644
--- a/src/lib/libcrypto/ppccap.c
+++ b/src/lib/libcrypto/ppccap.c
@@ -90,7 +90,7 @@ OPENSSL_cpuid_setup(void)
 #if defined(_AIX)
        if (sizeof(size_t) == 4
 # if defined(_SC_AIX_KERNEL_BITMODE)
-        && sysconf(_SC_AIX_KERNEL_BITMODE) != 64
+            && sysconf(_SC_AIX_KERNEL_BITMODE) != 64
 # endif
        )
        return;
diff --git a/src/lib/libcrypto/sparcv9cap.c b/src/lib/libcrypto/sparcv9cap.c
index f49e71ec93..36aacb0e00 100644
--- a/src/lib/libcrypto/sparcv9cap.c
+++ b/src/lib/libcrypto/sparcv9cap.c
@@ -34,7 +34,8 @@ void		_sparcv9_vis2_probe(void);
 void            _sparcv9_fmadd_probe(void);
 static sigjmp_buf common_jmp;
-static void common_handler(int sig)
+static void
+common_handler(int sig)
 {
        siglongjmp(common_jmp, sig);
 }
diff --git a/src/lib/libssl/src/crypto/cpt_err.c b/src/lib/libssl/src/crypto/cpt_err.c
index a8e94ccd16..5c1946c061 100644
--- a/src/lib/libssl/src/crypto/cpt_err.c
+++ b/src/lib/libssl/src/crypto/cpt_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_CRYPTO,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CRYPTO,0,reason)
-static ERR_STRING_DATA CRYPTO_str_functs[]= {
+static ERR_STRING_DATA CRYPTO_str_functs[] = {
        {ERR_FUNC(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX),    "CRYPTO_get_ex_new_index"},
        {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID),   "CRYPTO_get_new_dynlockid"},
        {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_LOCKID),      "CRYPTO_get_new_lockid"},
@@ -82,7 +82,7 @@ static ERR_STRING_DATA CRYPTO_str_functs[]= {
        {0, NULL}
 };
-static ERR_STRING_DATA CRYPTO_str_reasons[]= {
+static ERR_STRING_DATA CRYPTO_str_reasons[] = {
        {ERR_REASON(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"},
        {ERR_REASON(CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK), "no dynlock create callback"},
        {0, NULL}
diff --git a/src/lib/libssl/src/crypto/cryptlib.h b/src/lib/libssl/src/crypto/cryptlib.h
index a785024159..f43aa30b41 100644
--- a/src/lib/libssl/src/crypto/cryptlib.h
+++ b/src/lib/libssl/src/crypto/cryptlib.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
@@ -65,8 +65,8 @@
 #include <unistd.h>
 #include <openssl/crypto.h>
-#include <openssl/buffer.h> 
+#include <openssl/buffer.h>
-#include <openssl/bio.h> 
+#include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/opensslconf.h>
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index 0b7634cd9e..11c34d8bbe 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -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
@@ -58,21 +58,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:
@@ -87,10 +87,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
@@ -102,7 +102,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
@@ -110,7 +110,7 @@
 */
 /* ====================================================================
 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by 
+ * ECDH support in OpenSSL originally developed by
 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
 */
diff --git a/src/lib/libssl/src/crypto/cversion.c b/src/lib/libssl/src/crypto/cversion.c
index 326216d084..38999ab670 100644
--- a/src/lib/libssl/src/crypto/cversion.c
+++ b/src/lib/libssl/src/crypto/cversion.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/crypto/ex_data.c b/src/lib/libssl/src/crypto/ex_data.c
index 0b27d57b45..77a91c4b04 100644
--- a/src/lib/libssl/src/crypto/ex_data.c
+++ b/src/lib/libssl/src/crypto/ex_data.c
@@ -34,21 +34,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:
@@ -63,10 +63,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
@@ -78,7 +78,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
@@ -92,7 +92,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
@@ -276,9 +276,9 @@ ex_data_check(void)
 {
        int toret = 1;
        CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
-        if (!ex_data
+        if (!ex_data &&
-                && (ex_data = lh_EX_CLASS_ITEM_new()) == NULL)
+            (ex_data = lh_EX_CLASS_ITEM_new()) == NULL)
-        toret = 0;
+                toret = 0;
        CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
        return toret;
 }
@@ -344,7 +344,7 @@ def_add_index(EX_CLASS_ITEM *item, long argl, void *argp,
 {
        int toret = -1;
        CRYPTO_EX_DATA_FUNCS *a = (CRYPTO_EX_DATA_FUNCS *)malloc(
-        sizeof(CRYPTO_EX_DATA_FUNCS));
+            sizeof(CRYPTO_EX_DATA_FUNCS));
        if (!a) {
                CRYPTOerr(CRYPTO_F_DEF_ADD_INDEX, ERR_R_MALLOC_FAILURE);
                return -1;
@@ -376,6 +376,7 @@ static int
 int_new_class(void)
 {
        int toret;
        CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
        toret = ex_class++;
        CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
@@ -395,9 +396,10 @@ int_cleanup(void)
 static int
 int_get_new_index(int class_index, long argl, void *argp,
    CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
-CRYPTO_EX_free *free_func)
+    CRYPTO_EX_free *free_func)
 {
        EX_CLASS_ITEM *item = def_get_class(class_index);
        if (!item)
                return -1;
        return def_add_index(item, argl, argp, new_func, dup_func, free_func);
@@ -408,13 +410,13 @@ CRYPTO_EX_free *free_func)
 * the global "ex_data" state (ie. class definitions), not thread-safe on 'ad'
 * itself. */
 static int
-int_new_ex_data(int class_index, void *obj,
+int_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
-    CRYPTO_EX_DATA *ad)
 {
        int mx, i;
        void *ptr;
        CRYPTO_EX_DATA_FUNCS **storage = NULL;
        EX_CLASS_ITEM *item = def_get_class(class_index);
        if (!item)
                /* error is already set */
                return 0;
@@ -426,7 +428,8 @@ int_new_ex_data(int class_index, void *obj,
                if (!storage)
                        goto skip;
                for (i = 0; i < mx; i++)
-                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i);
+                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
+                            item->meth, i);
        }
 skip:
        CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -438,7 +441,7 @@ skip:
                if (storage[i] && storage[i]->new_func) {
                        ptr = CRYPTO_get_ex_data(ad, i);
                        storage[i]->new_func(obj, ptr, ad, i,
-                        storage[i]->argl, storage[i]->argp);
+                            storage[i]->argl, storage[i]->argp);
                }
        }
        if (storage)
@@ -448,13 +451,13 @@ skip:
 /* Same thread-safety notes as for "int_new_ex_data" */
 static int
-int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
+int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from)
-    CRYPTO_EX_DATA *from)
 {
        int mx, j, i;
        char *ptr;
        CRYPTO_EX_DATA_FUNCS **storage = NULL;
        EX_CLASS_ITEM *item;
        if (!from->sk)
                /* 'to' should be "blank" which *is* just like 'from' */
                return 1;
@@ -470,7 +473,8 @@ int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
                if (!storage)
                        goto skip;
                for (i = 0; i < mx; i++)
-                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i);
+                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
+                            item->meth, i);
        }
 skip:
        CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -507,7 +511,8 @@ int_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
                if (!storage)
                        goto skip;
                for (i = 0; i < mx; i++)
-                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i);
+                        storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
+                            item->meth, i);
        }
 skip:
        CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -519,7 +524,7 @@ skip:
                if (storage[i] && storage[i]->free_func) {
                        ptr = CRYPTO_get_ex_data(ad, i);
                        storage[i]->free_func(obj, ptr, ad, i,
-                        storage[i]->argl, storage[i]->argp);
+                            storage[i]->argl, storage[i]->argp);
                }
        }
        if (storage)
@@ -563,7 +568,7 @@ CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
        IMPL_CHECK
        ret = EX_IMPL(get_new_index)(class_index,
-        argl, argp, new_func, dup_func, free_func);
+            argl, argp, new_func, dup_func, free_func);
        return ret;
 }
@@ -603,7 +608,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
        if (ad->sk == NULL) {
                if ((ad->sk = sk_void_new_null()) == NULL) {
-                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE);
+                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
+                            ERR_R_MALLOC_FAILURE);
                        return (0);
                }
        }
@@ -611,7 +617,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
        while (i <= idx) {
                if (!sk_void_push(ad->sk, NULL)) {
-                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE);
+                        CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
+                            ERR_R_MALLOC_FAILURE);
                        return (0);
                }
                i++;
diff --git a/src/lib/libssl/src/crypto/malloc-wrapper.c b/src/lib/libssl/src/crypto/malloc-wrapper.c
index c754df40e3..68af818230 100644
--- a/src/lib/libssl/src/crypto/malloc-wrapper.c
+++ b/src/lib/libssl/src/crypto/malloc-wrapper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc-wrapper.c,v 1.2 2014/04/17 20:44:45 tedu Exp $ */
+/* $OpenBSD: malloc-wrapper.c,v 1.3 2014/04/20 14:32:19 jsing Exp $ */
 /*
 * Copyright (c) 2014 Bob Beck
 *
@@ -154,7 +154,7 @@ CRYPTO_realloc(void *ptr, int num, const char *file, int line)
 void *
 CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file,
-int line)
+    int line)
 {
        void *ret = NULL;
diff --git a/src/lib/libssl/src/crypto/md32_common.h b/src/lib/libssl/src/crypto/md32_common.h
index 3e02776d30..be097bfc70 100644
--- a/src/lib/libssl/src/crypto/md32_common.h
+++ b/src/lib/libssl/src/crypto/md32_common.h
@@ -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
@@ -377,7 +377,7 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
 * *either* case. Now declaring 'em long excuses the compiler
 * from keeping 32 MSBs zeroed resulting in 13% performance
 * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
- * Well, to be honest it should say that this *prevents* 
+ * Well, to be honest it should say that this *prevents*
 * performance degradation.
 *                              <appro@fy.chalmers.se>
 */
diff --git a/src/lib/libssl/src/crypto/mem_dbg.c b/src/lib/libssl/src/crypto/mem_dbg.c
index fad6a58496..3b51be61f7 100644
--- a/src/lib/libssl/src/crypto/mem_dbg.c
+++ b/src/lib/libssl/src/crypto/mem_dbg.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
@@ -127,7 +127,7 @@ CRYPTO_mem_ctrl(int mode)
 int
 CRYPTO_is_mem_check_on(void)
 {
-        return(0);
+        return (0);
 }
@@ -140,25 +140,25 @@ CRYPTO_dbg_set_options(long bits)
 long
 CRYPTO_dbg_get_options(void)
 {
-        return(0);
+        return (0);
 }
 int
 CRYPTO_push_info_(const char *info, const char *file, int line)
 {
-        return(0);
+        return (0);
 }
 int
 CRYPTO_pop_info(void)
 {
-        return(0);
+        return (0);
 }
 int
 CRYPTO_remove_all_info(void)
 {
-        return(0);
+        return (0);
 }
 void
diff --git a/src/lib/libssl/src/crypto/o_time.c b/src/lib/libssl/src/crypto/o_time.c
index 000372d35b..287aaae7ab 100644
--- a/src/lib/libssl/src/crypto/o_time.c
+++ b/src/lib/libssl/src/crypto/o_time.c
@@ -13,7 +13,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
@@ -192,19 +192,19 @@ check_time(long offset)
        gmtime_r(&t1, &tm1);
        OPENSSL_gmtime_adj(&tm1, 0, offset);
        if ((tm1.tm_year == tm2.tm_year) &&
-                (tm1.tm_mon == tm2.tm_mon) &&
+            (tm1.tm_mon == tm2.tm_mon) &&
-        (tm1.tm_mday == tm2.tm_mday) &&
+            (tm1.tm_mday == tm2.tm_mday) &&
-        (tm1.tm_hour == tm2.tm_hour) &&
+            (tm1.tm_hour == tm2.tm_hour) &&
-        (tm1.tm_min == tm2.tm_min) &&
+            (tm1.tm_min == tm2.tm_min) &&
-        (tm1.tm_sec == tm2.tm_sec))
+            (tm1.tm_sec == tm2.tm_sec))
-        return 1;
+                return 1;
        fprintf(stderr, "TIME ERROR!!\n");
        fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n",
-        tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
+            tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
-        tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
+            tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
        fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n",
-        tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
+            tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
-        tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
+            tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
        return 0;
 }
diff --git a/src/lib/libssl/src/crypto/o_time.h b/src/lib/libssl/src/crypto/o_time.h
index 4f8288f5d5..086f5d6e71 100644
--- a/src/lib/libssl/src/crypto/o_time.h
+++ b/src/lib/libssl/src/crypto/o_time.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/src/lib/libssl/src/crypto/ossl_typ.h b/src/lib/libssl/src/crypto/ossl_typ.h
index 3c360b0d9b..3a7a66edef 100644
--- a/src/lib/libssl/src/crypto/ossl_typ.h
+++ b/src/lib/libssl/src/crypto/ossl_typ.h
@@ -6,7 +6,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/src/lib/libssl/src/crypto/ppccap.c b/src/lib/libssl/src/crypto/ppccap.c
index 16cc9c445e..4d7dd38dd1 100644
--- a/src/lib/libssl/src/crypto/ppccap.c
+++ b/src/lib/libssl/src/crypto/ppccap.c
@@ -90,7 +90,7 @@ OPENSSL_cpuid_setup(void)
 #if defined(_AIX)
        if (sizeof(size_t) == 4
 # if defined(_SC_AIX_KERNEL_BITMODE)
-        && sysconf(_SC_AIX_KERNEL_BITMODE) != 64
+            && sysconf(_SC_AIX_KERNEL_BITMODE) != 64
 # endif
        )
        return;
diff --git a/src/lib/libssl/src/crypto/sparcv9cap.c b/src/lib/libssl/src/crypto/sparcv9cap.c
index f49e71ec93..36aacb0e00 100644
--- a/src/lib/libssl/src/crypto/sparcv9cap.c
+++ b/src/lib/libssl/src/crypto/sparcv9cap.c
@@ -34,7 +34,8 @@ void		_sparcv9_vis2_probe(void);
 void            _sparcv9_fmadd_probe(void);
 static sigjmp_buf common_jmp;
-static void common_handler(int sig)
+static void
+common_handler(int sig)
 {
        siglongjmp(common_jmp, sig);
 }