1 files changed, 19 insertions, 14 deletions

diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
index 294cc90d87..eff82e8c0b 100644
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ b/src/lib/libcrypto/evp/p5_crpt.c
@@ -10,7 +10,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
@@ -65,13 +65,14 @@
 /* Doesn't do anything now: Builtin PBE algorithms in static table.
  */
 
-void PKCS5_PBE_add(void)
+void
+PKCS5_PBE_add(void)
 {
 }
 
-int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
-                         ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md,
-                         int en_de)
+int
+PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
+    ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de)
 {
         EVP_MD_CTX ctx;
         unsigned char md_tmp[EVP_MAX_MD_SIZE];
@@ -88,23 +89,27 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
         /* Extract useful info from parameter */
         if (param == NULL || param->type != V_ASN1_SEQUENCE ||
             param->value.sequence == NULL) {
-                EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
+                EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);
                 return 0;
         }
 
         pbuf = param->value.sequence->data;
         if (!(pbe = d2i_PBEPARAM(NULL, &pbuf, param->value.sequence->length))) {
-                EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
+                EVPerr(EVP_F_PKCS5_PBE_KEYIVGEN, EVP_R_DECODE_ERROR);
                 return 0;
         }
 
-        if (!pbe->iter) iter = 1;
-        else iter = ASN1_INTEGER_get (pbe->iter);
+        if (!pbe->iter)
+                iter = 1;
+        else
+                iter = ASN1_INTEGER_get (pbe->iter);
         salt = pbe->salt->data;
         saltlen = pbe->salt->length;
 
-        if(!pass) passlen = 0;
-        else if(passlen == -1) passlen = strlen(pass);
+        if (!pass)
+                passlen = 0;
+        else if (passlen == -1)
+                passlen = strlen(pass);
 
         if (!EVP_DigestInit_ex(&ctx, md, NULL))
                 goto err;
@@ -117,7 +122,7 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
                 goto err;
         mdsize = EVP_MD_size(md);
         if (mdsize < 0)
-            return 0;
+                return 0;
         for (i = 1; i < iter; i++) {
                 if (!EVP_DigestInit_ex(&ctx, md, NULL))
                         goto err;
@@ -130,14 +135,14 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
         memcpy(key, md_tmp, EVP_CIPHER_key_length(cipher));
         OPENSSL_assert(EVP_CIPHER_iv_length(cipher) <= 16);
         memcpy(iv, md_tmp + (16 - EVP_CIPHER_iv_length(cipher)),
-                                                 EVP_CIPHER_iv_length(cipher));
+            EVP_CIPHER_iv_length(cipher));
         if (!EVP_CipherInit_ex(cctx, cipher, NULL, key, iv, en_de))
                 goto err;
         OPENSSL_cleanse(md_tmp, EVP_MAX_MD_SIZE);
         OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
         OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
         rv = 1;
-        err:
+err:
         EVP_MD_CTX_cleanup(&ctx);
         return rv;
 }