1 files changed, 104 insertions, 127 deletions

diff --git a/src/lib/libcrypto/cms/cms_pwri.c b/src/lib/libcrypto/cms/cms_pwri.c
index 36d50f1797..1399cbd606 100644
--- a/src/lib/libcrypto/cms/cms_pwri.c
+++ b/src/lib/libcrypto/cms/cms_pwri.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
@@ -62,15 +62,16 @@
 #include "cms_lcl.h"
 #include "asn1_locl.h"
 
-int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, 
-                                unsigned char *pass, ssize_t passlen)
-        {
+int
+CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass,
+    ssize_t passlen)
+{
         CMS_PasswordRecipientInfo *pwri;
-        if (ri->type != CMS_RECIPINFO_PASS)
-                {
+
+        if (ri->type != CMS_RECIPINFO_PASS) {
                 CMSerr(CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD, CMS_R_NOT_PWRI);
                 return 0;
-                }
+        }
 
         pwri = ri->d.pwri;
         pwri->pass = pass;
@@ -78,14 +79,13 @@ int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
                 passlen = strlen((char *)pass);
         pwri->passlen = passlen;
         return 1;
-        }
+}
 
-CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
-                                        int iter, int wrap_nid, int pbe_nid,
-                                        unsigned char *pass,
-                                        ssize_t passlen,
-                                        const EVP_CIPHER *kekciph)
-        {
+CMS_RecipientInfo *
+CMS_add0_recipient_password(CMS_ContentInfo *cms, int iter, int wrap_nid,
+    int pbe_nid, unsigned char *pass, ssize_t passlen,
+    const EVP_CIPHER *kekciph)
+{
         CMS_RecipientInfo *ri = NULL;
         CMS_EnvelopedData *env;
         CMS_PasswordRecipientInfo *pwri;
@@ -93,6 +93,7 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
         X509_ALGOR *encalg = NULL;
         unsigned char iv[EVP_MAX_IV_LENGTH];
         int ivlen;
+
         env = cms_get0_enveloped(cms);
         if (!env)
                 goto err;
@@ -107,54 +108,47 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
         if (kekciph == NULL)
                 kekciph = env->encryptedContentInfo->cipher;
 
-        if (kekciph == NULL)
-                {
+        if (kekciph == NULL) {
                 CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD, CMS_R_NO_CIPHER);
                 return NULL;
-                }
-        if (wrap_nid != NID_id_alg_PWRI_KEK)
-                {
+        }
+        if (wrap_nid != NID_id_alg_PWRI_KEK) {
                 CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD,
-                                CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM);
+                    CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM);
                 return NULL;
-                }
+        }
 
         /* Setup algorithm identifier for cipher */
         encalg = X509_ALGOR_new();
         EVP_CIPHER_CTX_init(&ctx);
 
-        if (EVP_EncryptInit_ex(&ctx, kekciph, NULL, NULL, NULL) <= 0)
-                {
+        if (EVP_EncryptInit_ex(&ctx, kekciph, NULL, NULL, NULL) <= 0) {
                 CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD, ERR_R_EVP_LIB);
                 goto err;
-                }
+        }
 
         ivlen = EVP_CIPHER_CTX_iv_length(&ctx);
 
-        if (ivlen > 0)
-                {
+        if (ivlen > 0) {
                 if (RAND_pseudo_bytes(iv, ivlen) <= 0)
                         goto err;
-                if (EVP_EncryptInit_ex(&ctx, NULL, NULL, NULL, iv) <= 0)
-                        {
+                if (EVP_EncryptInit_ex(&ctx, NULL, NULL, NULL, iv) <= 0) {
                         CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD,
-                                                        ERR_R_EVP_LIB);
+                            ERR_R_EVP_LIB);
                         goto err;
-                        }
+                }
                 encalg->parameter = ASN1_TYPE_new();
-                if (!encalg->parameter)
-                        {
+                if (!encalg->parameter) {
                         CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD,
-                                                        ERR_R_MALLOC_FAILURE);
+                            ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-                if (EVP_CIPHER_param_to_asn1(&ctx, encalg->parameter) <= 0)
-                        {
+                }
+                if (EVP_CIPHER_param_to_asn1(&ctx, encalg->parameter) <= 0) {
                         CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD,
-                                CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
+                            CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
                         goto err;
-                        }
                 }
+        }
 
 
         encalg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_type(&ctx));
@@ -182,10 +176,10 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
         if (!pwri->keyEncryptionAlgorithm->parameter)
                 goto merr;
 
