More KNF.

16 files changed, 112 insertions, 122 deletions

diff --git a/src/lib/libcrypto/cmac/cm_ameth.c b/src/lib/libcrypto/cmac/cm_ameth.c
index a793e65262..763d161cfe 100644
--- a/src/lib/libcrypto/cmac/cm_ameth.c
+++ b/src/lib/libcrypto/cmac/cm_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cm_ameth.c,v 1.4 2014/06/21 12:07:02 miod Exp $ */
+/* $OpenBSD: cm_ameth.c,v 1.5 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2010.
  */
@@ -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
@@ -77,8 +77,7 @@ cmac_key_free(EVP_PKEY *pkey)
                 CMAC_CTX_free(cmctx);
 }
 
-const EVP_PKEY_ASN1_METHOD
-cmac_asn1_meth = {
+const EVP_PKEY_ASN1_METHOD cmac_asn1_meth = {
         .pkey_id = EVP_PKEY_CMAC,
         .pkey_base_id = EVP_PKEY_CMAC,
 
diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c
index 3010f91aca..5bb391d053 100644
--- a/src/lib/libcrypto/cmac/cm_pmeth.c
+++ b/src/lib/libcrypto/cmac/cm_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cm_pmeth.c,v 1.5 2014/06/21 12:07:02 miod Exp $ */
+/* $OpenBSD: cm_pmeth.c,v 1.6 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2010.
  */
@@ -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
@@ -100,12 +100,12 @@ pkey_cmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
                 return 0;
         }
         EVP_PKEY_assign(pkey, EVP_PKEY_CMAC, cmkey);
-        
+
         return 1;
 }
 
 static int
-int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
+int_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         if (!CMAC_Update(ctx->pctx->data, data, count))
                 return 0;
@@ -193,8 +193,7 @@ pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value)
         return -2;
 }
 
-const EVP_PKEY_METHOD
-cmac_pkey_meth = {
+const EVP_PKEY_METHOD cmac_pkey_meth = {
         .pkey_id = EVP_PKEY_CMAC,
         .flags = EVP_PKEY_FLAG_SIGCTX_CUSTOM,
 
diff --git a/src/lib/libcrypto/cmac/cmac.c b/src/lib/libcrypto/cmac/cmac.c
index b2f77c59bd..b717f786f1 100644
--- a/src/lib/libcrypto/cmac/cmac.c
+++ b/src/lib/libcrypto/cmac/cmac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmac.c,v 1.6 2014/06/21 12:07:02 miod Exp $ */
+/* $OpenBSD: cmac.c,v 1.7 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -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
@@ -217,7 +217,7 @@ CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen)
                         return 1;
                 data += nleft;
                 /* Else not final block so encrypt it */
-                if (!EVP_Cipher(&ctx->cctx, ctx->tbl, ctx->last_block,bl))
+                if (!EVP_Cipher(&ctx->cctx, ctx->tbl, ctx->last_block, bl))
                         return 0;
         }
         /* Encrypt all but one of the complete blocks left */
@@ -257,7 +257,7 @@ CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
                         out[i] = ctx->last_block[i] ^ ctx->k2[i];
         }
         if (!EVP_Cipher(&ctx->cctx, out, out, bl)) {
-                OPENSSL_cleanse(out, bl);       
+                OPENSSL_cleanse(out, bl);
                 return 0;
         }
         return 1;
@@ -272,7 +272,7 @@ CMAC_resume(CMAC_CTX *ctx)
          * which is the last IV (or all zeroes if no last encrypted block).
          * The last block has not been modified since CMAC_final().
          * So reinitialising using the last decrypted block will allow
-         * CMAC to continue after calling CMAC_Final(). 
+         * CMAC to continue after calling CMAC_Final().
          */
         return EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, ctx->tbl);
 }
diff --git a/src/lib/libcrypto/cmac/cmac.h b/src/lib/libcrypto/cmac/cmac.h
index 10ae543f41..cb6d64b02f 100644
--- a/src/lib/libcrypto/cmac/cmac.h
+++ b/src/lib/libcrypto/cmac/cmac.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmac.h,v 1.2 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cmac.h,v 1.3 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -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
@@ -70,8 +70,8 @@ void CMAC_CTX_free(CMAC_CTX *ctx);
 EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx);
 int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in);
 
