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

/* crypto/pkcs7/pk7_lib.c */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the copyright
 *    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 the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */

#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;
	{
	int nid;
	long ret;

	nid=OBJ_obj2nid(p7->type);

	switch (cmd)
		{
	case PKCS7_OP_SET_DETACHED_SIGNATURE:
		if (nid == NID_pkcs7_signed)
			{
			ret=p7->detached=(int)larg;
			}
		else
			{
			PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
			ret=0;
			}
		break;
	case PKCS7_OP_GET_DETACHED_SIGNATURE:
		if (nid == NID_pkcs7_signed)
			{
			ret=p7->detached;
			}
		else
			{
			PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
			ret=0;
			}
			
		break;
	default:
		abort();
		}
	return(ret);
	}

int PKCS7_content_new(p7,type)
PKCS7 *p7;
int type;
	{
	PKCS7 *ret=NULL;

	if ((ret=PKCS7_new()) == NULL) goto err;
	if (!PKCS7_set_type(ret,type)) goto err;
	if (!PKCS7_set_content(p7,ret)) goto err;

	return(1);
err:
	if (ret != NULL) PKCS7_free(ret);
	return(0);
	}

int PKCS7_set_content(p7,p7_data)
PKCS7 *p7;
PKCS7 *p7_data;
	{
	int i;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signed:
		if (p7->d.sign->contents != NULL)
			PKCS7_content_free(p7->d.sign->contents);
		p7->d.sign->contents=p7_data;
		break;
	case NID_pkcs7_digest:
	case NID_pkcs7_data:
	case NID_pkcs7_enveloped:
	case NID_pkcs7_signedAndEnveloped:
	case NID_pkcs7_encrypted:
	default:
		PKCS7err(PKCS7_F_PKCS7_SET_CONTENT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
		goto err;
		}
	return(1);
err:
	return(0);
	}

int PKCS7_set_type(p7,type)
PKCS7 *p7;
int type;
	{
	ASN1_OBJECT *obj;

	PKCS7_content_free(p7);
	obj=OBJ_nid2obj(type); /* will not fail */

	switch (type)
		{
	case NID_pkcs7_signed:
		p7->type=obj;
		if ((p7->d.sign=PKCS7_SIGNED_new()) == NULL)
			goto err;
		ASN1_INTEGER_set(p7->d.sign->version,1);
		break;
	case NID_pkcs7_data:
		p7->type=obj;
		if ((p7->d.data=ASN1_OCTET_STRING_new()) == NULL)
			goto err;
		break;
	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);
		break;
	case NID_pkcs7_digest:
	case NID_pkcs7_enveloped:
	case NID_pkcs7_encrypted:
	default:
		PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
		goto err;
		}
	return(1);
err:
	return(0);
	}

int PKCS7_add_signer(p7,psi)
PKCS7 *p7;
PKCS7_SIGNER_INFO *psi;
	{
	int i,j,nid;
	X509_ALGOR *alg;
	STACK *signer_sk;
	STACK *md_sk;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signed:
		signer_sk=	p7->d.sign->signer_info;
		md_sk=		p7->d.sign->md_algs;
		break;
	case NID_pkcs7_signedAndEnveloped:
		signer_sk=	p7->d.signed_and_enveloped->signer_info;
		md_sk=		p7->d.signed_and_enveloped->md_algs;
		break;
	default:
		PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

	nid=OBJ_obj2nid(psi->digest_alg->algorithm);

	/* If the digest is not currently listed, add it */
	j=0;
	for (i=0; i<sk_num(md_sk); i++)
		{
		alg=(X509_ALGOR *)sk_value(md_sk,i);
		if (OBJ_obj2nid(alg->algorithm) == nid)
			{
			j=1;
			break;
			}
		}
	if (!j) /* we need to add another algorithm */
		{
		alg=X509_ALGOR_new();
		alg->algorithm=OBJ_nid2obj(nid);
		sk_push(md_sk,(char *)alg);
		}

	sk_push(signer_sk,(char *)psi);
	return(1);
	}

