projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix for crashing INTEGERs, ENUMERATEDs and OBJECT IDENTIFIERs.
[openssl.git] / crypto / pkcs7 / pk7_lib.c
diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 7534f4c2a52787b73cee9fd45f6aa31614130181..388a1d78b3f5bf34e3ceb8deeac58d74c4235716 100644 (file)
--- a/crypto/pkcs7/pk7_lib.c
+++ b/crypto/pkcs7/pk7_lib.c
@@ -58,14 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "objects.h"
-#include "x509.h"
-
-long PKCS7_ctrl(p7,cmd,larg,parg)
-PKCS7 *p7;
-int cmd;
-long larg;
-char *parg;
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+
+long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
        {
        int nid;
        long ret;
@@ -104,9 +100,7 @@ char *parg;
        return(ret);
        }
 
-int PKCS7_content_new(p7,type)
-PKCS7 *p7;
-int type;
+int PKCS7_content_new(PKCS7 *p7, int type)
        {
        PKCS7 *ret=NULL;
 
@@ -120,9 +114,7 @@ err:
        return(0);
        }
 
-int PKCS7_set_content(p7,p7_data)
-PKCS7 *p7;
-PKCS7 *p7_data;
+int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
        {
        int i;
 
@@ -131,7 +123,7 @@ 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:
@@ -148,9 +140,7 @@ err:
        return(0);
        }
 
-int PKCS7_set_type(p7,type)
-PKCS7 *p7;
-int type;
+int PKCS7_set_type(PKCS7 *p7, int type)
        {
        ASN1_OBJECT *obj;
 
@@ -167,7 +157,7 @@ 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:
@@ -175,9 +165,6 @@ 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;
@@ -185,8 +172,14 @@ 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;
@@ -196,14 +189,12 @@ err:
        return(0);
        }
 
-int PKCS7_add_signer(p7,psi)
-PKCS7 *p7;
-PKCS7_SIGNER_INFO *psi;
+int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
        {
        int i,j,nid;
        X509_ALGOR *alg;
-       STACK *signer_sk;
-       STACK *md_sk;
+       STACK_OF(PKCS7_SIGNER_INFO) *signer_sk;
+       STACK_OF(X509_ALGOR) *md_sk;
 
        i=OBJ_obj2nid(p7->type);
        switch (i)
@@ -225,9 +216,9 @@ PKCS7_SIGNER_INFO *psi;
 
        /* If the digest is not currently listed, add it */
        j=0;
-       for (i=0; i<sk_num(md_sk); i++)
+       for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
                {
-               alg=(X509_ALGOR *)sk_value(md_sk,i);
+               alg=sk_X509_ALGOR_value(md_sk,i);
                if (OBJ_obj2nid(alg->algorithm) == nid)
                        {
                        j=1;
@@ -238,19 +229,17 @@ PKCS7_SIGNER_INFO *psi;
                {
                alg=X509_ALGOR_new();
                alg->algorithm=OBJ_nid2obj(nid);
-               sk_push(md_sk,(char *)alg);
+               sk_X509_ALGOR_push(md_sk,alg);
                }
 
-       sk_push(signer_sk,(char *)psi);
+       sk_PKCS7_SIGNER_INFO_push(signer_sk,psi);
        return(1);
        }
 
-int PKCS7_add_certificate(p7,x509)
-PKCS7 *p7;
-X509 *x509;
+int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
        {
        int i;
-       STACK **sk;
+       STACK_OF(X509) **sk;
 
        i=OBJ_obj2nid(p7->type);
        switch (i)
@@ -267,18 +256,16 @@ X509 *x509;
                }
 
        if (*sk == NULL)
-               *sk=sk_new_null();
+               *sk=sk_X509_new_null();
        CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
-       sk_push(*sk,(char *)x509);
+       sk_X509_push(*sk,x509);
        return(1);
        }
 
-int PKCS7_add_crl(p7,crl)
-PKCS7 *p7;
-X509_CRL *crl;
+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)
@@ -295,18 +282,15 @@ 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);
        }
 
