1 files changed, 44 insertions, 39 deletions

diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
index 01563a68fd..8917cc4ccf 100644
--- a/src/lib/libcrypto/asn1/p5_pbev2.c
+++ b/src/lib/libcrypto/asn1/p5_pbev2.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
@@ -86,9 +86,9 @@ IMPLEMENT_ASN1_FUNCTIONS(PBKDF2PARAM)
  * Extended version to allow application supplied PRF NID and IV.
  */
 
-X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
-                                 unsigned char *salt, int saltlen,
-                                 unsigned char *aiv, int prf_nid)
+X509_ALGOR *
+PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter, unsigned char *salt,
+    int saltlen, unsigned char *aiv, int prf_nid)
 {
         X509_ALGOR *scheme = NULL, *kalg = NULL, *ret = NULL;
         int alg_nid, keylen;
@@ -98,27 +98,30 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
         ASN1_OBJECT *obj;
 
         alg_nid = EVP_CIPHER_type(cipher);
-        if(alg_nid == NID_undef) {
+        if (alg_nid == NID_undef) {
                 ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,
-                                ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
+                ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
                 goto err;
         }
         obj = OBJ_nid2obj(alg_nid);
 
-        if(!(pbe2 = PBE2PARAM_new())) goto merr;
+        if (!(pbe2 = PBE2PARAM_new()))
+                goto merr;
 
         /* Setup the AlgorithmIdentifier for the encryption scheme */
         scheme = pbe2->encryption;
 
         scheme->algorithm = obj;
-        if(!(scheme->parameter = ASN1_TYPE_new())) goto merr;
+        if (!(scheme->parameter = ASN1_TYPE_new()))
+                goto merr;
 
         /* Create random IV */
         if (EVP_CIPHER_iv_length(cipher)) {
                 if (aiv)
                         memcpy(iv, aiv, EVP_CIPHER_iv_length(cipher));
-                else if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0)
-                        goto err;
+                else if (RAND_pseudo_bytes(iv,
+                    EVP_CIPHER_iv_length(cipher)) < 0)
+                        goto err;
         }
 
         EVP_CIPHER_CTX_init(&ctx);
@@ -126,16 +129,16 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
         /* Dummy cipherinit to just setup the IV, and PRF */
         if (!EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0))
                 goto err;
-        if(EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) {
+        if (EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) {
                 ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,
-                                        ASN1_R_ERROR_SETTING_CIPHER_PARAMS);
+                ASN1_R_ERROR_SETTING_CIPHER_PARAMS);
                 EVP_CIPHER_CTX_cleanup(&ctx);
                 goto err;
         }
         /* If prf NID unspecified see if cipher has a preference.
          * An error is OK here: just means use default PRF.
          */
-        if ((prf_nid == -1) && 
+        if ((prf_nid == -1) &&
             EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_PBE_PRF_NID, 0, &prf_nid) <= 0) {
                 ERR_clear_error();
                 prf_nid = NID_hmacWithSHA1;
@@ -144,7 +147,7 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
 
         /* If its RC2 then we'd better setup the key length */
 
-        if(alg_nid == NID_rc2_cbc)
+        if (alg_nid == NID_rc2_cbc)
                 keylen = EVP_CIPHER_key_length(cipher);
         else
                 keylen = -1;
@@ -160,15 +163,17 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
 
         /* Now set up top level AlgorithmIdentifier */
 
-        if(!(ret = X509_ALGOR_new())) goto merr;
-        if(!(ret->parameter = ASN1_TYPE_new())) goto merr;
+        if (!(ret = X509_ALGOR_new()))
+                goto merr;
+        if (!(ret->parameter = ASN1_TYPE_new()))
+                goto merr;
 
         ret->algorithm = OBJ_nid2obj(NID_pbes2);
 
         /* Encode PBE2PARAM into parameter */
 
-        if(!ASN1_item_pack(pbe2, ASN1_ITEM_rptr(PBE2PARAM),
-                                 &ret->parameter->value.sequence)) goto merr;
+        if (!ASN1_item_pack(pbe2, ASN1_ITEM_rptr(PBE2PARAM),
+                &ret->parameter->value.sequence)) goto merr;
         ret->parameter->type = V_ASN1_SEQUENCE;
 
         PBE2PARAM_free(pbe2);
@@ -177,34 +182,35 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
         return ret;
 
 merr:
-        ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,ERR_R_MALLOC_FAILURE);
+        ASN1err(ASN1_F_PKCS5_PBE2_SET_IV, ERR_R_MALLOC_FAILURE);
 