-        if(!ASN1_item_pack(encalg, ASN1_ITEM_rptr(X509_ALGOR),
+        if (!ASN1_item_pack(encalg, ASN1_ITEM_rptr(X509_ALGOR),
             &pwri->keyEncryptionAlgorithm->parameter->value.sequence))
                 goto merr;
-        pwri->keyEncryptionAlgorithm->parameter->type = V_ASN1_SEQUENCE;
+        pwri->keyEncryptionAlgorithm->parameter->type = V_ASN1_SEQUENCE;
 
         X509_ALGOR_free(encalg);
         encalg = NULL;
@@ -205,48 +199,47 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
 
         return ri;
 
-        merr:
+merr:
         CMSerr(CMS_F_CMS_ADD0_RECIPIENT_PASSWORD, ERR_R_MALLOC_FAILURE);
-        err:
+err:
         EVP_CIPHER_CTX_cleanup(&ctx);
         if (ri)
                 M_ASN1_free_of(ri, CMS_RecipientInfo);
         if (encalg)
                 X509_ALGOR_free(encalg);
         return NULL;
-
-        }
+}
 
 /* This is an implementation of the key wrapping mechanism in RFC3211,
  * at some point this should go into EVP.
  */
 
-static int kek_unwrap_key(unsigned char *out, size_t *outlen,
-                const unsigned char *in, size_t inlen, EVP_CIPHER_CTX *ctx)
-        {
+static int
+kek_unwrap_key(unsigned char *out, size_t *outlen, const unsigned char *in,
+    size_t inlen, EVP_CIPHER_CTX *ctx)
+{
         size_t blocklen = EVP_CIPHER_CTX_block_size(ctx);
         unsigned char *tmp;
         int outl, rv = 0;
-        if (inlen < 2 * blocklen)
-                {
+
+        if (inlen < 2 * blocklen) {
                 /* too small */
                 return 0;
-                }
-        if (inlen % blocklen)
-                {
+        }
+        if (inlen % blocklen) {
                 /* Invalid size */
                 return 0;
-                }
+        }
         tmp = malloc(inlen);
         /* setup IV by decrypting last two blocks */
         EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl,
-                                in  + inlen - 2 * blocklen, blocklen * 2);
+            in  + inlen - 2 * blocklen, blocklen * 2);
         /* Do a decrypt of last decrypted block to set IV to correct value
          * output it to start of buffer so we don't corrupt decrypted block
          * this works because buffer is at least two block lengths long.
          */
         EVP_DecryptUpdate(ctx, tmp, &outl,
-                                tmp  + inlen - blocklen, blocklen);
+            tmp  + inlen - blocklen, blocklen);
         /* Can now decrypt first n - 1 blocks */
         EVP_DecryptUpdate(ctx, tmp, &outl, in, inlen - blocklen);
 
@@ -255,49 +248,47 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen,
         /* Decrypt again */
         EVP_DecryptUpdate(ctx, tmp, &outl, tmp, inlen);
         /* Check check bytes */
-        if (((tmp[1] ^ tmp[4]) & (tmp[2] ^ tmp[5]) & (tmp[3] ^ tmp[6])) != 0xff)
-                {
+        if (((tmp[1] ^ tmp[4]) & (tmp[2] ^ tmp[5]) &
+            (tmp[3] ^ tmp[6])) != 0xff) {
                 /* Check byte failure */
                 goto err;
-                }
-        if (inlen < (size_t)(tmp[0] - 4 ))
-                {
+        }
+        if (inlen < (size_t)(tmp[0] - 4 )) {
                 /* Invalid length value */
                 goto err;
-                }
+        }
         *outlen = (size_t)tmp[0];
         memcpy(out, tmp + 4, *outlen);
         rv = 1;
-        err:
+
+err:
         OPENSSL_cleanse(tmp, inlen);
         free(tmp);
         return rv;
+}
 
-        }
-
-static int kek_wrap_key(unsigned char *out, size_t *outlen,
-                const unsigned char *in, size_t inlen, EVP_CIPHER_CTX *ctx)
-        {
+static int
+kek_wrap_key(unsigned char *out, size_t *outlen, const unsigned char *in,
+    size_t inlen, EVP_CIPHER_CTX *ctx)
+{
         size_t blocklen = EVP_CIPHER_CTX_block_size(ctx);
         size_t olen;
         int dummy;
+
         /* First decide length of output buffer: need header and round up to
          * multiple of block length.
          */
         olen = (inlen + 4 + blocklen - 1)/blocklen;
         olen *= blocklen;
-        if (olen < 2 * blocklen)
-                {
+        if (olen < 2 * blocklen) {
                 /* Key too small */
                 return 0;
-                }
-        if (inlen > 0xFF)
-                {
+        }
+        if (inlen > 0xFF) {
                 /* Key too large */
                 return 0;
-                }
-        if (out)
-                {
+        }
+        if (out) {
                 /* Set header */
                 out[0] = (unsigned char)inlen;
                 out[1] = in[0] ^ 0xFF;
@@ -310,18 +301,19 @@ static int kek_wrap_key(unsigned char *out, size_t *outlen,
                 /* Encrypt twice */
                 EVP_EncryptUpdate(ctx, out, &dummy, out, olen);
                 EVP_EncryptUpdate(ctx, out, &dummy, out, olen);
-                }
+        }
 
         *outlen = olen;
 
         return 1;
-        }
+}
 
 /* Encrypt/Decrypt content key in PWRI recipient info */
 
-int cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri,
-                                                        int en_de)
-        {
+int
+cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri,
+    int en_de)
+{
         CMS_EncryptedContentInfo *ec;
         CMS_PasswordRecipientInfo *pwri;
         const unsigned char *p = NULL;
@@ -338,69 +330,61 @@ int cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri,
         pwri = ri->d.pwri;
         EVP_CIPHER_CTX_init(&kekctx);
 
-        if (!pwri->pass)
-                {
+        if (!pwri->pass) {
                 CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT, CMS_R_NO_PASSWORD);
                 return 0;
-                }
+        }
         algtmp = pwri->keyEncryptionAlgorithm;
 
