Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 265eaab8b39d8d8721224a48eefed5bf1696d353 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 18 Apr 2018 21:58:32 +0800 |
| 4 | Subject: [PATCH] disable ciphers not supported by OpenSSL DES |
| 5 | |
| 6 | While compiling openssl with option `no-des', it caused the openssh |
| 7 | build failure |
| 8 | ... |
| 9 | cipher.c:85:41: error: 'EVP_des_ede3_cbc' undeclared here (not in a function); |
| 10 | ... |
| 11 | |
| 12 | OpenSSL configured that way defines OPENSSL_NO_DES to disable des |
| 13 | |
| 14 | Suggested by dtucker@ |
| 15 | |
| 16 | Upstream-Status: Submitted [openssh-unix-dev@mindrot.org] |
| 17 | |
| 18 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 19 | --- |
| 20 | cipher.c | 2 ++ |
| 21 | 1 file changed, 2 insertions(+) |
| 22 | |
| 23 | diff --git a/cipher.c b/cipher.c |
| 24 | index 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 | -- |
| 38 | 2.7.4 |
| 39 | |