-int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen, 
-                        const EVP_CIPHER *cipher, ENGINE *impl);
+int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
+    const EVP_CIPHER *cipher, ENGINE *impl);
 int CMAC_Update(CMAC_CTX *ctx, const void *data, size_t dlen);
 int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen);
 int CMAC_resume(CMAC_CTX *ctx);
diff --git a/src/lib/libcrypto/hmac/hm_ameth.c b/src/lib/libcrypto/hmac/hm_ameth.c
index ef97918472..c3e9038c0c 100644
--- a/src/lib/libcrypto/hmac/hm_ameth.c
+++ b/src/lib/libcrypto/hmac/hm_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hm_ameth.c,v 1.5 2014/06/21 12:00:01 miod Exp $ */
+/* $OpenBSD: hm_ameth.c,v 1.6 2014/06/21 13:39:46 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2007.
  */
@@ -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
@@ -134,14 +134,13 @@ old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)
                 if (inc)
                         *pder += os->length;
         }
-                        
+
         return os->length;
 }
 
 #endif
 
-const EVP_PKEY_ASN1_METHOD
-hmac_asn1_meth = {
+const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
         .pkey_id = EVP_PKEY_HMAC,
         .pkey_base_id = EVP_PKEY_HMAC,
 
diff --git a/src/lib/libcrypto/hmac/hm_pmeth.c b/src/lib/libcrypto/hmac/hm_pmeth.c
index c1ada08a48..75b5ad469d 100644
--- a/src/lib/libcrypto/hmac/hm_pmeth.c
+++ b/src/lib/libcrypto/hmac/hm_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hm_pmeth.c,v 1.5 2014/06/21 12:00:01 miod Exp $ */
+/* $OpenBSD: hm_pmeth.c,v 1.6 2014/06/21 13:39:46 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2007.
  */
@@ -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
@@ -100,7 +100,7 @@ pkey_hmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
 
         if (!pkey_hmac_init(dst))
                 return 0;
-        sctx = src->data;
+        sctx = src->data;
         dctx = dst->data;
         dctx->md = sctx->md;
         HMAC_CTX_init(&dctx->ctx);
@@ -141,12 +141,12 @@ pkey_hmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         if (!hkey)
                 return 0;
         EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, hkey);
-        
+
         return 1;
 }
 
 static int
-int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
+int_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         HMAC_PKEY_CTX *hctx = ctx->pctx->data;
 
@@ -186,7 +186,7 @@ hmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
         return 1;
 }
 
-static int 
+static int
 pkey_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 {
         HMAC_PKEY_CTX *hctx = ctx->data;
@@ -240,8 +240,7 @@ pkey_hmac_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value)
         return -2;
 }
 
-const EVP_PKEY_METHOD
-hmac_pkey_meth = {
+const EVP_PKEY_METHOD hmac_pkey_meth = {
         .pkey_id = EVP_PKEY_HMAC,
 
         .init = pkey_hmac_init,
diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c
index 0c29156d80..975fc4d1ec 100644
--- a/src/lib/libcrypto/hmac/hmac.c
+++ b/src/lib/libcrypto/hmac/hmac.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: hmac.c,v 1.19 2014/06/21 12:00:01 miod Exp $ */
+/* $OpenBSD: hmac.c,v 1.20 2014/06/21 13:39:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * 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
@@ -84,17 +84,18 @@ HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md,
                         if (!EVP_DigestUpdate(&ctx->md_ctx, key, len))
                                 goto err;
                         if (!EVP_DigestFinal_ex(&(ctx->md_ctx), ctx->key,
-                                &ctx->key_length))
+                            &ctx->key_length))
                                 goto err;
                 } else {
-                        OPENSSL_assert(len>=0 && len<=(int)sizeof(ctx->key));
-                        memcpy(ctx->key,key,len);
+                        OPENSSL_assert(len >= 0 &&
+                            len <= (int)sizeof(ctx->key));
+                        memcpy(ctx->key, key, len);
                         ctx->key_length = len;
                 }
                 if (ctx->key_length != HMAC_MAX_MD_CBLOCK)
                         memset(&ctx->key[ctx->key_length], 0,
                             HMAC_MAX_MD_CBLOCK - ctx->key_length);
-                }
+        }
 
         if (reset) {
                 for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++)
@@ -122,14 +123,14 @@ int
 HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)
 {
         if (key && md)
-            HMAC_CTX_init(ctx);
-        return HMAC_Init_ex(ctx,key,len,md, NULL);
+                HMAC_CTX_init(ctx);
+        return HMAC_Init_ex(ctx, key, len, md, NULL);
 }
 
 int
 HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
 {
-        return EVP_DigestUpdate(&ctx->md_ctx,data,len);
+        return EVP_DigestUpdate(&ctx->md_ctx, data, len);
 }
 
 int
diff --git a/src/lib/libcrypto/hmac/hmac.h b/src/lib/libcrypto/hmac/hmac.h
index 5631d465e9..f3418b3cb7 100644
--- a/src/lib/libcrypto/hmac/hmac.h
+++ b/src/lib/libcrypto/hmac/hmac.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: hmac.h,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: hmac.h,v 1.12 2014/06/21 13:39:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * 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
@@ -72,15 +72,14 @@
 extern "C" {
 #endif
 
-typedef struct hmac_ctx_st
-        {
+typedef struct hmac_ctx_st {
         const EVP_MD *md;
         EVP_MD_CTX md_ctx;
         EVP_MD_CTX i_ctx;
         EVP_MD_CTX o_ctx;
         unsigned int key_length;
         unsigned char key[HMAC_MAX_MD_CBLOCK];
-        } HMAC_CTX;
+} HMAC_CTX;
 
 #define HMAC_size(e)    (EVP_MD_size((e)->md))
 
@@ -91,14 +90,13 @@ void HMAC_CTX_cleanup(HMAC_CTX *ctx);
 #define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
 
 int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-               const EVP_MD *md); /* deprecated */
-int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                  const EVP_MD *md, ENGINE *impl);
+    const EVP_MD *md); /* deprecated */
+int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md,
+    ENGINE *impl);
 int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
 int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
 unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    const unsigned char *d, size_t n, unsigned char *md,
