1998-12-21 10:52:47 +00:00
|
|
|
/* crypto/pkcs7/pk7_lib.c */
|
1998-12-21 10:56:39 +00:00
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
1998-12-21 10:52:47 +00:00
|
|
|
* 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"
|
1999-04-23 22:13:45 +00:00
|
|
|
#include <openssl/objects.h>
|
|
|
|
#include <openssl/x509.h>
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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;
|
2002-09-08 16:25:55 +00:00
|
|
|
if (ret && PKCS7_type_is_data(p7->d.sign->contents))
|
2002-09-07 22:59:34 +00:00
|
|
|
{
|
|
|
|
ASN1_OCTET_STRING *os;
|
|
|
|
os=p7->d.sign->contents->d.data;
|
|
|
|
ASN1_OCTET_STRING_free(os);
|
|
|
|
p7->d.sign->contents->d.data = NULL;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
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)
|
|
|
|
{
|
2000-12-08 19:09:35 +00:00
|
|
|
if(!p7->d.sign || !p7->d.sign->contents->d.ptr)
|
|
|
|
ret = 1;
|
|
|
|
else ret = 0;
|
|
|
|
|
|
|
|
p7->detached = ret;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE);
|
|
|
|
ret=0;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
default:
|
1998-12-21 11:00:56 +00:00
|
|
|
PKCS7err(PKCS7_F_PKCS7_CTRL,PKCS7_R_UNKNOWN_OPERATION);
|
|
|
|
ret=0;
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_content_new(PKCS7 *p7, int type)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
i=OBJ_obj2nid(p7->type);
|
|
|
|
switch (i)
|
|
|
|
{
|
|
|
|
case NID_pkcs7_signed:
|
|
|
|
if (p7->d.sign->contents != NULL)
|
1999-12-10 13:46:48 +00:00
|
|
|
PKCS7_free(p7->d.sign->contents);
|
1998-12-21 10:52:47 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_set_type(PKCS7 *p7, int type)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
ASN1_OBJECT *obj;
|
|
|
|
|
2000-12-08 19:09:35 +00:00
|
|
|
/*PKCS7_content_free(p7);*/
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!ASN1_INTEGER_set(p7->d.sign->version,1))
|
|
|
|
{
|
|
|
|
PKCS7_SIGNED_free(p7->d.sign);
|
|
|
|
p7->d.sign=NULL;
|
|
|
|
goto err;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
break;
|
|
|
|
case NID_pkcs7_data:
|
|
|
|
p7->type=obj;
|
1999-10-20 01:50:23 +00:00
|
|
|
if ((p7->d.data=M_ASN1_OCTET_STRING_new()) == NULL)
|
1998-12-21 10:52:47 +00:00
|
|
|
goto err;
|
|
|
|
break;
|
1998-12-21 10:56:39 +00:00
|
|
|
case NID_pkcs7_signedAndEnveloped:
|
|
|
|
p7->type=obj;
|
|
|
|
if ((p7->d.signed_and_enveloped=PKCS7_SIGN_ENVELOPE_new())
|
1998-12-21 11:00:56 +00:00
|
|
|
== NULL) goto err;
|
|
|
|
ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1);
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!ASN1_INTEGER_set(p7->d.signed_and_enveloped->version,1))
|
|
|
|
goto err;
|
2001-01-24 18:39:54 +00:00
|
|
|
p7->d.signed_and_enveloped->enc_data->content_type
|
|
|
|
= OBJ_nid2obj(NID_pkcs7_data);
|
1998-12-21 10:56:39 +00:00
|
|
|
break;
|
1998-12-21 10:52:47 +00:00
|
|
|
case NID_pkcs7_enveloped:
|
1998-12-21 11:00:56 +00:00
|
|
|
p7->type=obj;
|
|
|
|
if ((p7->d.enveloped=PKCS7_ENVELOPE_new())
|
|
|
|
== NULL) goto err;
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!ASN1_INTEGER_set(p7->d.enveloped->version,0))
|
|
|
|
goto err;
|
2001-01-24 18:39:54 +00:00
|
|
|
p7->d.enveloped->enc_data->content_type
|
|
|
|
= OBJ_nid2obj(NID_pkcs7_data);
|
1998-12-21 11:00:56 +00:00
|
|
|
break;
|
1998-12-21 10:52:47 +00:00
|
|
|
case NID_pkcs7_encrypted:
|
1999-08-17 12:58:01 +00:00
|
|
|
p7->type=obj;
|
|
|
|
if ((p7->d.encrypted=PKCS7_ENCRYPT_new())
|
|
|
|
== NULL) goto err;
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!ASN1_INTEGER_set(p7->d.encrypted->version,0))
|
|
|
|
goto err;
|
2001-01-24 18:39:54 +00:00
|
|
|
p7->d.encrypted->enc_data->content_type
|
|
|
|
= OBJ_nid2obj(NID_pkcs7_data);
|
1999-08-17 12:58:01 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case NID_pkcs7_digest:
|
1998-12-21 10:52:47 +00:00
|
|
|
default:
|
|
|
|
PKCS7err(PKCS7_F_PKCS7_SET_TYPE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
return(1);
|
|
|
|
err:
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int i,j,nid;
|
|
|
|
X509_ALGOR *alg;
|
1999-06-02 17:11:53 +00:00
|
|
|
STACK_OF(PKCS7_SIGNER_INFO) *signer_sk;
|
1999-05-31 20:35:31 +00:00
|
|
|
STACK_OF(X509_ALGOR) *md_sk;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
i=OBJ_obj2nid(p7->type);
|
1998-12-21 10:56:39 +00:00
|
|
|
switch (i)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
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:
|
1998-12-21 10:52:47 +00:00
|
|
|
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;
|
1999-05-31 20:35:31 +00:00
|
|
|
for (i=0; i<sk_X509_ALGOR_num(md_sk); i++)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-05-31 20:35:31 +00:00
|
|
|
alg=sk_X509_ALGOR_value(md_sk,i);
|
1998-12-21 10:52:47 +00:00
|
|
|
if (OBJ_obj2nid(alg->algorithm) == nid)
|
|
|
|
{
|
|
|
|
j=1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!j) /* we need to add another algorithm */
|
|
|
|
{
|
1999-12-11 20:04:06 +00:00
|
|
|
if(!(alg=X509_ALGOR_new())
|
|
|
|
|| !(alg->parameter = ASN1_TYPE_new())) {
|
|
|
|
PKCS7err(PKCS7_F_PKCS7_ADD_SIGNER,ERR_R_MALLOC_FAILURE);
|
|
|
|
return(0);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
alg->algorithm=OBJ_nid2obj(nid);
|
1999-12-11 20:04:06 +00:00
|
|
|
alg->parameter->type = V_ASN1_NULL;
|
1999-05-31 20:35:31 +00:00
|
|
|
sk_X509_ALGOR_push(md_sk,alg);
|
1998-12-21 10:52:47 +00:00
|
|
|
}
|
|
|
|
|
1999-06-02 17:11:53 +00:00
|
|
|
sk_PKCS7_SIGNER_INFO_push(signer_sk,psi);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_add_certificate(PKCS7 *p7, X509 *x509)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int i;
|
1999-04-12 17:23:57 +00:00
|
|
|
STACK_OF(X509) **sk;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
i=OBJ_obj2nid(p7->type);
|
1998-12-21 10:56:39 +00:00
|
|
|
switch (i)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
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);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
if (*sk == NULL)
|
1999-04-12 17:23:57 +00:00
|
|
|
*sk=sk_X509_new_null();
|
1998-12-21 10:52:47 +00:00
|
|
|
CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
|
1999-04-12 17:23:57 +00:00
|
|
|
sk_X509_push(*sk,x509);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
int i;
|
1999-05-31 21:00:25 +00:00
|
|
|
STACK_OF(X509_CRL) **sk;
|
1998-12-21 10:56:39 +00:00
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
i=OBJ_obj2nid(p7->type);
|
1998-12-21 10:56:39 +00:00
|
|
|
switch (i)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1998-12-21 10:56:39 +00:00
|
|
|
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);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
if (*sk == NULL)
|
1999-05-31 21:00:25 +00:00
|
|
|
*sk=sk_X509_CRL_new_null();
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
CRYPTO_add(&crl->references,1,CRYPTO_LOCK_X509_CRL);
|
1999-05-31 21:00:25 +00:00
|
|
|
sk_X509_CRL_push(*sk,crl);
|
1998-12-21 10:52:47 +00:00
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
|
2001-03-09 02:51:02 +00:00
|
|
|
const EVP_MD *dgst)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
1999-12-14 02:44:27 +00:00
|
|
|
char is_dsa;
|
|
|
|
if (pkey->type == EVP_PKEY_DSA) is_dsa = 1;
|
|
|
|
else is_dsa = 0;
|
1998-12-21 10:52:47 +00:00
|
|
|
/* We now need to add another PKCS7_SIGNER_INFO entry */
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!ASN1_INTEGER_set(p7i->version,1))
|
|
|
|
goto err;
|
|
|
|
if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
|
|
|
|
X509_get_issuer_name(x509)))
|
|
|
|
goto err;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* because ASN1_INTEGER_set is used to set a 'long' we will do
|
|
|
|
* things the ugly way. */
|
1999-10-20 01:50:23 +00:00
|
|
|
M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!(p7i->issuer_and_serial->serial=
|
|
|
|
M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
|
|
|
|
goto err;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
/* lets keep the pkey around for a while */
|
|
|
|
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
|
|
|
|
p7i->pkey=pkey;
|
|
|
|
|
|
|
|
/* Set the algorithms */
|
1999-12-14 02:44:27 +00:00
|
|
|
if (is_dsa) p7i->digest_alg->algorithm=OBJ_nid2obj(NID_sha1);
|
1998-12-21 11:00:56 +00:00
|
|
|
else
|
|
|
|
p7i->digest_alg->algorithm=OBJ_nid2obj(EVP_MD_type(dgst));
|
1998-12-21 10:52:47 +00:00
|
|
|
|
1999-05-11 00:52:46 +00:00
|
|
|
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;
|
|
|
|
|
1999-05-09 16:39:11 +00:00
|
|
|
p7i->digest_enc_alg->algorithm=OBJ_nid2obj(EVP_PKEY_type(pkey->type));
|
|
|
|
|
1998-12-21 10:52:47 +00:00
|
|
|
if (p7i->digest_enc_alg->parameter != NULL)
|
|
|
|
ASN1_TYPE_free(p7i->digest_enc_alg->parameter);
|
1999-12-14 02:44:27 +00:00
|
|
|
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;
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
|
|
|
return(1);
|
|
|
|
err:
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509, EVP_PKEY *pkey,
|
2001-03-09 02:51:02 +00:00
|
|
|
const EVP_MD *dgst)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1999-06-02 17:11:53 +00:00
|
|
|
STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
if (PKCS7_type_is_signed(p7))
|
|
|
|
{
|
|
|
|
return(p7->d.sign->signer_info);
|
|
|
|
}
|
1998-12-21 11:00:56 +00:00
|
|
|
else if (PKCS7_type_is_signedAndEnveloped(p7))
|
|
|
|
{
|
|
|
|
return(p7->d.signed_and_enveloped->signer_info);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
else
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509)
|
1998-12-21 10:56:39 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri)
|
1998-12-21 10:56:39 +00:00
|
|
|
{
|
|
|
|
int i;
|
1999-06-02 21:13:45 +00:00
|
|
|
STACK_OF(PKCS7_RECIP_INFO) *sk;
|
1998-12-21 10:56:39 +00:00
|
|
|
|
|
|
|
i=OBJ_obj2nid(p7->type);
|
|
|
|
switch (i)
|
|
|
|
{
|
|
|
|
case NID_pkcs7_signedAndEnveloped:
|
|
|
|
sk= p7->d.signed_and_enveloped->recipientinfo;
|
|
|
|
break;
|
1998-12-21 11:00:56 +00:00
|
|
|
case NID_pkcs7_enveloped:
|
|
|
|
sk= p7->d.enveloped->recipientinfo;
|
|
|
|
break;
|
1998-12-21 10:56:39 +00:00
|
|
|
default:
|
|
|
|
PKCS7err(PKCS7_F_PKCS7_ADD_RECIPIENT_INFO,PKCS7_R_WRONG_CONTENT_TYPE);
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
1999-06-02 21:13:45 +00:00
|
|
|
sk_PKCS7_RECIP_INFO_push(sk,ri);
|
1998-12-21 10:56:39 +00:00
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
|
1998-12-21 10:56:39 +00:00
|
|
|
{
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!ASN1_INTEGER_set(p7i->version,0))
|
|
|
|
return 0;
|
|
|
|
if (!X509_NAME_set(&p7i->issuer_and_serial->issuer,
|
|
|
|
X509_get_issuer_name(x509)))
|
|
|
|
return 0;
|
1998-12-21 10:56:39 +00:00
|
|
|
|
1999-10-20 01:50:23 +00:00
|
|
|
M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!(p7i->issuer_and_serial->serial=
|
|
|
|
M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
|
|
|
|
return 0;
|
1998-12-21 10:56:39 +00:00
|
|
|
|
1998-12-21 11:00:56 +00:00
|
|
|
X509_ALGOR_free(p7i->key_enc_algor);
|
2004-12-05 01:04:44 +00:00
|
|
|
if (!(p7i->key_enc_algor= X509_ALGOR_dup(x509->cert_info->key->algor)))
|
|
|
|
return 0;
|
1998-12-21 11:00:56 +00:00
|
|
|
|
1998-12-21 10:56:39 +00:00
|
|
|
CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
|
|
|
|
p7i->cert=x509;
|
|
|
|
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
|
1998-12-21 10:52:47 +00:00
|
|
|
{
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1999-05-16 00:25:36 +00:00
|
|
|
int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
|
1998-12-21 10:56:39 +00:00
|
|
|
{
|
|
|
|
int i;
|
1999-12-29 02:59:18 +00:00
|
|
|
ASN1_OBJECT *objtmp;
|
1998-12-21 10:56:39 +00:00
|
|
|
PKCS7_ENC_CONTENT *ec;
|
|
|
|
|
|
|
|
i=OBJ_obj2nid(p7->type);
|
|
|
|
switch (i)
|
|
|
|
{
|
|
|
|
case NID_pkcs7_signedAndEnveloped:
|
|
|
|
ec=p7->d.signed_and_enveloped->enc_data;
|
|
|
|
break;
|
1998-12-21 11:00:56 +00:00
|
|
|
case NID_pkcs7_enveloped:
|
|
|
|
ec=p7->d.enveloped->enc_data;
|
|
|
|
break;
|
1998-12-21 10:56:39 +00:00
|
|
|
default:
|
|
|
|
PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_WRONG_CONTENT_TYPE);
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
1999-12-29 02:59:18 +00:00
|
|
|
/* Check cipher OID exists and has data in it*/
|
2000-02-22 18:45:11 +00:00
|
|
|
i = EVP_CIPHER_type(cipher);
|
|
|
|
if(i == NID_undef) {
|
1999-12-29 02:59:18 +00:00
|
|
|
PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
|
|
|
|
return(0);
|
|
|
|
}
|
2000-02-22 18:45:11 +00:00
|
|
|
objtmp = OBJ_nid2obj(i);
|
1999-05-16 00:25:36 +00:00
|
|
|
|
|
|
|
ec->cipher = cipher;
|
|
|
|
return 1;
|
1998-12-21 10:56:39 +00:00
|
|
|
}
|
|
|
|
|