summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRandy MacLeod <Randy.MacLeod@windriver.com>2018-08-29 20:33:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-04 11:03:55 +0100
commitf19360329a9c63d35ace11745eda82a03bf6f2a9 (patch)
treeb092b8a7d35a1f086fe8471c4e5588c2da31a8b0 /meta/recipes-connectivity
parent5c0f6391cf634515bc1e77a149ca0ed96916411b (diff)
downloadpoky-f19360329a9c63d35ace11745eda82a03bf6f2a9.tar.gz
openssh: update from 7.7p1 to 7.8p1
Drop the disable-ciphers patch since it has been integrated: cec33896 Omit 3des-cbc if OpenSSL built without DES. (From OE-Core rev: 7d35f5bb7b1700ae4bb7f55af8db7357a851c15a) Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch39
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.8p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_7.7p1.bb)5
2 files changed, 2 insertions, 42 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch b/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch
deleted file mode 100644
index 8a2d1a0a7c..0000000000
--- a/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 265eaab8b39d8d8721224a48eefed5bf1696d353 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 18 Apr 2018 21:58:32 +0800
4Subject: [PATCH] disable ciphers not supported by OpenSSL DES
5
6While compiling openssl with option `no-des', it caused the openssh
7build failure
8...
9cipher.c:85:41: error: 'EVP_des_ede3_cbc' undeclared here (not in a function);
10...
11
12OpenSSL configured that way defines OPENSSL_NO_DES to disable des
13
14Suggested by dtucker@
15
16Upstream-Status: Submitted [openssh-unix-dev@mindrot.org]
17
18Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
19---
20 cipher.c | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/cipher.c b/cipher.c
24index c3cd5dc..86558e1 100644
25--- a/cipher.c
26+++ b/cipher.c
27@@ -82,7 +82,9 @@ struct sshcipher {
28
29 static const struct sshcipher ciphers[] = {
30 #ifdef WITH_OPENSSL
31+#ifndef OPENSSL_NO_DES
32 { "3des-cbc", 8, 24, 0, 0, CFLAG_CBC, EVP_des_ede3_cbc },
33+#endif
34 { "aes128-cbc", 16, 16, 0, 0, CFLAG_CBC, EVP_aes_128_cbc },
35 { "aes192-cbc", 16, 24, 0, 0, CFLAG_CBC, EVP_aes_192_cbc },
36 { "aes256-cbc", 16, 32, 0, 0, CFLAG_CBC, EVP_aes_256_cbc },
37--
382.7.4
39
diff --git a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb b/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
index b3da5f6761..f4b295f2df 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.7p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.8p1.bb
@@ -25,13 +25,12 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
25 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ 25 file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \
26 file://sshd_check_keys \ 26 file://sshd_check_keys \
27 file://add-test-support-for-busybox.patch \ 27 file://add-test-support-for-busybox.patch \
28 file://disable-ciphers-not-supported-by-OpenSSL-DES.patch \
29 " 28 "
30 29
31PAM_SRC_URI = "file://sshd" 30PAM_SRC_URI = "file://sshd"
32 31
33SRC_URI[md5sum] = "68ba883aff6958297432e5877e9a0fe2" 32SRC_URI[md5sum] = "ce1d090fa6239fd38eb989d5e983b074"
34SRC_URI[sha256sum] = "d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f" 33SRC_URI[sha256sum] = "1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca"
35 34
36inherit useradd update-rc.d update-alternatives systemd 35inherit useradd update-rc.d update-alternatives systemd
37 36