-                    unsigned int *md_len);
+    const unsigned char *d, size_t n, unsigned char *md, unsigned int *md_len);
 int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
 
 void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
diff --git a/src/lib/libssl/src/crypto/cmac/cm_ameth.c b/src/lib/libssl/src/crypto/cmac/cm_ameth.c
index a793e65262..763d161cfe 100644
--- a/src/lib/libssl/src/crypto/cmac/cm_ameth.c
+++ b/src/lib/libssl/src/crypto/cmac/cm_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cm_ameth.c,v 1.4 2014/06/21 12:07:02 miod Exp $ */
+/* $OpenBSD: cm_ameth.c,v 1.5 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2010.
  */
@@ -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
@@ -77,8 +77,7 @@ cmac_key_free(EVP_PKEY *pkey)
                 CMAC_CTX_free(cmctx);
 }
 
-const EVP_PKEY_ASN1_METHOD
-cmac_asn1_meth = {
+const EVP_PKEY_ASN1_METHOD cmac_asn1_meth = {
         .pkey_id = EVP_PKEY_CMAC,
         .pkey_base_id = EVP_PKEY_CMAC,
 
diff --git a/src/lib/libssl/src/crypto/cmac/cm_pmeth.c b/src/lib/libssl/src/crypto/cmac/cm_pmeth.c
index 3010f91aca..5bb391d053 100644
--- a/src/lib/libssl/src/crypto/cmac/cm_pmeth.c
+++ b/src/lib/libssl/src/crypto/cmac/cm_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cm_pmeth.c,v 1.5 2014/06/21 12:07:02 miod Exp $ */
+/* $OpenBSD: cm_pmeth.c,v 1.6 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2010.
  */
@@ -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
@@ -100,12 +100,12 @@ pkey_cmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
                 return 0;
         }
         EVP_PKEY_assign(pkey, EVP_PKEY_CMAC, cmkey);
-        
+
         return 1;
 }
 
 static int
-int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
+int_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         if (!CMAC_Update(ctx->pctx->data, data, count))
                 return 0;
@@ -193,8 +193,7 @@ pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value)
         return -2;
 }
 
