summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2017-06-18 15:23:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:13 +0100
commitd9cb7e713970452d0bd8f46418c82110c7acfe37 (patch)
tree0fb5a50ae4cef8a9dc11b7c077d10f6d3f0236e4 /meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
parent838c5ba5bec907bd69875e690d8996d14f636c89 (diff)
downloadpoky-d9cb7e713970452d0bd8f46418c82110c7acfe37.tar.gz
openssl: Upgrade 1.0.2k -> 1.0.2l
1. Dropped obsolete patches, because the new version contains them: - fix-cipher-des-ede3-cfb1.patch - openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch 2. LICENSE checksum change due to copyright years and wording tweak. 3. Test binaries (x86-64) are included in source code. So remove those only for ptest. (From OE-Core rev: 64ec18d7e13d310e5e44080a04b3f2181ea96ae3) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Ross Burton <ross.burton@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.patch21
1 files changed, 0 insertions, 21 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
deleted file mode 100644
index 2a318a4584..0000000000
--- a/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Submitted
2
3This patch adds the fix for one of the ciphers used in openssl, namely
4the cipher des-ede3-cfb1. Complete bug log and patch is present here:
5http://rt.openssl.org/Ticket/Display.html?id=2867
6
7Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
8
9Index: openssl-1.0.2/crypto/evp/e_des3.c
10===================================================================
11--- openssl-1.0.2.orig/crypto/evp/e_des3.c
12+++ openssl-1.0.2/crypto/evp/e_des3.c
13@@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH
14 size_t n;
15 unsigned char c[1], d[1];
16
17- for (n = 0; n < inl; ++n) {
18+ for (n = 0; n * 8 < inl; ++n) {
19 c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0;
20 DES_ede3_cfb_encrypt(c, d, 1, 1,
21 &data(ctx)->ks1, &data(ctx)->ks2,