aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh/openssh_7.2p2.bb
diff options
context:
space:
mode:
authormingli.yu@windriver.com <mingli.yu@windriver.com>2016-07-19 15:13:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-25 23:46:59 +0100
commitcd9c62461e837967dd29a532d32990c23350acf8 (patch)
tree3e8e82ce3dbb9f794fc869a299386d6e998ad0cf /meta/recipes-connectivity/openssh/openssh_7.2p2.bb
parent2a7f203dbe4fda5dba9137503e93669392719aba (diff)
downloadopenembedded-core-contrib-cd9c62461e837967dd29a532d32990c23350acf8.tar.gz
openssh: conditional compile DES code.
After openssl disabled DES, openssh fails to build for some DES codes are not wrapped in conditional compile statement "#ifndef OPENSSL_NO_DES" and "#endif". Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/openssh/openssh_7.2p2.bb')
-rw-r--r--meta/recipes-connectivity/openssh/openssh_7.2p2.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_7.2p2.bb b/meta/recipes-connectivity/openssh/openssh_7.2p2.bb
index 01b5d500f3..21eefab8ff 100644
--- a/meta/recipes-connectivity/openssh/openssh_7.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.2p2.bb
@@ -23,6 +23,8 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar
file://add-test-support-for-busybox.patch \
file://run-ptest \
file://CVE-2015-8325.patch \
+ file://openssh-7.1p1-conditional-compile-des-in-cipher.patch \
+ file://openssh-7.1p1-conditional-compile-des-in-pkcs11.patch \
"
PAM_SRC_URI = "file://sshd"