-const EVP_PKEY_METHOD
-cmac_pkey_meth = {
+const EVP_PKEY_METHOD cmac_pkey_meth = {
         .pkey_id = EVP_PKEY_CMAC,
         .flags = EVP_PKEY_FLAG_SIGCTX_CUSTOM,
 
diff --git a/src/lib/libssl/src/crypto/cmac/cmac.c b/src/lib/libssl/src/crypto/cmac/cmac.c
index b2f77c59bd..b717f786f1 100644
--- a/src/lib/libssl/src/crypto/cmac/cmac.c
+++ b/src/lib/libssl/src/crypto/cmac/cmac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmac.c,v 1.6 2014/06/21 12:07:02 miod Exp $ */
+/* $OpenBSD: cmac.c,v 1.7 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -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
@@ -217,7 +217,7 @@ CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen)
                         return 1;
                 data += nleft;
                 /* Else not final block so encrypt it */
-                if (!EVP_Cipher(&ctx->cctx, ctx->tbl, ctx->last_block,bl))
+                if (!EVP_Cipher(&ctx->cctx, ctx->tbl, ctx->last_block, bl))
                         return 0;
         }
         /* Encrypt all but one of the complete blocks left */
@@ -257,7 +257,7 @@ CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen)
                         out[i] = ctx->last_block[i] ^ ctx->k2[i];
         }
         if (!EVP_Cipher(&ctx->cctx, out, out, bl)) {
-                OPENSSL_cleanse(out, bl);       
+                OPENSSL_cleanse(out, bl);
                 return 0;
         }
         return 1;
@@ -272,7 +272,7 @@ CMAC_resume(CMAC_CTX *ctx)
          * which is the last IV (or all zeroes if no last encrypted block).
          * The last block has not been modified since CMAC_final().
          * So reinitialising using the last decrypted block will allow
-         * CMAC to continue after calling CMAC_Final(). 
+         * CMAC to continue after calling CMAC_Final().
          */
         return EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, ctx->tbl);
 }
diff --git a/src/lib/libssl/src/crypto/cmac/cmac.h b/src/lib/libssl/src/crypto/cmac/cmac.h
index 10ae543f41..cb6d64b02f 100644
--- a/src/lib/libssl/src/crypto/cmac/cmac.h
+++ b/src/lib/libssl/src/crypto/cmac/cmac.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmac.h,v 1.2 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cmac.h,v 1.3 2014/06/21 13:42:14 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -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
@@ -70,8 +70,8 @@ void CMAC_CTX_free(CMAC_CTX *ctx);
 EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx);
 int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in);
 
-int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen, 
-                        const EVP_CIPHER *cipher, ENGINE *impl);
+int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
+    const EVP_CIPHER *cipher, ENGINE *impl);
 int CMAC_Update(CMAC_CTX *ctx, const void *data, size_t dlen);
 int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen);
 int CMAC_resume(CMAC_CTX *ctx);
diff --git a/src/lib/libssl/src/crypto/hmac/hm_ameth.c b/src/lib/libssl/src/crypto/hmac/hm_ameth.c
index ef97918472..c3e9038c0c 100644
--- a/src/lib/libssl/src/crypto/hmac/hm_ameth.c
+++ b/src/lib/libssl/src/crypto/hmac/hm_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hm_ameth.c,v 1.5 2014/06/21 12:00:01 miod Exp $ */
+/* $OpenBSD: hm_ameth.c,v 1.6 2014/06/21 13:39:46 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2007.
  */
@@ -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
@@ -134,14 +134,13 @@ old_hmac_encode(const EVP_PKEY *pkey, unsigned char **pder)
                 if (inc)
                         *pder += os->length;
         }
-                        
+
         return os->length;
 }
 
 #endif
 
-const EVP_PKEY_ASN1_METHOD
-hmac_asn1_meth = {
+const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
         .pkey_id = EVP_PKEY_HMAC,
         .pkey_base_id = EVP_PKEY_HMAC,
 
diff --git a/src/lib/libssl/src/crypto/hmac/hm_pmeth.c b/src/lib/libssl/src/crypto/hmac/hm_pmeth.c
index c1ada08a48..75b5ad469d 100644
--- a/src/lib/libssl/src/crypto/hmac/hm_pmeth.c
+++ b/src/lib/libssl/src/crypto/hmac/hm_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hm_pmeth.c,v 1.5 2014/06/21 12:00:01 miod Exp $ */
+/* $OpenBSD: hm_pmeth.c,v 1.6 2014/06/21 13:39:46 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2007.
  */
@@ -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
@@ -100,7 +100,7 @@ pkey_hmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
 
         if (!pkey_hmac_init(dst))
                 return 0;
-        sctx = src->data;
+        sctx = src->data;
         dctx = dst->data;
         dctx->md = sctx->md;
         HMAC_CTX_init(&dctx->ctx);
@@ -141,12 +141,12 @@ pkey_hmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         if (!hkey)
                 return 0;
         EVP_PKEY_assign(pkey, EVP_PKEY_HMAC, hkey);
-        
+
         return 1;
 }
 
 static int
