From: Darren Tucker <dtucker@dtucker.net>
Date: Wed, 18 Apr 2018 23:53:14 +0000 (+1000)
Subject: Omit 3des-cbc if OpenSSL built without DES.
X-Git-Tag: V_7_8_P1~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec338967a666b7c8ad8b88175f2faeddf268116;p=thirdparty%2Fopenssh-portable.git

Omit 3des-cbc if OpenSSL built without DES.

Patch from hongxu.jia at windriver.com, ok djm@
---

diff --git a/cipher.c b/cipher.c
index 578763616..a72682a82 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 },