diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-02 16:33:20 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-02 16:33:20 +0000 |
| commit | a3fc10858bcaba990abcf7f53491cbe7794c93b9 (patch) | |
| tree | 2a83877085d54537c84a89c3e132a99b8d5f69b3 /lib | |
| parent | e5b6e94799c85c50bbbbea3d113764fc0ec7d8a3 (diff) | |
pk7_doit.c r1.20 introduced a NULL check that ensures that the signature
contents are not NULL, however this breaks detached signature processing.
Fix this by allowing the signature contents to be NULL when operating with
a detached signature.
Found the hard way by sthen@.
ok sthen@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/crypto/pkcs7/pk7_doit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/lib/libssl/src/crypto/pkcs7/pk7_doit.c index 46f9c2b8c6c..df846a22cc4 100644 --- a/lib/libssl/src/crypto/pkcs7/pk7_doit.c +++ b/lib/libssl/src/crypto/pkcs7/pk7_doit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk7_doit.c,v 1.23 2014/06/29 17:05:36 jsing Exp $ */ +/* $OpenBSD: pk7_doit.c,v 1.24 2014/07/02 16:33:19 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -754,7 +754,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio) case NID_pkcs7_signed: si_sk = p7->d.sign->signer_info; os = PKCS7_get_octet_string(p7->d.sign->contents); - if (os == NULL) { + if (!PKCS7_is_detached(p7) && os == NULL) { PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_DECODE_ERROR); goto err; } |