diff options
| author |   jsing <jsing@openbsd.org> | 2014-07-02 16:33:19 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-07-02 16:33:19 +0000 |
| commit | 6d10569fd7b9d1e7a10f1084f66341be75b73c6d (patch) | |
| tree | 9db0449f2a2a9cdbad1ed551732b6f02047f0b86 | |
| parent | Add an initial regress test for pkcs7. (diff) | |
| download | wireguard-openbsd-6d10569fd7b9d1e7a10f1084f66341be75b73c6d.tar.xz wireguard-openbsd-6d10569fd7b9d1e7a10f1084f66341be75b73c6d.zip | |
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@
| -rw-r--r-- | lib/libcrypto/pkcs7/pk7_doit.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/pkcs7/pk7_doit.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/pkcs7/pk7_doit.c b/lib/libcrypto/pkcs7/pk7_doit.c index 46f9c2b8c6c..df846a22cc4 100644 --- a/lib/libcrypto/pkcs7/pk7_doit.c +++ b/lib/libcrypto/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; } 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; } |