int PKCS7_add_certificate(p7,x509)
PKCS7 *p7;
X509 *x509;
	{
	int i;
	STACK **sk;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signed:
		sk= &(p7->d.sign->cert);
		break;
	case NID_pkcs7_signedAndEnveloped:
		sk= &(p7->d.signed_and_enveloped->cert);
		break;
	default:
		PKCS7err(PKCS7_F_PKCS7_ADD_CERTIFICATE,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

	if (*sk == NULL)
		*sk=sk_new_null();
	CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
	sk_push(*sk,(char *)x509);
	return(1);
	}

int PKCS7_add_crl(p7,crl)
PKCS7 *p7;
X509_CRL *crl;
	{
	int i;
	STACK **sk;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signed:
		sk= &(p7->d.sign->crl);
		break;
	case NID_pkcs7_signedAndEnveloped:
		sk= &(p7->d.signed_and_enveloped->crl);
		break;
	default:
		PKCS7err(PKCS7_F_PKCS7_ADD_CRL,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

	if (*sk == NULL)
		*sk=sk_new_null();

	CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
	sk_push(*sk,(char *)crl);
	return(1);
	}

int PKCS7_SIGNER_INFO_set(p7i,x509,pkey,dgst)
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);
	X509_NAME_set(&p7i->issuer_and_serial->issuer,
		X509_get_issuer_name(x509));

	/* 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);
	p7i->issuer_and_serial->serial=
		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 */
	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_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 *si;

	if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;
	if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;
	if (!PKCS7_add_signer(p7,si)) goto err;
	return(si);
err:
	return(NULL);
	}

STACK *PKCS7_get_signer_info(p7)
PKCS7 *p7;
	{
	if (PKCS7_type_is_signed(p7))
		{
		return(p7->d.sign->signer_info);
		}
	else
		return(NULL);
	}

PKCS7_RECIP_INFO *PKCS7_add_recipient(p7,x509)
PKCS7 *p7;
X509 *x509;
	{
	PKCS7_RECIP_INFO *ri;

	if ((ri=PKCS7_RECIP_INFO_new()) == NULL) goto err;
	if (!PKCS7_RECIP_INFO_set(ri,x509)) goto err;
	if (!PKCS7_add_recipient_info(p7,ri)) goto err;
	return(ri);
err:
	return(NULL);
	}

int PKCS7_add_recipient_info(p7,ri)
PKCS7 *p7;
PKCS7_RECIP_INFO *ri;
	{
	int i;
	STACK *sk;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signedAndEnveloped:
		sk=	p7->d.signed_and_enveloped->recipientinfo;
		break;
	default:
		PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

	sk_push(sk,(char *)ri);
	return(1);
	}

int PKCS7_RECIP_INFO_set(p7i,x509)
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);
	p7i->issuer_and_serial->serial=
		ASN1_INTEGER_dup(X509_get_serialNumber(x509));

	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;
	{
	if (PKCS7_type_is_signed(p7))
		return(X509_find_by_issuer_and_serial(p7->d.sign->cert,
			si->issuer_and_serial->issuer,
			si->issuer_and_serial->serial));
	else
		return(NULL);
	}

int PKCS7_set_cipher(p7,cipher)
PKCS7 *p7;
EVP_CIPHER *cipher;
	{
	int i;
	PKCS7_ENC_CONTENT *ec;

	i=OBJ_obj2nid(p7->type);
	switch (i)
		{
	case NID_pkcs7_signedAndEnveloped:
		ec=p7->d.signed_and_enveloped->enc_data;
		break;
	default:
		PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
		return(0);
		}

	ec->algorithm->algorithm=OBJ_nid2obj(EVP_CIPHER_nid(cipher));
	return(ec->algorithm->algorithm != NULL);
	}