-int PKCS7_SIGNER_INFO_set(p7i,x509,pkey,dgst)
-PKCS7_SIGNER_INFO *p7i;
-X509 *x509;
-EVP_PKEY *pkey;
-EVP_MD *dgst;
+int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
+            EVP_MD *dgst)
        {
        /* We now need to add another PKCS7_SIGNER_INFO entry */
        ASN1_INTEGER_set(p7i->version,1);
@@ -315,9 +299,9 @@ EVP_MD *dgst;
 
        /* 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);
@@ -328,26 +312,28 @@ EVP_MD *dgst;
                p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
        else    
                p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
-       p7i->digest_enc_alg->algorithm=OBJ_nid2obj(EVP_MD_pkey_type(dgst));
 
-#if 1
+       if (p7i->digest_alg->parameter != NULL)
+               ASN1_TYPE_free(p7i->digest_alg->parameter);
+       if ((p7i->digest_alg->parameter=ASN1_TYPE_new()) == NULL)
+               goto err;
+       p7i->digest_alg->parameter->type=V_ASN1_NULL;
+
+       p7i->digest_enc_alg->algorithm=OBJ_nid2obj(EVP_PKEY_type(pkey->type));
+
        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;
-#endif
 
        return(1);
 err:
        return(0);
        }
 
-PKCS7_SIGNER_INFO *PKCS7_add_signature(p7,x509,pkey,dgst)
-PKCS7 *p7;
-X509 *x509;
-EVP_PKEY *pkey;
-EVP_MD *dgst;
+PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
+            EVP_MD *dgst)
        {
        PKCS7_SIGNER_INFO *si;
 
@@ -359,8 +345,7 @@ err:
        return(NULL);
        }
 
-STACK *PKCS7_get_signer_info(p7)
-PKCS7 *p7;
+STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
        {
        if (PKCS7_type_is_signed(p7))
                {
@@ -374,9 +359,7 @@ PKCS7 *p7;
                return(NULL);
        }
 
-PKCS7_RECIP_INFO *PKCS7_add_recipient(p7,x509)
-PKCS7 *p7;
-X509 *x509;
+PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
        {
        PKCS7_RECIP_INFO *ri;
 
@@ -388,12 +371,10 @@ err:
        return(NULL);
        }
 
-int PKCS7_add_recipient_info(p7,ri)
-PKCS7 *p7;
-PKCS7_RECIP_INFO *ri;
+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)
@@ -409,21 +390,19 @@ PKCS7_RECIP_INFO *ri;
                return(0);
                }
 
-       sk_push(sk,(char *)ri);
+       sk_PKCS7_RECIP_INFO_push(sk,ri);
        return(1);
        }
 
-int PKCS7_RECIP_INFO_set(p7i,x509)
-PKCS7_RECIP_INFO *p7i;
-X509 *x509;
+int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
        {
        ASN1_INTEGER_set(p7i->version,0);
        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,
@@ -436,9 +415,7 @@ X509 *x509;
        return(1);
        }
 
-X509 *PKCS7_cert_from_signer_info(p7,si)
-PKCS7 *p7;
-PKCS7_SIGNER_INFO *si;
+X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
        {
        if (PKCS7_type_is_signed(p7))
                return(X509_find_by_issuer_and_serial(p7->d.sign->cert,
@@ -448,9 +425,7 @@ PKCS7_SIGNER_INFO *si;
                return(NULL);
        }
 
-int PKCS7_set_cipher(p7,cipher)
-PKCS7 *p7;
-EVP_CIPHER *cipher;
+int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
        {
        int i;
        PKCS7_ENC_CONTENT *ec;
@@ -469,7 +444,9 @@ EVP_CIPHER *cipher;
                return(0);
                }
 
-       ec->algorithm->algorithm=OBJ_nid2obj(EVP_CIPHER_nid(cipher));
-       return(ec->algorithm->algorithm != NULL);
+       /* Setup cipher OID */
+
+       ec->cipher = cipher;
+       return 1;
        }
 
Unnamed repository; edit this file 'description' to name the repository.