generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add bit I missed from PKCS#7 streaming encoder.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2006-12-24 16:46:47 +00:00
parent 11d8cdc6ad
commit 559d50138f
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
crypto/pkcs7/pk7_doit.c
View File

@ -301,6 +301,8 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
xa = p7->d.digest->md; xa = p7->d.digest->md;
os = PKCS7_get_octet_string(p7->d.digest->contents); os = PKCS7_get_octet_string(p7->d.digest->contents);
break; break;
case NID_pkcs7_data:
break;
default: default:
PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE); PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
goto err; goto err;
@ -372,7 +374,10 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
BIO_set_mem_eof_return(bio,0); BIO_set_mem_eof_return(bio,0);
} }
} }
BIO_push(out,bio); if (out)
BIO_push(out,bio);
else
out = bio;
bio=NULL; bio=NULL;
if (0) if (0)
{ {
@ -697,24 +702,37 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
switch (i) switch (i)
{ {
case NID_pkcs7_data:
os = p7->d.data;
break;
case NID_pkcs7_signedAndEnveloped: case NID_pkcs7_signedAndEnveloped:
/* XXXXXXXXXXXXXXXX */ /* XXXXXXXXXXXXXXXX */
si_sk=p7->d.signed_and_enveloped->signer_info; si_sk=p7->d.signed_and_enveloped->signer_info;
if (!(os=M_ASN1_OCTET_STRING_new())) os = p7->d.signed_and_enveloped->enc_data->enc_data;
if (!os)
{ {
PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE); os=M_ASN1_OCTET_STRING_new();
goto err; if (!os)
{
PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE);
goto err;
}
p7->d.signed_and_enveloped->enc_data->enc_data=os;
} }
p7->d.signed_and_enveloped->enc_data->enc_data=os;
break; break;
case NID_pkcs7_enveloped: case NID_pkcs7_enveloped:
/* XXXXXXXXXXXXXXXX */ /* XXXXXXXXXXXXXXXX */
if (!(os=M_ASN1_OCTET_STRING_new())) os = p7->d.enveloped->enc_data->enc_data;
if (!os)
{ {
PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE); os=M_ASN1_OCTET_STRING_new();
goto err; if (!os)
{
PKCS7err(PKCS7_F_PKCS7_DATAFINAL,ERR_R_MALLOC_FAILURE);
goto err;
}
p7->d.enveloped->enc_data->enc_data=os;
} }
p7->d.enveloped->enc_data->enc_data=os;
break; break;
case NID_pkcs7_signed: case NID_pkcs7_signed:
si_sk=p7->d.sign->signer_info; si_sk=p7->d.sign->signer_info;
@ -799,7 +817,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len); M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
} }
if (!PKCS7_is_detached(p7)) if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF))
{ {
char *cont; char *cont;
long contlen; long contlen;