Commit	Line	Data
d02b48c6	1	/* crypto/pkcs7/pk7_lib.c */
58964a49	2	/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
d02b48c6 RE	3	* All rights reserved.
	4	*
	5	* This package is an SSL implementation written
	6	* by Eric Young (eay@cryptsoft.com).
	7	* The implementation was written so as to conform with Netscapes SSL.
	8	*
	9	* This library is free for commercial and non-commercial use as long as
	10	* the following conditions are aheared to. The following conditions
	11	* apply to all code found in this distribution, be it the RC4, RSA,
	12	* lhash, DES, etc., code; not just the SSL code. The SSL documentation
	13	* included with this distribution is covered by the same copyright terms
	14	* except that the holder is Tim Hudson (tjh@cryptsoft.com).
	15	*
	16	* Copyright remains Eric Young's, and as such any Copyright notices in
	17	* the code are not to be removed.
	18	* If this package is used in a product, Eric Young should be given attribution
	19	* as the author of the parts of the library used.
	20	* This can be in the form of a textual message at program startup or
	21	* in documentation (online or textual) provided with the package.
	22	*
	23	* Redistribution and use in source and binary forms, with or without
	24	* modification, are permitted provided that the following conditions
	25	* are met:
	26	* 1. Redistributions of source code must retain the copyright
	27	* notice, this list of conditions and the following disclaimer.
	28	* 2. Redistributions in binary form must reproduce the above copyright
	29	* notice, this list of conditions and the following disclaimer in the
	30	* documentation and/or other materials provided with the distribution.
	31	* 3. All advertising materials mentioning features or use of this software
	32	* must display the following acknowledgement:
	33	* "This product includes cryptographic software written by
	34	* Eric Young (eay@cryptsoft.com)"
	35	* The word 'cryptographic' can be left out if the rouines from the library
	36	* being used are not cryptographic related :-).
	37	* 4. If you include any Windows specific code (or a derivative thereof) from
	38	* the apps directory (application code) you must include an acknowledgement:
	39	* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
	40	*
	41	* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
	42	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	43	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	44	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
	45	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	46	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	47	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	48	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	49	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	50	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	51	* SUCH DAMAGE.
	52	*
	53	* The licence and distribution terms for any publically available version or
	54	* derivative of this code cannot be changed. i.e. this code cannot simply be
	55	* copied and put under another distribution licence
	56	* [including the GNU Public Licence.]
	57	*/
	58
	59	#include <stdio.h>
	60	#include "cryptlib.h"
	61	#include "objects.h"
	62	#include "x509.h"
	63
	64	long PKCS7_ctrl(p7,cmd,larg,parg)
	65	PKCS7 *p7;
	66	int cmd;
