diff options
| author | Cristiana Voicu <cristiana.voicu@intel.com> | 2014-04-08 14:49:48 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-08 17:45:09 +0100 |
| commit | 5dd1d7566964c90d33c0c44f569d9336fb0724ce (patch) | |
| tree | 6c9516db6873f1254723cbeeca204a43d5d410ba /meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch | |
| parent | c0ac09ab49d7a2b9cc7601ceef2852d690cdf3d1 (diff) | |
| download | poky-5dd1d7566964c90d33c0c44f569d9336fb0724ce.tar.gz | |
openssl: Upgrade to v1.0.1g
The trigger for the upgrade was the serious "heartbleed" vulnerability
(CVE-2014-0160). More information:
http://www.itnews.com.au/News/382068,serious-openssl-bug-renders-websites-wide-open.aspx
Dropped obsolete patches, because the new version contains them:
0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch
0001-Fix-DTLS-retransmission-from-previous-session.patch
0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch
Modified 2 patches (small changes), in order to apply properly:
initial-aarch64-bits.patch
openssl-fix-doc.patch
Addresses CVEs:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0160
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0076
(From OE-Core rev: ff52836e1838590eeec7d7658e15b21d83cf8455)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch')
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch b/meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch deleted file mode 100644 index e5a8ade936..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From ca989269a2876bae79393bd54c3e72d49975fc75 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Dr. Stephen Henson" <steve@openssl.org> | ||
| 3 | Date: Thu, 19 Dec 2013 14:37:39 +0000 | ||
| 4 | Subject: [PATCH] Use version in SSL_METHOD not SSL structure. | ||
| 5 | |||
| 6 | Upstream-Status: Backport | ||
| 7 | commit ca989269a2876bae79393bd54c3e72d49975fc75 upstream | ||
| 8 | |||
| 9 | When deciding whether to use TLS 1.2 PRF and record hash algorithms | ||
| 10 | use the version number in the corresponding SSL_METHOD structure | ||
| 11 | instead of the SSL structure. The SSL structure version is sometimes | ||
| 12 | inaccurate. Note: OpenSSL 1.0.2 and later effectively do this already. | ||
| 13 | (CVE-2013-6449) | ||
| 14 | --- | ||
| 15 | ssl/s3_lib.c | 2 +- | ||
| 16 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c | ||
| 19 | index bf832bb..c4ef273 100644 | ||
| 20 | --- a/ssl/s3_lib.c | ||
| 21 | +++ b/ssl/s3_lib.c | ||
| 22 | @@ -4286,7 +4286,7 @@ need to go to SSL_ST_ACCEPT. | ||
| 23 | long ssl_get_algorithm2(SSL *s) | ||
| 24 | { | ||
| 25 | long alg2 = s->s3->tmp.new_cipher->algorithm2; | ||
| 26 | - if (TLS1_get_version(s) >= TLS1_2_VERSION && | ||
| 27 | + if (s->method->version == TLS1_2_VERSION && | ||
| 28 | alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF)) | ||
| 29 | return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256; | ||
| 30 | return alg2; | ||
| 31 | -- | ||
| 32 | 1.7.5.4 | ||
| 33 | |||
