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/fix-cipher-des-ede3-cfb1.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/fix-cipher-des-ede3-cfb1.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch b/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch new file mode 100644 index 0000000000..f0e177840f --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | |||
3 | This patch adds the fix for one of the ciphers used in openssl, namely | ||
4 | the cipher des-ede3-cfb1. Complete bug log and patch is present here: | ||
5 | http://rt.openssl.org/Ticket/Display.html?id=2867 | ||
6 | |||
7 | Signed-Off-By: Muhammad Shakeel <muhammad_shakeel@mentor.com> | ||
8 | |||
9 | diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c | ||
10 | index 3232cfe..df84922 100644 | ||
11 | =================================================================== | ||
12 | --- a/crypto/evp/e_des3.c | ||
13 | +++ b/crypto/evp/e_des3.c | ||
14 | @@ -173,7 +173,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | ||
15 | size_t n; | ||
16 | unsigned char c[1],d[1]; | ||
17 | |||
18 | - for(n=0 ; n < inl ; ++n) | ||
19 | + for(n=0 ; n < inl*8 ; ++n) | ||
20 | { | ||
21 | c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0; | ||
22 | DES_ede3_cfb_encrypt(c,d,1,1, | ||