67	long larg;
68	char *parg;
69	{
70	int nid;
71	long ret;
72
73	nid=OBJ_obj2nid(p7->type);
74
75	switch (cmd)
76	{
77	case PKCS7_OP_SET_DETACHED_SIGNATURE:
78	if (nid == NID_pkcs7_signed)
79	{
80	ret=p7->detached=(int)larg;
81	}
82	else
83	{
84	PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
85	ret=0;
86	}
87	break;
88	case PKCS7_OP_GET_DETACHED_SIGNATURE:
89	if (nid == NID_pkcs7_signed)
90	{
91	ret=p7->detached;
92	}
93	else
94	{
95	PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
96	ret=0;
97	}
98
99	break;
100	default:
101	abort();
102	}
103	return(ret);
104	}
105
106	int PKCS7_content_new(p7,type)
107	PKCS7 *p7;
108	int type;
109	{
110	PKCS7 *ret=NULL;
111
112	if ((ret=PKCS7_new()) == NULL) goto err;
113	if (!PKCS7_set_type(ret,type)) goto err;
114	if (!PKCS7_set_content(p7,ret)) goto err;
115
116	return(1);
117	err:
118	if (ret != NULL) PKCS7_free(ret);
119	return(0);
120	}
121
122	int PKCS7_set_content(p7,p7_data)
123	PKCS7 *p7;
124	PKCS7 *p7_data;
125	{
126	int i;
127
128	i=OBJ_obj2nid(p7->type);
129	switch (i)
130	{
131	case NID_pkcs7_signed:
132	if (p7->d.sign->contents != NULL)
133	PKCS7_content_free(p7->d.sign->contents);
134	p7->d.sign->contents=p7_data;
135	break;
136	case NID_pkcs7_digest:
137	case NID_pkcs7_data:
138	case NID_pkcs7_enveloped:
139	case NID_pkcs7_signedAndEnveloped:
140	case NID_pkcs7_encrypted:
141	default:
142	PKCS7err(PKCS7_F_PKCS7_SET_CONTENT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
143	goto err;
144	}
145	return(1);
146	err:
147	return(0);
148	}
149
150	int PKCS7_set_type(p7,type)
151	PKCS7 *p7;
152	int type;
153	{
154	ASN1_OBJECT *obj;
155
156	PKCS7_content_free(p7);
157	obj=OBJ_nid2obj(type); /* will not fail */
158
159	switch (type)
160	{
161	case NID_pkcs7_signed:
162	p7->type=obj;
163	if ((p7->d.sign=PKCS7_SIGNED_new()) == NULL)
164	goto err;
165	ASN1_INTEGER_set(p7->d.sign->version,1);
166	break;
167	case NID_pkcs7_data:
168	p7->type=obj;
169	if ((p7->d.data=ASN1_OCTET_STRING_new()) == NULL)
170	goto err;
171	break;
58964a49 RE	172	case NID_pkcs7_signedAndEnveloped:
	173	p7->type=obj;
	174	if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
	175	== NULL)
	176	goto err;
	177	ASN1_INTEGER_set(p7->d.sign->version,1);
	178	break;
d02b48c6 RE	179	case NID_pkcs7_digest:
d02b48c6 RE	180	case NID_pkcs7_enveloped:
d02b48c6 RE	181	case NID_pkcs7_encrypted:
	182	default:
	183	PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
	184	goto err;
	185	}
	186	return(1);
	187	err:
	188	return(0);
	189	}
	190
	191	int PKCS7_add_signer(p7,psi)
	192	PKCS7 *p7;
	193	PKCS7_SIGNER_INFO *psi;
	194	{
	195	int i,j,nid;
	196	X509_ALGOR *alg;
58964a49 RE	197	STACK *signer_sk;
58964a49 RE	198	STACK *md_sk;
d02b48c6 RE	199
d02b48c6 RE	200	i=OBJ_obj2nid(p7->type);
58964a49	201	switch (i)
d02b48c6	202	{
58964a49 RE	203	case NID_pkcs7_signed:
	204	signer_sk= p7->d.sign->signer_info;
	205	md_sk= p7->d.sign->md_algs;
	206	break;
	207	case NID_pkcs7_signedAndEnveloped:
	208	signer_sk= p7->d.signed_and_enveloped->signer_info;
	209	md_sk= p7->d.signed_and_enveloped->md_algs;
	210	break;
	211	default:
d02b48c6 RE	212	PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,PKCS7_R_WRONG_CONTENT_TYPE);
	213	return(0);
	214	}
	215
d02b48c6 RE	216	nid=OBJ_obj2nid(psi->digest_alg->algorithm);
	217
	218	/* If the digest is not currently listed, add it */
	219	j=0;
