diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-04-18 22:32:54 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-19 14:44:46 +0100 |
| commit | 08a5cda85594fca8b352841a26131bfac39c8417 (patch) | |
| tree | a827fa54d35132f270790b384e294e925be0b245 | |
| parent | 35867ee035030ab76fc9ccdb0eb1c3f80126301c (diff) | |
| download | openembedded-core-08a5cda85594fca8b352841a26131bfac39c8417.tar.gz openembedded-core-08a5cda85594fca8b352841a26131bfac39c8417.tar.bz2 openembedded-core-08a5cda85594fca8b352841a26131bfac39c8417.zip | |
openssh: disable ciphers not supported by OpenSSL DES
While compiling openssl with option `no-des', it caused the openssh
build failure
...
cipher.c:85:41: error: 'EVP_des_ede3_cbc' undeclared here (not in a function);
...
OpenSSL configured that way defines OPENSSL_NO_DES to disable des
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.6p1.bb | 1 |
2 files changed, 40 insertions, 0 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 new file mode 100644 index 0000000000..8a2d1a0a7c --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/disable-ciphers-not-supported-by-OpenSSL-DES.patch @@ -0,0 +1,39 @@ +From 265eaab8b39d8d8721224a48eefed5bf1696d353 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 18 Apr 2018 21:58:32 +0800 +Subject: [PATCH] disable ciphers not supported by OpenSSL DES + +While compiling openssl with option `no-des', it caused the openssh +build failure +... +cipher.c:85:41: error: 'EVP_des_ede3_cbc' undeclared here (not in a function); +... + +OpenSSL configured that way defines OPENSSL_NO_DES to disable des + +Suggested by dtucker@ + +Upstream-Status: Submitted [openssh-unix-dev@mindrot.org] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + cipher.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cipher.c b/cipher.c +index c3cd5dc..86558e1 100644 +--- a/cipher.c ++++ b/cipher.c +@@ -82,7 +82,9 @@ struct sshcipher { + + static const struct sshcipher ciphers[] = { + #ifdef WITH_OPENSSL ++#ifndef OPENSSL_NO_DES + { "3des-cbc", 8, 24, 0, 0, CFLAG_CBC, EVP_des_ede3_cbc }, ++#endif + { "aes128-cbc", 16, 16, 0, 0, CFLAG_CBC, EVP_aes_128_cbc }, + { "aes192-cbc", 16, 24, 0, 0, CFLAG_CBC, EVP_aes_192_cbc }, + { "aes256-cbc", 16, 32, 0, 0, CFLAG_CBC, EVP_aes_256_cbc }, +-- +2.7.4 + diff --git a/meta/recipes-connectivity/openssh/openssh_7.6p1.bb b/meta/recipes-connectivity/openssh/openssh_7.6p1.bb index a2288dfe08..e11e8d7749 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.6p1.bb @@ -25,6 +25,7 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar file://fix-potential-signed-overflow-in-pointer-arithmatic.patch \ file://sshd_check_keys \ file://add-test-support-for-busybox.patch \ + file://disable-ciphers-not-supported-by-OpenSSL-DES.patch \ " PAM_SRC_URI = "file://sshd" |