diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2004-04-05 19:01:57 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2004-04-05 19:01:57 +0000 |
| commit | fe2b6e668935d878da0f142e07a393d1b918ce86 (patch) | |
| tree | 5a9a82c71ef0fc15017418af46043d19dc20f923 | |
| parent | ced566fd0b59417323f6b6f17b51b25e942cff52 (diff) | |
| download | src-fe2b6e668935d878da0f142e07a393d1b918ce86.tar.gz src-fe2b6e668935d878da0f142e07a393d1b918ce86.zip | |
Repair a regression in OpenSSL 0.9.7d: processing an unsigned PKCS#7
object could cause a null pointer dereference.
Obtained from: OpenSSL CVS (change number 12080)
MFC After: 1 day
Reported by: Daniel Lang <dl@leo.org>
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=127904
| -rw-r--r-- | crypto/openssl/crypto/pkcs7/pk7_doit.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crypto/openssl/crypto/pkcs7/pk7_doit.c b/crypto/openssl/crypto/pkcs7/pk7_doit.c index 35c7dcd0b3e7..b78e22819cd8 100644 --- a/crypto/openssl/crypto/pkcs7/pk7_doit.c +++ b/crypto/openssl/crypto/pkcs7/pk7_doit.c @@ -257,10 +257,15 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) bio=BIO_new(BIO_s_null()); else { - ASN1_OCTET_STRING *os; - os = PKCS7_get_octet_string(p7->d.sign->contents); - if (os && os->length > 0) - bio = BIO_new_mem_buf(os->data, os->length); + if (PKCS7_type_is_signed(p7)) + { + ASN1_OCTET_STRING *os; + os = PKCS7_get_octet_string( + p7->d.sign->contents); + if (os && os->length > 0) + bio = BIO_new_mem_buf(os->data, + os->length); + } if(bio == NULL) { bio=BIO_new(BIO_s_mem()); |