58964a49	220	for (i=0; i<sk_num(md_sk); i++)
d02b48c6	221	{
58964a49	222	alg=(X509_ALGOR *)sk_value(md_sk,i);
d02b48c6 RE	223	if (OBJ_obj2nid(alg->algorithm) == nid)
	224	{
	225	j=1;
	226	break;
	227	}
	228	}
	229	if (!j) /* we need to add another algorithm */
	230	{
	231	alg=X509_ALGOR_new();
	232	alg->algorithm=OBJ_nid2obj(nid);
58964a49	233	sk_push(md_sk,(char *)alg);
d02b48c6 RE	234	}
d02b48c6 RE	235
58964a49	236	sk_push(signer_sk,(char *)psi);
d02b48c6 RE	237	return(1);
	238	}
	239
	240	int PKCS7_add_certificate(p7,x509)
	241	PKCS7 *p7;
	242	X509 *x509;
	243	{
	244	int i;
58964a49	245	STACK **sk;
d02b48c6 RE	246
d02b48c6 RE	247	i=OBJ_obj2nid(p7->type);
58964a49	248	switch (i)
d02b48c6	249	{
58964a49 RE	250	case NID_pkcs7_signed:
	251	sk= &(p7->d.sign->cert);
	252	break;
	253	case NID_pkcs7_signedAndEnveloped:
	254	sk= &(p7->d.signed_and_enveloped->cert);
	255	break;
	256	default:
	257	PKCS7err(PKCS7_F_PKCS7_ADD_CERTIFICATE,PKCS7_R_WRONG_CONTENT_TYPE);
d02b48c6 RE	258	return(0);
	259	}
	260
58964a49 RE	261	if (*sk == NULL)
58964a49 RE	262	*sk=sk_new_null();
d02b48c6	263	CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
58964a49	264	sk_push(sk,(char )x509);
d02b48c6 RE	265	return(1);
	266	}
	267
	268	int PKCS7_add_crl(p7,crl)
	269	PKCS7 *p7;
	270	X509_CRL *crl;
	271	{
	272	int i;
58964a49 RE	273	STACK **sk;
58964a49 RE	274
d02b48c6	275	i=OBJ_obj2nid(p7->type);
58964a49	276	switch (i)
d02b48c6	277	{
58964a49 RE	278	case NID_pkcs7_signed:
	279	sk= &(p7->d.sign->crl);
	280	break;
	281	case NID_pkcs7_signedAndEnveloped:
	282	sk= &(p7->d.signed_and_enveloped->crl);
	283	break;
	284	default:
	285	PKCS7err(PKCS7_F_PKCS7_ADD_CRL,PKCS7_R_WRONG_CONTENT_TYPE);
d02b48c6 RE	286	return(0);
	287	}
	288
58964a49 RE	289	if (*sk == NULL)
58964a49 RE	290	*sk=sk_new_null();
d02b48c6 RE	291
d02b48c6 RE	292	CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
58964a49	293	sk_push(sk,(char )crl);
d02b48c6 RE	294	return(1);
	295	}
	296
	297	int PKCS7_SIGNER_INFO_set(p7i,x509,pkey,dgst)
	298	PKCS7_SIGNER_INFO *p7i;
	299	X509 *x509;
	300	EVP_PKEY *pkey;
	301	EVP_MD *dgst;
	302	{
	303	/* We now need to add another PKCS7_SIGNER_INFO entry */
	304	ASN1_INTEGER_set(p7i->version,1);
	305	X509_NAME_set(&p7i->issuer_and_serial->issuer,
	306	X509_get_issuer_name(x509));
	307
	308	/* because ASN1_INTEGER_set is used to set a 'long' we will do
	309	* things the ugly way. */
	310	ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
	311	p7i->issuer_and_serial->serial=
	312	ASN1_INTEGER_dup(X509_get_serialNumber(x509));
	313
	314	/* lets keep the pkey around for a while */
	315	CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
	316	p7i->pkey=pkey;
	317
	318	/* Set the algorithms */
	319	p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
	320	p7i->digest_enc_alg->algorithm=OBJ_nid2obj(EVP_MD_pkey_type(dgst));
	321
	322	#if 1
	323	if (p7i->digest_enc_alg->parameter != NULL)
	324	ASN1_TYPE_free(p7i->digest_enc_alg->parameter);
	325	if ((p7i->digest_enc_alg->parameter=ASN1_TYPE_new()) == NULL)
	326	goto err;
	327	p7i->digest_enc_alg->parameter->type=V_ASN1_NULL;
	328	#endif
	329
d02b48c6 RE	330	return(1);
	331	err:
	332	return(0);
	333	}
	334
	335	PKCS7_SIGNER_INFO *PKCS7_add_signature(p7,x509,pkey,dgst)
	336	PKCS7 *p7;
	337	X509 *x509;
	338	EVP_PKEY *pkey;
	339	EVP_MD *dgst;
	340	{
	341	PKCS7_SIGNER_INFO *si;
	342
	343	if ((si=PKCS7_SIGNER_INFO_new()) == NULL) goto err;
	344	if (!PKCS7_SIGNER_INFO_set(si,x509,pkey,dgst)) goto err;
	345	if (!PKCS7_add_signer(p7,si)) goto err;
	346	return(si);
	347	err:
	348	return(NULL);
	349	}
	350
	351	STACK *PKCS7_get_signer_info(p7)
	352	PKCS7 *p7;
	353	{
	354	if (PKCS7_type_is_signed(p7))
	355	{
	356	return(p7->d.sign->signer_info);
	357	}
	358	else
	359	return(NULL);
	360	}
	361
