1 files changed, 36 insertions, 38 deletions

diff --git a/src/lib/libcrypto/evp/e_camellia.c b/src/lib/libcrypto/evp/e_camellia.c
index 8bb7c320d3..377d121b89 100644
--- a/src/lib/libcrypto/evp/e_camellia.c
+++ b/src/lib/libcrypto/evp/e_camellia.c
@@ -7,7 +7,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
@@ -63,63 +63,61 @@
 #include "evp_locl.h"
 
 static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-        const unsigned char *iv, int enc);
+    const unsigned char *iv, int enc);
 
 /* Camellia subkey Structure */
-typedef struct
-        {
+typedef struct {
         CAMELLIA_KEY ks;
-        } EVP_CAMELLIA_KEY;
+} EVP_CAMELLIA_KEY;
 
 /* Attribute operation for Camellia */
 #define data(ctx)       EVP_C_DATA(EVP_CAMELLIA_KEY,ctx)
 
 IMPLEMENT_BLOCK_CIPHER(camellia_128, ks, Camellia, EVP_CAMELLIA_KEY,
-        NID_camellia_128, 16, 16, 16, 128,
-        0, camellia_init_key, NULL, 
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL)
+    NID_camellia_128, 16, 16, 16, 128,
+    0, camellia_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv,
+    EVP_CIPHER_get_asn1_iv,
+    NULL)
 IMPLEMENT_BLOCK_CIPHER(camellia_192, ks, Camellia, EVP_CAMELLIA_KEY,
-        NID_camellia_192, 16, 24, 16, 128,
-        0, camellia_init_key, NULL, 
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL)
+    NID_camellia_192, 16, 24, 16, 128,
+    0, camellia_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv,
+    EVP_CIPHER_get_asn1_iv,
+    NULL)
 IMPLEMENT_BLOCK_CIPHER(camellia_256, ks, Camellia, EVP_CAMELLIA_KEY,
-        NID_camellia_256, 16, 32, 16, 128,
-        0, camellia_init_key, NULL, 
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL)
+    NID_camellia_256, 16, 32, 16, 128,
+    0, camellia_init_key, NULL,
+    EVP_CIPHER_set_asn1_iv,
+    EVP_CIPHER_get_asn1_iv,
+    NULL)
 
 #define IMPLEMENT_CAMELLIA_CFBR(ksize,cbits)    IMPLEMENT_CFBR(camellia,Camellia,EVP_CAMELLIA_KEY,ks,ksize,cbits,16)
 
-IMPLEMENT_CAMELLIA_CFBR(128,1)
-IMPLEMENT_CAMELLIA_CFBR(192,1)
-IMPLEMENT_CAMELLIA_CFBR(256,1)
+IMPLEMENT_CAMELLIA_CFBR(128, 1)
+IMPLEMENT_CAMELLIA_CFBR(192, 1)
+IMPLEMENT_CAMELLIA_CFBR(256, 1)
 
-IMPLEMENT_CAMELLIA_CFBR(128,8)
-IMPLEMENT_CAMELLIA_CFBR(192,8)
-IMPLEMENT_CAMELLIA_CFBR(256,8)
+IMPLEMENT_CAMELLIA_CFBR(128, 8)
+IMPLEMENT_CAMELLIA_CFBR(192, 8)
+IMPLEMENT_CAMELLIA_CFBR(256, 8)
 
 
-
-/* The subkey for Camellia is generated. */ 
-static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-        const unsigned char *iv, int enc)
-        {
+/* The subkey for Camellia is generated. */
+static int
+camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+    const unsigned char *iv, int enc)
+{
         int ret;
 
-        ret=Camellia_set_key(key, ctx->key_len * 8, ctx->cipher_data);
+        ret = Camellia_set_key(key, ctx->key_len * 8, ctx->cipher_data);
 
-        if(ret < 0)
-                {
-                EVPerr(EVP_F_CAMELLIA_INIT_KEY,EVP_R_CAMELLIA_KEY_SETUP_FAILED);
+        if (ret < 0) {
+                EVPerr(EVP_F_CAMELLIA_INIT_KEY,
+                    EVP_R_CAMELLIA_KEY_SETUP_FAILED);
                 return 0;
-                }
-
-        return 1;
         }
 
+        return 1;
+}
 #endif