Fix PKCS7_ENC_CONTENT_new() to include a sensible default content type and add

[openssl.git] / crypto / pkcs7 / pk7_lib.c

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index e121ebf003f77471b13303608aec15ead5fb90dc..22cbb174f8236b19a1fa68f7929318fa58106da7 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -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;
@@ -190,7 +193,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
        {
        int i,j,nid;
        X509_ALGOR *alg;
-       STACK *signer_sk;
+       STACK_OF(PKCS7_SIGNER_INFO) *signer_sk;
        STACK_OF(X509_ALGOR) *md_sk;
 
        i=OBJ_obj2nid(p7->type);
@@ -229,7 +232,7 @@ int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
                sk_X509_ALGOR_push(md_sk,alg);
                }
 
-       sk_push(signer_sk,(char *)psi);
+       sk_PKCS7_SIGNER_INFO_push(signer_sk,psi);
        return(1);
        }
 
@@ -262,7 +265,7 @@ int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
 int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
        {
        int i;
-       STACK **sk;
+       STACK_OF(X509_CRL) **sk;
 
        i=OBJ_obj2nid(p7->type);
        switch (i)
@@ -279,10 +282,10 @@ int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
                }
 
        if (*sk == NULL)
-               *sk=sk_new_null();
+               *sk=sk_X509_CRL_new_null();
 
        CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
-       sk_push(*sk,(char *)crl);
+       sk_X509_CRL_push(*sk,crl);
        return(1);
        }
 
@@ -342,7 +345,7 @@ err:
        return(NULL);
        }
 
-STACK *PKCS7_get_signer_info(PKCS7 *p7)
+STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
        {
        if (PKCS7_type_is_signed(p7))
                {
@@ -371,7 +374,7 @@ err:
 int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
        {
        int i;
-       STACK *sk;
+       STACK_OF(PKCS7_RECIP_INFO) *sk;
 
        i=OBJ_obj2nid(p7->type);
        switch (i)
@@ -387,7 +390,7 @@ int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
                return(0);
                }
 
-       sk_push(sk,(char *)ri);
+       sk_PKCS7_RECIP_INFO_push(sk,ri);
        return(1);
        }