58964a49 RE	362	PKCS7_RECIP_INFO *PKCS7_add_recipient(p7,x509)
	363	PKCS7 *p7;
	364	X509 *x509;
	365	{
	366	PKCS7_RECIP_INFO *ri;
	367
	368	if ((ri=PKCS7_RECIP_INFO_new()) == NULL) goto err;
	369	if (!PKCS7_RECIP_INFO_set(ri,x509)) goto err;
	370	if (!PKCS7_add_recipient_info(p7,ri)) goto err;
	371	return(ri);
	372	err:
	373	return(NULL);
	374	}
	375
	376	int PKCS7_add_recipient_info(p7,ri)
	377	PKCS7 *p7;
	378	PKCS7_RECIP_INFO *ri;
	379	{
	380	int i;
	381	STACK *sk;
	382
	383	i=OBJ_obj2nid(p7->type);
	384	switch (i)
	385	{
	386	case NID_pkcs7_signedAndEnveloped:
	387	sk= p7->d.signed_and_enveloped->recipientinfo;
	388	break;
	389	default:
	390	PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
	391	return(0);
	392	}
	393
	394	sk_push(sk,(char *)ri);
	395	return(1);
	396	}
	397
	398	int PKCS7_RECIP_INFO_set(p7i,x509)
	399	PKCS7_RECIP_INFO *p7i;
	400	X509 *x509;
	401	{
	402	ASN1_INTEGER_set(p7i->version,0);
	403	X509_NAME_set(&p7i->issuer_and_serial->issuer,
	404	X509_get_issuer_name(x509));
	405
	406	ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
	407	p7i->issuer_and_serial->serial=
	408	ASN1_INTEGER_dup(X509_get_serialNumber(x509));
	409
	410	CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
	411	p7i->cert=x509;
	412
	413	return(1);
	414	}
	415
d02b48c6 RE	416	X509 *PKCS7_cert_from_signer_info(p7,si)
	417	PKCS7 *p7;
	418	PKCS7_SIGNER_INFO *si;
	419	{
	420	if (PKCS7_type_is_signed(p7))
	421	return(X509_find_by_issuer_and_serial(p7->d.sign->cert,
	422	si->issuer_and_serial->issuer,
	423	si->issuer_and_serial->serial));
	424	else
	425	return(NULL);
	426	}
	427
58964a49 RE	428	int PKCS7_set_cipher(p7,cipher)
	429	PKCS7 *p7;
	430	EVP_CIPHER *cipher;
	431	{
	432	int i;
	433	PKCS7_ENC_CONTENT *ec;
	434
	435	i=OBJ_obj2nid(p7->type);
	436	switch (i)
	437	{
	438	case NID_pkcs7_signedAndEnveloped:
	439	ec=p7->d.signed_and_enveloped->enc_data;
	440	break;
	441	default:
	442	PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
	443	return(0);
	444	}
	445
	446	ec->algorithm->algorithm=OBJ_nid2obj(EVP_CIPHER_nid(cipher));
	447	return(ec->algorithm->algorithm != NULL);
	448	}
	449