diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-11-27 22:00:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-11-27 22:00:12 +0000 |
| commit | 81aef5a396648fd4630bc25ebd780e13facceabb (patch) | |
| tree | 9df09403596a34531c1cb9f152d0383854cb660a /dev-libs/openssl/files | |
| parent | Fix path to iptables dir again #293709 by Vitaliy V. Osypenko. (diff) | |
| download | gentoo-2-81aef5a396648fd4630bc25ebd780e13facceabb.tar.gz gentoo-2-81aef5a396648fd4630bc25ebd780e13facceabb.tar.bz2 gentoo-2-81aef5a396648fd4630bc25ebd780e13facceabb.zip | |
Add other half of MD2 disable so that root certs arent checked #294615 by Alexander Danilov.
(Portage version: 2.2_rc51/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'dev-libs/openssl/files')
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch b/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch index ad4bf3dac9fa..b097869f3b1e 100644 --- a/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch +++ b/dev-libs/openssl/files/openssl-0.9.8l-CVE-2009-2409.patch @@ -2,11 +2,48 @@ http://bugs.gentoo.org/280591 fix from upstream +http://cvs.openssl.org/chngview?cn=18260 + +Index: openssl/crypto/x509/x509_vfy.c +RCS File: /v/openssl/cvs/openssl/crypto/x509/x509_vfy.c,v +rcsdiff -q -kk '-r1.77.2.8' '-r1.77.2.9' -u '/v/openssl/cvs/openssl/crypto/x509/x509_vfy.c,v' 2>/dev/null +--- crypto/x509/x509_vfy.c 2008/07/13 14:33:15 1.77.2.8 ++++ crypto/x509/x509_vfy.c 2009/06/15 14:52:38 1.77.2.9 +@@ -986,7 +986,11 @@ + while (n >= 0) + { + ctx->error_depth=n; +- if (!xs->valid) ++ ++ /* Skip signature check for self signed certificates. It ++ * doesn't add any security and just wastes time. ++ */ ++ if (!xs->valid && xs != xi) + { + if ((pkey=X509_get_pubkey(xi)) == NULL) + { +@@ -996,13 +1000,6 @@ + if (!ok) goto end; + } + else if (X509_verify(xs,pkey) <= 0) +- /* XXX For the final trusted self-signed cert, +- * this is a waste of time. That check should +- * optional so that e.g. 'openssl x509' can be +- * used to detect invalid self-signatures, but +- * we don't verify again and again in SSL +- * handshakes and the like once the cert has +- * been declared trusted. */ + { + ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE; + ctx->current_cert=xs; + +http://cvs.openssl.org/chngview?cn=18317 + Index: openssl/crypto/evp/c_alld.c RCS File: /v/openssl/cvs/openssl/crypto/evp/c_alld.c,v rcsdiff -q -kk '-r1.7' '-r1.7.2.1' -u '/v/openssl/cvs/openssl/crypto/evp/c_alld.c,v' 2>/dev/null ---- c_alld.c 2005/04/30 21:51:40 1.7 -+++ c_alld.c 2009/07/08 08:33:26 1.7.2.1 +--- crypto/evp/c_alld.c 2005/04/30 21:51:40 1.7 ++++ crypto/evp/c_alld.c 2009/07/08 08:33:26 1.7.2.1 @@ -64,9 +64,6 @@ void OpenSSL_add_all_digests(void) @@ -20,8 +57,8 @@ rcsdiff -q -kk '-r1.7' '-r1.7.2.1' -u '/v/openssl/cvs/openssl/crypto/evp/c_alld. Index: openssl/ssl/ssl_algs.c RCS File: /v/openssl/cvs/openssl/ssl/ssl_algs.c,v rcsdiff -q -kk '-r1.12.2.3' '-r1.12.2.4' -u '/v/openssl/cvs/openssl/ssl/ssl_algs.c,v' 2>/dev/null ---- ssl_algs.c 2007/04/23 23:50:21 1.12.2.3 -+++ ssl_algs.c 2009/07/08 08:33:27 1.12.2.4 +--- ssl/ssl_algs.c 2007/04/23 23:50:21 1.12.2.3 ++++ ssl/ssl_algs.c 2009/07/08 08:33:27 1.12.2.4 @@ -92,9 +92,6 @@ EVP_add_cipher(EVP_seed_cbc()); #endif |