KNF (when not conflicting with other cleanup changes in progress)

4 files changed, 61 insertions, 44 deletions

diff --git a/src/lib/libcrypto/evp/e_gost2814789.c b/src/lib/libcrypto/evp/e_gost2814789.c
index 678c7af09d..e1437b18d8 100644
--- a/src/lib/libcrypto/evp/e_gost2814789.c
+++ b/src/lib/libcrypto/evp/e_gost2814789.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_gost2814789.c,v 1.1 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: e_gost2814789.c,v 1.2 2014/11/09 23:06:50 miod Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -63,13 +63,14 @@ typedef struct {
         int param_nid;
 } EVP_GOST2814789_CTX;
 
-static int gost2814789_ctl(EVP_CIPHER_CTX *ctx,int type,int arg,void *ptr)
+static int
+gost2814789_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
 {
         EVP_GOST2814789_CTX *c = ctx->cipher_data;
 
         switch (type) {
         case EVP_CTRL_PBE_PRF_NID:
-                if (ptr) {
+                if (ptr != NULL) {
                         *((int *)ptr) = NID_id_HMACGostR3411_94;
                         return 1;
                 } else {
@@ -137,7 +138,8 @@ int gost2814789_set_asn1_params(EVP_CIPHER_CTX * ctx, ASN1_TYPE * params)
         return 1;
 }
 
-int gost2814789_get_asn1_params(EVP_CIPHER_CTX * ctx, ASN1_TYPE * params)
+int
+gost2814789_get_asn1_params(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params)
 {
         int ret = -1;
         int len;
@@ -145,20 +147,19 @@ int gost2814789_get_asn1_params(EVP_CIPHER_CTX * ctx, ASN1_TYPE * params)
         EVP_GOST2814789_CTX *c = ctx->cipher_data;
         unsigned char *p;
 
-        if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE) {
+        if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE)
                 return ret;
-        }
 
         p = params->value.sequence->data;
 
         gcp = d2i_GOST_CIPHER_PARAMS(NULL, (const unsigned char **)&p,
-                                     params->value.sequence->length);
+            params->value.sequence->length);
 
         len = gcp->iv->length;
         if (len != ctx->cipher->iv_len) {
                 GOST_CIPHER_PARAMS_free(gcp);
                 GOSTerr(GOST_F_GOST89_GET_ASN1_PARAMETERS,
-                        GOST_R_INVALID_IV_LENGTH);
+                    GOST_R_INVALID_IV_LENGTH);
                 return -1;
         }
 
@@ -179,22 +180,23 @@ int gost2814789_get_asn1_params(EVP_CIPHER_CTX * ctx, ASN1_TYPE * params)
 BLOCK_CIPHER_func_ecb(gost2814789, Gost2814789, EVP_GOST2814789_CTX, ks)
 BLOCK_CIPHER_func_cfb(gost2814789, Gost2814789, 64, EVP_GOST2814789_CTX, ks)
 
-static int gost2814789_cnt_cipher(EVP_CIPHER_CTX * ctx, unsigned char *out,
-                                  const unsigned char *in, size_t inl)
+static int
+gost2814789_cnt_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+    const unsigned char *in, size_t inl)
 {
         EVP_GOST2814789_CTX *c = ctx->cipher_data;
 
         while (inl >= EVP_MAXCHUNK) {
                 Gost2814789_cnt_encrypt(in, out, (long)EVP_MAXCHUNK, &c->ks,
-                                        ctx->iv, ctx->buf, &ctx->num);
+                    ctx->iv, ctx->buf, &ctx->num);
                 inl -= EVP_MAXCHUNK;
                 in += EVP_MAXCHUNK;
                 out += EVP_MAXCHUNK;
         }
 
         if (inl)
-                Gost2814789_cnt_encrypt(in, out, inl, &c->ks,
-                                        ctx->iv, ctx->buf, &ctx->num);
+                Gost2814789_cnt_encrypt(in, out, inl, &c->ks, ctx->iv, ctx->buf,
+                    &ctx->num);
         return 1;
 }
 
diff --git a/src/lib/libcrypto/evp/m_gost2814789.c b/src/lib/libcrypto/evp/m_gost2814789.c
index ff3f489e46..279af872e0 100644
--- a/src/lib/libcrypto/evp/m_gost2814789.c
+++ b/src/lib/libcrypto/evp/m_gost2814789.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m_gost2814789.c,v 1.1 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: m_gost2814789.c,v 1.2 2014/11/09 23:06:50 miod Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -56,22 +56,27 @@
 #include <openssl/gost.h>
 #include <openssl/objects.h>
 
-static int init(EVP_MD_CTX *ctx)
+static int
+gost2814789_init(EVP_MD_CTX *ctx)
 {
-        return GOST2814789IMIT_Init(ctx->md_data, NID_id_Gost28147_89_CryptoPro_A_ParamSet);
+        return GOST2814789IMIT_Init(ctx->md_data,
+            NID_id_Gost28147_89_CryptoPro_A_ParamSet);
 }
 
-static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
+static int
+gost2814789_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         return GOST2814789IMIT_Update(ctx->md_data, data, count);
 }
 
-static int final(EVP_MD_CTX *ctx, unsigned char *md)
+static int
+gost2814789_final(EVP_MD_CTX *ctx, unsigned char *md)
 {
         return GOST2814789IMIT_Final(md, ctx->md_data);
 }
 