-int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
+int_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         HMAC_PKEY_CTX *hctx = ctx->pctx->data;
 
@@ -186,7 +186,7 @@ hmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
         return 1;
 }
 
-static int 
+static int
 pkey_hmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
 {
         HMAC_PKEY_CTX *hctx = ctx->data;
@@ -240,8 +240,7 @@ pkey_hmac_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value)
         return -2;
 }
 
-const EVP_PKEY_METHOD
-hmac_pkey_meth = {
+const EVP_PKEY_METHOD hmac_pkey_meth = {
         .pkey_id = EVP_PKEY_HMAC,
 
         .init = pkey_hmac_init,
diff --git a/src/lib/libssl/src/crypto/hmac/hmac.c b/src/lib/libssl/src/crypto/hmac/hmac.c
index 0c29156d80..975fc4d1ec 100644
--- a/src/lib/libssl/src/crypto/hmac/hmac.c
+++ b/src/lib/libssl/src/crypto/hmac/hmac.c
@@ -1,25 +1,25 @@
-/* $OpenBSD: hmac.c,v 1.19 2014/06/21 12:00:01 miod Exp $ */
+/* $OpenBSD: hmac.c,v 1.20 2014/06/21 13:39:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * 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
@@ -84,17 +84,18 @@ HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md,
                         if (!EVP_DigestUpdate(&ctx->md_ctx, key, len))
                                 goto err;
                         if (!EVP_DigestFinal_ex(&(ctx->md_ctx), ctx->key,
-                                &ctx->key_length))
+                            &ctx->key_length))
                                 goto err;
                 } else {
-                        OPENSSL_assert(len>=0 && len<=(int)sizeof(ctx->key));
-                        memcpy(ctx->key,key,len);
+                        OPENSSL_assert(len >= 0 &&
+                            len <= (int)sizeof(ctx->key));
+                        memcpy(ctx->key, key, len);
                         ctx->key_length = len;
                 }
                 if (ctx->key_length != HMAC_MAX_MD_CBLOCK)
                         memset(&ctx->key[ctx->key_length], 0,
                             HMAC_MAX_MD_CBLOCK - ctx->key_length);
-                }
+        }
 
         if (reset) {
                 for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++)
@@ -122,14 +123,14 @@ int
 HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)
 {
         if (key && md)
-            HMAC_CTX_init(ctx);
-        return HMAC_Init_ex(ctx,key,len,md, NULL);
+                HMAC_CTX_init(ctx);
+        return HMAC_Init_ex(ctx, key, len, md, NULL);
 }
 
 int
 HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
 {
-        return EVP_DigestUpdate(&ctx->md_ctx,data,len);
+        return EVP_DigestUpdate(&ctx->md_ctx, data, len);
 }
 
 int
diff --git a/src/lib/libssl/src/crypto/hmac/hmac.h b/src/lib/libssl/src/crypto/hmac/hmac.h
index 5631d465e9..f3418b3cb7 100644
--- a/src/lib/libssl/src/crypto/hmac/hmac.h
+++ b/src/lib/libssl/src/crypto/hmac/hmac.h
@@ -1,25 +1,25 @@
-/* $OpenBSD: hmac.h,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: hmac.h,v 1.12 2014/06/21 13:39:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * 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
@@ -72,15 +72,14 @@
 extern "C" {
 #endif
 
-typedef struct hmac_ctx_st
-        {
+typedef struct hmac_ctx_st {
         const EVP_MD *md;
         EVP_MD_CTX md_ctx;
         EVP_MD_CTX i_ctx;
         EVP_MD_CTX o_ctx;
         unsigned int key_length;
         unsigned char key[HMAC_MAX_MD_CBLOCK];
-        } HMAC_CTX;
+} HMAC_CTX;
 
 #define HMAC_size(e)    (EVP_MD_size((e)->md))
 
@@ -91,14 +90,13 @@ void HMAC_CTX_cleanup(HMAC_CTX *ctx);
 #define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx) /* deprecated */
 
 int HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-               const EVP_MD *md); /* deprecated */
-int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                  const EVP_MD *md, ENGINE *impl);
+    const EVP_MD *md); /* deprecated */
+int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md,
+    ENGINE *impl);
 int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
 int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
 unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    const unsigned char *d, size_t n, unsigned char *md,
-                    unsigned int *md_len);
+    const unsigned char *d, size_t n, unsigned char *md, unsigned int *md_len);
 int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
 
 void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);