Formatting fix

[openssl-gost/engine.git] / gost_crypt.c

diff --git a/gost_crypt.c b/gost_crypt.c
index 66e769d355a747fc6ea88f6423bdeda80084aa0d..680406fc3b60b62a232178ad767c893cc31e0b6a 100644 (file)
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@ -33,8 +33,8 @@ static int gost_cipher_init_cp_12(EVP_CIPHER_CTX *ctx,
 static int gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
                               const unsigned char *in, size_t inl);
 /* Handles block of data in CBC mode */
-static int  gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                               const unsigned char *in, size_t inl);
+static int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                              const unsigned char *in, size_t inl);
 /* Handles block of data in CNT mode */
 static int gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out,
                               const unsigned char *in, size_t inl);
@@ -63,23 +63,22 @@ EVP_CIPHER cipher_gost = {
     NULL,
 };
 
-EVP_CIPHER cipher_gost_cbc =
-    {
+EVP_CIPHER cipher_gost_cbc = {
     NID_gost89_cbc,
-    8,/*block_size*/
-    32,/*key_size*/
-    8,/*iv_len */
-    EVP_CIPH_CBC_MODE|
-    EVP_CIPH_CUSTOM_IV| EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT,
+    8,                          /*block_size */
+    32,                         /*key_size */
+    8,                          /*iv_len */
+    EVP_CIPH_CBC_MODE |
+        EVP_CIPH_CUSTOM_IV | EVP_CIPH_RAND_KEY | EVP_CIPH_ALWAYS_CALL_INIT,
     gost_cipher_init_cbc,
     gost_cipher_do_cbc,
     gost_cipher_cleanup,
-    sizeof(struct ossl_gost_cipher_ctx),/* ctx_size */
+    sizeof(struct ossl_gost_cipher_ctx), /* ctx_size */
     gost89_set_asn1_parameters,
     gost89_get_asn1_parameters,
     gost_cipher_ctl,
     NULL,
-    };
+};
 
 EVP_CIPHER cipher_gost_cpacnt = {
     NID_gost89_cnt,
@@ -313,7 +312,6 @@ int gost_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                                   EVP_CIPH_CBC_MODE);
 }
 
-
 /*
  * Wrapper around gostcrypt function from gost89.c which perform key meshing
  * when nesseccary
@@ -365,45 +363,40 @@ static void gost_cnt_next(void *ctx, unsigned char *iv, unsigned char *buf)
 
 /* GOST encryptoon in CBC mode */
 int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, size_t inl)
-    {
-    OPENSSL_assert(inl % 8 ==0);
+                       const unsigned char *in, size_t inl)
+{
+    OPENSSL_assert(inl % 8 == 0);
     unsigned char b[8];
-    const unsigned char *in_ptr=in;
-    unsigned char *out_ptr=out;
+    const unsigned char *in_ptr = in;
+    unsigned char *out_ptr = out;
     int i;
     struct ossl_gost_cipher_ctx *c = ctx->cipher_data;
-    if (ctx->encrypt)
-        {
-        while(inl>0)
-            {
-            for (i=0;i<8;i++)
-               {
-                b[i]=ctx->iv[i]^in_ptr[i];
-                }
-            gostcrypt(&(c->cctx),b,out_ptr);
-            memcpy(ctx->iv,out_ptr,8);
-            out_ptr+=8;
-            in_ptr+=8;
-            inl-=8;
+    if (ctx->encrypt) {
+        while (inl > 0) {
+            for (i = 0; i < 8; i++) {
+                b[i] = ctx->iv[i] ^ in_ptr[i];
             }
+            gostcrypt(&(c->cctx), b, out_ptr);
+            memcpy(ctx->iv, out_ptr, 8);
+            out_ptr += 8;
+            in_ptr += 8;
+            inl -= 8;
         }
-    else
-        {
-        while (inl>0) {
-            gostdecrypt(&(c->cctx),in_ptr,b);
-            for (i=0;i<8;i++)
-                {
-                out_ptr[i]=ctx->iv[i]^b[i];
-                }
-            memcpy(ctx->iv,in_ptr,8);
-            out_ptr+=8;
-            in_ptr+=8;
-            inl-=8;
+    } else {
+        while (inl > 0) {
+            gostdecrypt(&(c->cctx), in_ptr, b);
+            for (i = 0; i < 8; i++) {
+                out_ptr[i] = ctx->iv[i] ^ b[i];
             }
+            memcpy(ctx->iv, in_ptr, 8);
+            out_ptr += 8;
+            in_ptr += 8;
+            inl -= 8;
         }
-    return 1;
     }
+    return 1;
+}
+
 /* GOST encryption in CFB mode */
 int gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
                        const unsigned char *in, size_t inl)
@@ -766,36 +759,36 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
         return 1;
     case EVP_MD_CTRL_SET_KEY:
         {
-                                   struct ossl_gost_imit_ctx *gost_imit_ctx = ctx->md_data;
+            struct ossl_gost_imit_ctx *gost_imit_ctx = ctx->md_data;
 
-                                   if (ctx->digest->init(ctx) <= 0) {
-                                       GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET);
-                                       return 0;
-                                   }
-                                         ctx->flags |= EVP_MD_CTX_FLAG_NO_INIT;
+            if (ctx->digest->init(ctx) <= 0) {
+                GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET);
+                return 0;
+            }
+            ctx->flags |= EVP_MD_CTX_FLAG_NO_INIT;
 
             if (arg == 0) {
-                                                   struct gost_mac_key *key = (struct gost_mac_key*) ptr;
-                                                               if (key->mac_param_nid != NID_undef) {
-                                                                       const struct gost_cipher_info *param = get_encryption_params(OBJ_nid2obj(key->mac_param_nid));
-                                                                       if (param == NULL)
-                                                                       {
-                    GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_PARAMS);
-                    return 0;
-                                                                       }
-                                                                       gost_init(&(gost_imit_ctx->cctx), param->sblock);
-                                                               }
-                                                               gost_key(&(gost_imit_ctx->cctx), key->key);
+                struct gost_mac_key *key = (struct gost_mac_key *)ptr;
+                if (key->mac_param_nid != NID_undef) {
+                    const struct gost_cipher_info *param =
+                        get_encryption_params(OBJ_nid2obj
+                                              (key->mac_param_nid));
+                    if (param == NULL) {
+                        GOSTerr(GOST_F_GOST_IMIT_CTRL,
+                                GOST_R_INVALID_MAC_PARAMS);
+                        return 0;
+                    }
+                    gost_init(&(gost_imit_ctx->cctx), param->sblock);
+                }
+                gost_key(&(gost_imit_ctx->cctx), key->key);
                 gost_imit_ctx->key_set = 1;
 
-                                                               return 1;
+                return 1;
+            } else if (arg == 32) {
+                gost_key(&(gost_imit_ctx->cctx), ptr);
+                gost_imit_ctx->key_set = 1;
+                return 1;
             }
-                                               else if (arg == 32)
-                                               {
-            gost_key(&(gost_imit_ctx->cctx), ptr);
-            gost_imit_ctx->key_set = 1;
-            return 1;
-                                               }
             GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE);
             return 0;
         }
@@ -806,7 +799,7 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
                 GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_SIZE);
                 return 0;
             }
-            c->dgst_size=arg;
+            c->dgst_size = arg;
             return 1;
         }