1 files changed, 60 insertions, 55 deletions

diff --git a/src/lib/libcrypto/cmac/cm_pmeth.c b/src/lib/libcrypto/cmac/cm_pmeth.c
index b65c1795ae..3010f91aca 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.4 2014/06/12 15:49:28 deraadt Exp $ */
+/* $OpenBSD: cm_pmeth.c,v 1.5 2014/06/21 12:07:02 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2010.
  */
@@ -61,135 +61,140 @@
 
 /* The context structure and "key" is simply a CMAC_CTX */
 
-static int pkey_cmac_init(EVP_PKEY_CTX *ctx)
-        {
+static int
+pkey_cmac_init(EVP_PKEY_CTX *ctx)
+{
         ctx->data = CMAC_CTX_new();
         if (!ctx->data)
                 return 0;
         ctx->keygen_info_count = 0;
         return 1;
-        }
+}
 
-static int pkey_cmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
-        {
+static int
+pkey_cmac_copy(EVP_PKEY_CTX *dst, EVP_PKEY_CTX *src)
+{
         if (!pkey_cmac_init(dst))
                 return 0;
         if (!CMAC_CTX_copy(dst->data, src->data))
                 return 0;
         return 1;
-        }
+}
 
-static void pkey_cmac_cleanup(EVP_PKEY_CTX *ctx)
-        {
+static void
+pkey_cmac_cleanup(EVP_PKEY_CTX *ctx)
+{
         CMAC_CTX_free(ctx->data);
-        }
+}
 
-static int pkey_cmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
-        {
+static int
+pkey_cmac_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+{
         CMAC_CTX *cmkey = CMAC_CTX_new();
         CMAC_CTX *cmctx = ctx->data;
+
         if (!cmkey)
                 return 0;
-        if (!CMAC_CTX_copy(cmkey, cmctx))
-                {
+        if (!CMAC_CTX_copy(cmkey, cmctx)) {
                 CMAC_CTX_free(cmkey);
                 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)
-        {
+static int
+int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
+{
         if (!CMAC_Update(ctx->pctx->data, data, count))
                 return 0;
         return 1;
-        }
+}
 
-static int cmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
-        {
+static int
+cmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
+{
         EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
         mctx->update = int_update;
         return 1;
-        }
+}
 
-static int cmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                                        EVP_MD_CTX *mctx)
-        {
+static int
+cmac_signctx(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+    EVP_MD_CTX *mctx)
+{
         return CMAC_Final(ctx->data, sig, siglen);
-        }
+}
 
-static int pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
-        {
+static int
+pkey_cmac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
+{
         CMAC_CTX *cmctx = ctx->data;
-        switch (type)
-                {
 
-                case EVP_PKEY_CTRL_SET_MAC_KEY:
+        switch (type) {
+        case EVP_PKEY_CTRL_SET_MAC_KEY:
                 if (!p2 || p1 < 0)
                         return 0;
                 if (!CMAC_Init(cmctx, p2, p1, NULL, NULL))
                         return 0;
                 break;
 
-                case EVP_PKEY_CTRL_CIPHER:
+        case EVP_PKEY_CTRL_CIPHER:
                 if (!CMAC_Init(cmctx, NULL, 0, p2, ctx->engine))
                         return 0;
                 break;
 
-                case EVP_PKEY_CTRL_MD:
+        case EVP_PKEY_CTRL_MD:
                 if (ctx->pkey && !CMAC_CTX_copy(ctx->data,
-                                        (CMAC_CTX *)ctx->pkey->pkey.ptr))
+                    (CMAC_CTX *)ctx->pkey->pkey.ptr))
                         return 0;
                 if (!CMAC_Init(cmctx, NULL, 0, NULL, NULL))
                         return 0;
                 break;
 
-                default:
+        default:
                 return -2;
-
-                }
-        return 1;
         }
+        return 1;
+}
 
-static int pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx,
-                        const char *type, const char *value)
-        {
+static int
+pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value)
+{
         if (!value)
-                {
                 return 0;
-                }
-        if (!strcmp(type, "key"))
-                {
+        if (!strcmp(type, "key")) {
                 void *p = (void *)value;
                 return pkey_cmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY,
-                                                                strlen(p), p);
-                }
-        if (!strcmp(type, "cipher"))
-                {
+                    strlen(p), p);
+        }
+        if (!strcmp(type, "cipher")) {
                 const EVP_CIPHER *c;
+
                 c = EVP_get_cipherbyname(value);
                 if (!c)
                         return 0;
                 return pkey_cmac_ctrl(ctx, EVP_PKEY_CTRL_CIPHER, -1, (void *)c);
-                }
-        if (!strcmp(type, "hexkey"))
-                {
+        }
+        if (!strcmp(type, "hexkey")) {
                 unsigned char *key;
                 int r;
                 long keylen;
+
                 key = string_to_hex(value, &keylen);
                 if (!key)
                         return 0;
                 r = pkey_cmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, keylen, key);
                 free(key);
                 return r;
-                }
-        return -2;
         }
 
-const EVP_PKEY_METHOD cmac_pkey_meth = {
+        return -2;
+}
+
+const EVP_PKEY_METHOD
+cmac_pkey_meth = {
         .pkey_id = EVP_PKEY_CMAC,
         .flags = EVP_PKEY_FLAG_SIGCTX_CUSTOM,