diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2014-01-03 07:38:22 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-01-03 20:45:29 +0100 |
| commit | 27a7ab51e39ed246f36fa8c39e7370545823ccff (patch) | |
| tree | f9f3f85f6737370d036265862220a2b0989b1653 /package/openssl | |
| parent | b10a40535d5a69ba0fba44272e72657bf4e409a1 (diff) | |
| download | buildroot-27a7ab51e39ed246f36fa8c39e7370545823ccff.tar.gz buildroot-27a7ab51e39ed246f36fa8c39e7370545823ccff.zip | |
openssl: add fix for CVE-2013-6449
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/openssl')
| -rw-r--r-- | package/openssl/openssl-001-do-not-build-docs.patch (renamed from package/openssl/openssl-do-not-build-docs.patch) | 0 | ||||
| -rw-r--r-- | package/openssl/openssl-002-dont-force-large-file.patch (renamed from package/openssl/openssl-dont-force-large-file.patch) | 0 | ||||
| -rw-r--r-- | package/openssl/openssl-003-CVE-2013-6449.patch | 34 |
3 files changed, 34 insertions, 0 deletions
diff --git a/package/openssl/openssl-do-not-build-docs.patch b/package/openssl/openssl-001-do-not-build-docs.patch index 135a9d3b04..135a9d3b04 100644 --- a/package/openssl/openssl-do-not-build-docs.patch +++ b/package/openssl/openssl-001-do-not-build-docs.patch diff --git a/package/openssl/openssl-dont-force-large-file.patch b/package/openssl/openssl-002-dont-force-large-file.patch index 5b04656ff5..5b04656ff5 100644 --- a/package/openssl/openssl-dont-force-large-file.patch +++ b/package/openssl/openssl-002-dont-force-large-file.patch diff --git a/package/openssl/openssl-003-CVE-2013-6449.patch b/package/openssl/openssl-003-CVE-2013-6449.patch new file mode 100644 index 0000000000..034da7d414 --- /dev/null +++ b/package/openssl/openssl-003-CVE-2013-6449.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/494816 +https://bugzilla.redhat.com/show_bug.cgi?id=1045363 +http://rt.openssl.org/Ticket/Display.html?id=3200&user=guest&pass=guest + +From ca989269a2876bae79393bd54c3e72d49975fc75 Mon Sep 17 00:00:00 2001 +From: "Dr. Stephen Henson" <steve@openssl.org> +Date: Thu, 19 Dec 2013 14:37:39 +0000 +Subject: [PATCH] Use version in SSL_METHOD not SSL structure. + +When deciding whether to use TLS 1.2 PRF and record hash algorithms +use the version number in the corresponding SSL_METHOD structure +instead of the SSL structure. The SSL structure version is sometimes +inaccurate. Note: OpenSSL 1.0.2 and later effectively do this already. +(CVE-2013-6449) +--- + ssl/s3_lib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c +index bf832bb..c4ef273 100644 +--- a/ssl/s3_lib.c ++++ b/ssl/s3_lib.c +@@ -4286,7 +4286,7 @@ need to go to SSL_ST_ACCEPT. + long ssl_get_algorithm2(SSL *s) + { + long alg2 = s->s3->tmp.new_cipher->algorithm2; +- if (TLS1_get_version(s) >= TLS1_2_VERSION && ++ if (s->method->version == TLS1_2_VERSION && + alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF)) + return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256; + return alg2; +-- +1.8.4.3 + |
