]>
Commit | Line | Data |
---|---|---|
548ff2c3 JB |
1 | From openssl CVS, "Make S/MIME encrypt work again." |
2 | --- openssl-0.9.7d/crypto/pkcs7/pk7_doit.c.orig 2003-11-10 02:29:27.000000000 +0100 | |
3 | +++ openssl-0.9.7d/crypto/pkcs7/pk7_doit.c 2004-06-01 21:42:38.199995776 +0200 | |
4 | @@ -257,10 +257,15 @@ | |
5 | bio=BIO_new(BIO_s_null()); | |
6 | else | |
7 | { | |
8 | - ASN1_OCTET_STRING *os; | |
9 | - os = PKCS7_get_octet_string(p7->d.sign->contents); | |
10 | - if (os && os->length > 0) | |
11 | - bio = BIO_new_mem_buf(os->data, os->length); | |
12 | + if (PKCS7_type_is_signed(p7)) | |
13 | + { | |
14 | + ASN1_OCTET_STRING *os; | |
15 | + os = PKCS7_get_octet_string( | |
16 | + p7->d.sign->contents); | |
17 | + if (os && os->length > 0) | |
18 | + bio = BIO_new_mem_buf(os->data, | |
19 | + os->length); | |
20 | + } | |
21 | if(bio == NULL) | |
22 | { | |
23 | bio=BIO_new(BIO_s_mem()); |