-static int md_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
+static int
+gost2814789_md_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)
 {
         GOST2814789IMIT_CTX *gctx = ctx->md_data;
 
@@ -89,12 +94,12 @@ static const EVP_MD gost2814789imit_md = {
         .pkey_type = NID_undef,
         .md_size = GOST2814789IMIT_LENGTH,
         .flags = 0,
-        .init = init,
-        .update = update,
-        .final = final,
+        .init = gost2814789_init,
+        .update = gost2814789_update,
+        .final = gost2814789_final,
         .block_size = GOST2814789IMIT_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(GOST2814789IMIT_CTX),
-        .md_ctrl = md_ctrl,
+        .md_ctrl = gost2814789_md_ctrl,
 };
 
 const EVP_MD *
diff --git a/src/lib/libcrypto/evp/m_gostr341194.c b/src/lib/libcrypto/evp/m_gostr341194.c
index 380d92d508..66d9b4f303 100644
--- a/src/lib/libcrypto/evp/m_gostr341194.c
+++ b/src/lib/libcrypto/evp/m_gostr341194.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m_gostr341194.c,v 1.1 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: m_gostr341194.c,v 1.2 2014/11/09 23:06:50 miod Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -58,17 +58,21 @@
 #include <openssl/gost.h>
 #include <openssl/objects.h>
 
-static int init(EVP_MD_CTX *ctx)
+static int
+gostr341194_init(EVP_MD_CTX *ctx)
 {
-        return GOSTR341194_Init(ctx->md_data, NID_id_GostR3411_94_CryptoProParamSet);
+        return GOSTR341194_Init(ctx->md_data,
+            NID_id_GostR3411_94_CryptoProParamSet);
 }
 
-static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
+static int
+gostr341194_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         return GOSTR341194_Update(ctx->md_data, data, count);
 }
 
-static int final(EVP_MD_CTX *ctx, unsigned char *md)
+static int
+gostr341194_final(EVP_MD_CTX *ctx, unsigned char *md)
 {
         return GOSTR341194_Final(md, ctx->md_data);
 }
@@ -78,9 +82,9 @@ static const EVP_MD gostr341194_md = {
         .pkey_type = NID_undef,
         .md_size = GOSTR341194_LENGTH,
         .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE,
-        .init = init,
-        .update = update,
-        .final = final,
+        .init = gostr341194_init,
+        .update = gostr341194_update,
+        .final = gostr341194_final,
         .block_size = GOSTR341194_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(GOSTR341194_CTX),
 };
diff --git a/src/lib/libcrypto/evp/m_streebog.c b/src/lib/libcrypto/evp/m_streebog.c
index cf4b159f43..882c7852bb 100644
--- a/src/lib/libcrypto/evp/m_streebog.c
+++ b/src/lib/libcrypto/evp/m_streebog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m_streebog.c,v 1.1 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: m_streebog.c,v 1.2 2014/11/09 23:06:50 miod Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -57,32 +57,38 @@
 #include <openssl/gost.h>
 #include <openssl/objects.h>
 
-static int init256(EVP_MD_CTX *ctx)
+static int
+streebog_init256(EVP_MD_CTX *ctx)
 {
         return STREEBOG256_Init(ctx->md_data);
 }
 
-static int update256(EVP_MD_CTX *ctx, const void *data, size_t count)
+static int
+streebog_update256(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         return STREEBOG256_Update(ctx->md_data, data, count);
 }
 
-static int final256(EVP_MD_CTX *ctx, unsigned char *md)
+static int
+streebog_final256(EVP_MD_CTX *ctx, unsigned char *md)
 {
         return STREEBOG256_Final(md, ctx->md_data);
 }
 
-static int init512(EVP_MD_CTX *ctx)
+static int
+streebog_init512(EVP_MD_CTX *ctx)
 {
         return STREEBOG512_Init(ctx->md_data);
 }
 
-static int update512(EVP_MD_CTX *ctx, const void *data, size_t count)
+static int
+streebog_update512(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
         return STREEBOG512_Update(ctx->md_data, data, count);
 }
 
-static int final512(EVP_MD_CTX *ctx, unsigned char *md)
+static int
+streebog_final512(EVP_MD_CTX *ctx, unsigned char *md)
 {
         return STREEBOG512_Final(md, ctx->md_data);
 }
@@ -92,9 +98,9 @@ static const EVP_MD streebog256_md = {
         .pkey_type = NID_undef,
         .md_size = STREEBOG256_LENGTH,
         .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE,
-        .init = init256,
-        .update = update256,
-        .final = final256,
+        .init = streebog_init256,
+        .update = streebog_update256,
+        .final = streebog_final256,
         .block_size = STREEBOG_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(STREEBOG_CTX),
 };
@@ -104,9 +110,9 @@ static const EVP_MD streebog512_md = {
         .pkey_type = NID_undef,
         .md_size = STREEBOG512_LENGTH,
         .flags = EVP_MD_FLAG_PKEY_METHOD_SIGNATURE,
-        .init = init512,
-        .update = update512,
-        .final = final512,
+        .init = streebog_init512,
+        .update = streebog_update512,
+        .final = streebog_final512,
         .block_size = STREEBOG_CBLOCK,
         .ctx_size = sizeof(EVP_MD *) + sizeof(STREEBOG_CTX),
 };