summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs7
diff options
context:
space:
mode:
authordoug <>2015-02-07 14:21:41 +0000
committerdoug <>2015-02-07 14:21:41 +0000
commit51f67e036768f935502d4418c11e8c85553dd403 (patch)
tree2ced09b999e667ba31e21ec7321aad40bf53f75a /src/lib/libcrypto/pkcs7
parentbd790e322a40e6362231f517d5795d4079eeb2a2 (diff)
downloadopenbsd-51f67e036768f935502d4418c11e8c85553dd403.tar.gz
openbsd-51f67e036768f935502d4418c11e8c85553dd403.tar.bz2
openbsd-51f67e036768f935502d4418c11e8c85553dd403.zip
Don't support very old versions of Netscape (is there any other kind?).
Apparently "very old" Netscape versions illegally included empty content and a detached signature. OpenSSL removed the #if 0 that protected these users and added a new button OPENSSL_DONT_SUPPORT_OLD_NETSCAPE. It appears to be off by default to keep the hopes and dreams of very old Netscape users alive. We decided to be rebels and disable support. If you installed your browser from floppy disks, it's time to upgrade! Based on OpenSSL commit: 02a938c953b3e1ced71d9a832de1618f907eb96d ok tedu@, miod@, jsing@
Diffstat (limited to 'src/lib/libcrypto/pkcs7')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_smime.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_smime.c b/src/lib/libcrypto/pkcs7/pk7_smime.c
index 576866f5c2..1c00e5914a 100644
--- a/src/lib/libcrypto/pkcs7/pk7_smime.c
+++ b/src/lib/libcrypto/pkcs7/pk7_smime.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pk7_smime.c,v 1.19 2014/11/09 19:17:13 miod Exp $ */ 1/* $OpenBSD: pk7_smime.c,v 1.20 2015/02/07 14:21:41 doug Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -287,17 +287,16 @@ PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, BIO *indata,
287 PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_NO_CONTENT); 287 PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_NO_CONTENT);
288 return 0; 288 return 0;
289 } 289 }
290#if 0
291 /* NB: this test commented out because some versions of Netscape
292 * illegally include zero length content when signing data.
293 */
294 290
291 /*
292 * Very old Netscape illegally included empty content with
293 * a detached signature. Very old users should upgrade.
294 */
295 /* Check for data and content: two sets of data */ 295 /* Check for data and content: two sets of data */
296 if (!PKCS7_get_detached(p7) && indata) { 296 if (!PKCS7_get_detached(p7) && indata) {
297 PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_CONTENT_AND_DATA_PRESENT); 297 PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_CONTENT_AND_DATA_PRESENT);
298 return 0; 298 return 0;
299 } 299 }
300#endif
301 300
302 sinfos = PKCS7_get_signer_info(p7); 301 sinfos = PKCS7_get_signer_info(p7);
303 302