1 files changed, 15 insertions, 14 deletions

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