-        err:
+err:
         PBE2PARAM_free(pbe2);
         /* Note 'scheme' is freed as part of pbe2 */
         X509_ALGOR_free(kalg);
         X509_ALGOR_free(ret);
 
         return NULL;
-
 }
 
-X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                                 unsigned char *salt, int saltlen)
+X509_ALGOR *
+PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, unsigned char *salt,
+    int saltlen)
 {
         return PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, -1);
 }
 
-X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
-                                int prf_nid, int keylen)
+X509_ALGOR *
+PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, int prf_nid,
+    int keylen)
 {
         X509_ALGOR *keyfunc = NULL;
         PBKDF2PARAM *kdf = NULL;
         ASN1_OCTET_STRING *osalt = NULL;
 
-        if(!(kdf = PBKDF2PARAM_new()))
+        if (!(kdf = PBKDF2PARAM_new()))
                 goto merr;
-        if(!(osalt = M_ASN1_OCTET_STRING_new()))
+        if (!(osalt = M_ASN1_OCTET_STRING_new()))
                 goto merr;
 
         kdf->salt->value.octet_string = osalt;
@@ -222,20 +228,20 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
         else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0)
                 goto merr;
 
-        if(iter <= 0)
+        if (iter <= 0)
                 iter = PKCS5_DEFAULT_ITER;
 
-        if(!ASN1_INTEGER_set(kdf->iter, iter))
+        if (!ASN1_INTEGER_set(kdf->iter, iter))
                 goto merr;
 
         /* If have a key len set it up */
 
-        if(keylen > 0) {
-                if(!(kdf->keylength = M_ASN1_INTEGER_new()))
+        if (keylen > 0) {
+                if (!(kdf->keylength = M_ASN1_INTEGER_new()))
                         goto merr;
-                if(!ASN1_INTEGER_set (kdf->keylength, keylen))
+                if (!ASN1_INTEGER_set (kdf->keylength, keylen))
                         goto merr;
-                }
+        }
 
         /* prf can stay NULL if we are using hmacWithSHA1 */
         if (prf_nid > 0 && prf_nid != NID_hmacWithSHA1) {
@@ -243,7 +249,7 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
                 if (!kdf->prf)
                         goto merr;
                 X509_ALGOR_set0(kdf->prf, OBJ_nid2obj(prf_nid),
-                                        V_ASN1_NULL, NULL);
+                V_ASN1_NULL, NULL);
         }
 
         /* Finally setup the keyfunc structure */
@@ -256,11 +262,11 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
 
         /* Encode PBKDF2PARAM into parameter of pbe2 */
 
-        if(!(keyfunc->parameter = ASN1_TYPE_new()))
+        if (!(keyfunc->parameter = ASN1_TYPE_new()))
                 goto merr;
 
-        if(!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),
-                         &keyfunc->parameter->value.sequence))
+        if (!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),
+                &keyfunc->parameter->value.sequence))
                 goto merr;
         keyfunc->parameter->type = V_ASN1_SEQUENCE;
 
@@ -268,9 +274,8 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
         return keyfunc;
 
 merr:
-        ASN1err(ASN1_F_PKCS5_PBKDF2_SET,ERR_R_MALLOC_FAILURE);
+        ASN1err(ASN1_F_PKCS5_PBKDF2_SET, ERR_R_MALLOC_FAILURE);
         PBKDF2PARAM_free(kdf);
         X509_ALGOR_free(keyfunc);
         return NULL;
 }
-