summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
diff options
context:
space:
mode:
authorrobert_joslyn@selinc.com <robert_joslyn@selinc.com>2018-02-21 22:29:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:11:58 +0000
commit927e4bbe49d78a4e3ade669843cbd4d4a01b53ca (patch)
treea820bb14ed860996739c9dec1309d988fec14d26 /meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch
parentf5119cc59fe7aaebe725223177dd314d80ee82bd (diff)
downloadpoky-927e4bbe49d78a4e3ade669843cbd4d4a01b53ca.tar.gz
openssl: Upgrade from 1.0.2k to 1.0.2n
Drop patches already applied upstream. Refresh parallel.patch using latest version from master. Remove x86-64 test binaries included in source code for ptest. License-Update: Updated copyright years and a minor wording change (From OE-Core rev: 76020de1afc7f7643bc35de2d49bce6da0c7b879) Signed-off-by: Robert Joslyn <robert_joslyn@selinc.com> Signed-off-by: Armin Kuster <akuster808@gmail.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,