-        if (!algtmp || OBJ_obj2nid(algtmp->algorithm) != NID_id_alg_PWRI_KEK)
-                {
+        if (!algtmp || OBJ_obj2nid(algtmp->algorithm) != NID_id_alg_PWRI_KEK) {
                 CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,
-                                CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM);
+                    CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM);
                 return 0;
-                }
+        }
 
-        if (algtmp->parameter->type == V_ASN1_SEQUENCE)
-                {
+        if (algtmp->parameter->type == V_ASN1_SEQUENCE) {
                 p = algtmp->parameter->value.sequence->data;
                 plen = algtmp->parameter->value.sequence->length;
                 kekalg = d2i_X509_ALGOR(NULL, &p, plen);
-                }
-        if (kekalg == NULL)
-                {
+        }
+        if (kekalg == NULL) {
                 CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,
-                                CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER);
+                    CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER);
                 return 0;
-                }
+        }
 
         kekcipher = EVP_get_cipherbyobj(kekalg->algorithm);
-                
-        if(!kekcipher)
-                {
+
+        if (!kekcipher) {
                 CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,
-                                CMS_R_UNKNOWN_CIPHER);
+                    CMS_R_UNKNOWN_CIPHER);
                 goto err;
-                }
+        }
 
         /* Fixup cipher based on AlgorithmIdentifier to set IV etc */
         if (!EVP_CipherInit_ex(&kekctx, kekcipher, NULL, NULL, NULL, en_de))
                 goto err;
         EVP_CIPHER_CTX_set_padding(&kekctx, 0);
-        if(EVP_CIPHER_asn1_to_param(&kekctx, kekalg->parameter) < 0)
-                {
+        if (EVP_CIPHER_asn1_to_param(&kekctx, kekalg->parameter) < 0) {
                 CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,
-                                CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
+                    CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
                 goto err;
-                }
+        }
 
         algtmp = pwri->keyDerivationAlgorithm;
 
         /* Finish password based key derivation to setup key in "ctx" */
 
         if (EVP_PBE_CipherInit(algtmp->algorithm,
-                                (char *)pwri->pass, pwri->passlen,
-                                algtmp->parameter, &kekctx, en_de) < 0)
-                {
+            (char *)pwri->pass, pwri->passlen,
+            algtmp->parameter, &kekctx, en_de) < 0) {
                 CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT, ERR_R_EVP_LIB);
                 goto err;
-                }
+        }
 
         /* Finally wrap/unwrap the key */
 
-        if (en_de)
-                {
+        if (en_de) {
 
                 if (!kek_wrap_key(NULL, &keylen, ec->key, ec->keylen, &kekctx))
                         goto err;
@@ -414,41 +398,34 @@ int cms_RecipientInfo_pwri_crypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri,
                         goto err;
                 pwri->encryptedKey->data = key;
                 pwri->encryptedKey->length = keylen;
-                }
-        else
-                {
+        } else {
                 key = malloc(pwri->encryptedKey->length);
 
-                if (!key)
-                        {
+                if (!key) {
                         CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,
-                                                        ERR_R_MALLOC_FAILURE);
+                            ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
                 if (!kek_unwrap_key(key, &keylen,
-                                        pwri->encryptedKey->data,
-                                        pwri->encryptedKey->length, &kekctx))
-                        {
+                    pwri->encryptedKey->data,
+                    pwri->encryptedKey->length, &kekctx)) {
                         CMSerr(CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT,
-                                                        CMS_R_UNWRAP_FAILURE);
+                            CMS_R_UNWRAP_FAILURE);
                         goto err;
-                        }
+                }
 
                 ec->key = key;
                 ec->keylen = keylen;
 
-                }
+        }
 
         r = 1;
 
-        err:
-
+err:
         EVP_CIPHER_CTX_cleanup(&kekctx);
-
         if (!r && key)
                 free(key);
         X509_ALGOR_free(kekalg);
 
         return r;
-
-        }
+}