From 927e4bbe49d78a4e3ade669843cbd4d4a01b53ca Mon Sep 17 00:00:00 2001 From: "robert_joslyn@selinc.com" Date: Wed, 21 Feb 2018 22:29:08 -0800 Subject: 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 Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../openssl/openssl/fix-cipher-des-ede3-cfb1.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch (limited to 'meta/recipes-connectivity/openssl/openssl/fix-cipher-des-ede3-cfb1.patch') 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 @@ -Upstream-Status: Submitted - -This patch adds the fix for one of the ciphers used in openssl, namely -the cipher des-ede3-cfb1. Complete bug log and patch is present here: -http://rt.openssl.org/Ticket/Display.html?id=2867 - -Signed-off-by: Muhammad Shakeel - -Index: openssl-1.0.2/crypto/evp/e_des3.c -=================================================================== ---- openssl-1.0.2.orig/crypto/evp/e_des3.c -+++ openssl-1.0.2/crypto/evp/e_des3.c -@@ -211,7 +211,7 @@ static int des_ede3_cfb1_cipher(EVP_CIPH - size_t n; - unsigned char c[1], d[1]; - -- for (n = 0; n < inl; ++n) { -+ for (n = 0; n * 8 < inl; ++n) { - c[0] = (in[n / 8] & (1 << (7 - n % 8))) ? 0x80 : 0; - DES_ede3_cfb_encrypt(c, d, 1, 1, - &data(ctx)->ks1, &data(ctx)->ks2, -- cgit v1.2.3-54-g00ecf