1 files changed, 37 insertions, 17 deletions

diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 8b863d0558..45973fe850 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -123,7 +123,7 @@ int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
                 {
         case NID_pkcs7_signed:
                 if (p7->d.sign->contents != NULL)
-                        PKCS7_content_free(p7->d.sign->contents);
+                        PKCS7_free(p7->d.sign->contents);
                 p7->d.sign->contents=p7_data;
                 break;
         case NID_pkcs7_digest:
@@ -157,7 +157,7 @@ int PKCS7_set_type(PKCS7 *p7, int type)
                 break;
         case NID_pkcs7_data:
                 p7->type=obj;
-                if ((p7->d.data=ASN1_OCTET_STRING_new()) == NULL)
+                if ((p7->d.data=M_ASN1_OCTET_STRING_new()) == NULL)
                         goto err;
                 break;
         case NID_pkcs7_signedAndEnveloped:
@@ -165,9 +165,6 @@ int PKCS7_set_type(PKCS7 *p7, int type)
                 if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
                         == NULL) goto err;
                 ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1);
-/*              p7->d.signed_and_enveloped->enc_data->content_type=
-                        OBJ_nid2obj(NID_pkcs7_encrypted);*/
-                        
                 break;
         case NID_pkcs7_enveloped:
                 p7->type=obj;
@@ -175,8 +172,14 @@ int PKCS7_set_type(PKCS7 *p7, int type)
                         == NULL) goto err;
                 ASN1_INTEGER_set(p7->d.enveloped->version,0);
                 break;
-        case NID_pkcs7_digest:
         case NID_pkcs7_encrypted:
+                p7->type=obj;
+                if ((p7->d.encrypted=PKCS7_ENCRYPT_new())
+                        == NULL) goto err;
+                ASN1_INTEGER_set(p7->d.encrypted->version,0);
+                break;
+
+        case NID_pkcs7_digest:
         default:
                 PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
                 goto err;
@@ -224,8 +227,13 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
                 }
         if (!j) /* we need to add another algorithm */
                 {
-                alg=X509_ALGOR_new();
+                if(!(alg=X509_ALGOR_new())
+                        || !(alg->parameter = ASN1_TYPE_new())) {
+                        PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,ERR_R_MALLOC_FAILURE);
+                        return(0);
+                }
                 alg->algorithm=OBJ_nid2obj(nid);
+                alg->parameter->type = V_ASN1_NULL;
                 sk_X509_ALGOR_push(md_sk,alg);
                 }
 
@@ -289,6 +297,9 @@ int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
              EVP_MD *dgst)
         {
+        char is_dsa;
+        if (pkey->type == EVP_PKEY_DSA) is_dsa = 1;
+        else is_dsa = 0;
         /* We now need to add another PKCS7_SIGNER_INFO entry */
         ASN1_INTEGER_set(p7i->version,1);
         X509_NAME_set(&p7i->issuer_and_serial->issuer,
@@ -296,17 +307,16 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
 
         /* because ASN1_INTEGER_set is used to set a 'long' we will do
          * things the ugly way. */
-        ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
+        M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
         p7i->issuer_and_serial->serial=
-                ASN1_INTEGER_dup(X509_get_serialNumber(x509));
+                M_ASN1_INTEGER_dup(X509_get_serialNumber(x509));
 
         /* lets keep the pkey around for a while */
         CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
         p7i->pkey=pkey;
 
         /* Set the algorithms */
-        if (pkey->type == EVP_PKEY_DSA)
-                p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
+        if (is_dsa) p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
         else    
                 p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
 
@@ -320,9 +330,12 @@ int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
 
         if (p7i->digest_enc_alg->parameter != NULL)
                 ASN1_TYPE_free(p7i->digest_enc_alg->parameter);
-        if ((p7i->digest_enc_alg->parameter=ASN1_TYPE_new()) == NULL)
-                goto err;
-        p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
+        if(is_dsa) p7i->digest_enc_alg->parameter = NULL;
+        else {
+                if (!(p7i->digest_enc_alg->parameter=ASN1_TYPE_new()))
+                        goto err;
+                p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
+        }
 
         return(1);
 err:
@@ -397,9 +410,9 @@ int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
         X509_NAME_set(&p7i->issuer_and_serial->issuer,
                 X509_get_issuer_name(x509));
 
-        ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
+        M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
         p7i->issuer_and_serial->serial=
-                ASN1_INTEGER_dup(X509_get_serialNumber(x509));
+                M_ASN1_INTEGER_dup(X509_get_serialNumber(x509));
 
         X509_ALGOR_free(p7i->key_enc_algor);
         p7i->key_enc_algor=(X509_ALGOR *)ASN1_dup(i2d_X509_ALGOR,
@@ -425,6 +438,7 @@ X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
 int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
         {
         int i;
+        ASN1_OBJECT *objtmp;
         PKCS7_ENC_CONTENT *ec;
 
         i=OBJ_obj2nid(p7->type);
@@ -441,7 +455,13 @@ int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
                 return(0);
                 }
 
-        /* Setup cipher OID */
+        /* Check cipher OID exists and has data in it*/
+        i = EVP_CIPHER_type(cipher);
+        if(i == NID_undef) {
+                PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
+                return(0);
+        }
+        objtmp = OBJ_nid2obj(i);
 
         ec->cipher = cipher;
         return 1;