Change #include filenames from <foo.h> to <openssl.h>.

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

diff --git a/crypto/pkcs7/pk7_lib.c b/crypto/pkcs7/pk7_lib.c
index 7d14ad11734ecfc6489a7e25685263ac8da8dad3..e8c279dc93b82801f04778894d3f1b0a64a0b26d 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;
@@ -98,14 +94,13 @@ char *parg;
                        
                break;
        default:
-               abort();
+               PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_UNKNOWN_OPERATION);
+               ret=0;
                }
        return(ret);
        }
 
-int PKCS7_content_new(p7,type)
-PKCS7 *p7;
-int type;
+int PKCS7_content_new(PKCS7 *p7, int type)
        {
        PKCS7 *ret=NULL;
 
@@ -119,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;
 
@@ -147,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;
 
@@ -172,12 +163,19 @@ int type;
        case NID_pkcs7_signedAndEnveloped:
                p7->type=obj;
                if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
-                       == NULL)
-                       goto err;
-               ASN1_INTEGER_set(p7->d.sign->version,1);
+                       == 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_digest:
        case NID_pkcs7_enveloped:
+               p7->type=obj;
+               if ((p7->d.enveloped=PKCS7_ENVELOPE_new())
+                       == NULL) goto err;
+               ASN1_INTEGER_set(p7->d.enveloped->version,0);
+               break;
+       case NID_pkcs7_digest:
        case NID_pkcs7_encrypted:
        default:
                PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
@@ -188,9 +186,7 @@ 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;
@@ -237,12 +233,10 @@ PKCS7_SIGNER_INFO *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)
@@ -259,15 +253,13 @@ 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;
@@ -294,11 +286,8 @@ X509_CRL *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);
@@ -316,7 +305,10 @@ EVP_MD *dgst;
        p7i->pkey=pkey;
 
        /* Set the algorithms */
-       p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
+       if (pkey->type == EVP_PKEY_DSA)
+               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
@@ -332,11 +324,8 @@ 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;
 
@@ -348,20 +337,21 @@ err:
        return(NULL);
        }
 
-STACK *PKCS7_get_signer_info(p7)
-PKCS7 *p7;
+STACK *PKCS7_get_signer_info(PKCS7 *p7)
        {
        if (PKCS7_type_is_signed(p7))
                {
                return(p7->d.sign->signer_info);
                }
+       else if (PKCS7_type_is_signedAndEnveloped(p7))
+               {
+               return(p7->d.signed_and_enveloped->signer_info);
+               }
        else
                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;
 
@@ -373,9 +363,7 @@ 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;
@@ -386,6 +374,9 @@ PKCS7_RECIP_INFO *ri;
        case NID_pkcs7_signedAndEnveloped:
                sk=     p7->d.signed_and_enveloped->recipientinfo;
                break;
+       case NID_pkcs7_enveloped:
+               sk=     p7->d.enveloped->recipientinfo;
+               break;
        default:
                PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
                return(0);
@@ -395,9 +386,7 @@ PKCS7_RECIP_INFO *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,
@@ -407,15 +396,18 @@ X509 *x509;
        p7i->issuer_and_serial->serial=
                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,
+               (char *(*)())d2i_X509_ALGOR,
+               (char *)x509->cert_info->key->algor);
+
        CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
        p7i->cert=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,
@@ -425,9 +417,7 @@ PKCS7_SIGNER_INFO *si;
                return(NULL);
        }
 
-int PKCS7_set_cipher(p7,cipher)
-PKCS7 *p7;
-EVP_CIPHER *cipher;
+int PKCS7_set_cipher(PKCS7 *p7, EVP_CIPHER *cipher)
        {
        int i;
        PKCS7_ENC_CONTENT *ec;
@@ -438,6 +428,9 @@ EVP_CIPHER *cipher;
        case NID_pkcs7_signedAndEnveloped:
                ec=p7->d.signed_and_enveloped->enc_data;
                break;
+       case NID_pkcs7_enveloped:
+               ec=p7->d.enveloped->enc_data;
+               break;
        default:
                PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
                return(0);