From 3d2f8b8fd12ccf599befdc7a797e27ccf9fa355d Mon Sep 17 00:00:00 2001 From: Gokhan Simsek Date: Mon, 18 Dec 2017 20:39:52 +0300 Subject: [PATCH] An attempt to fix some SSH connection failures by changing the order of key exchange methods. This change still fixes the previous problem reported in ticket #1090. --- src/third-party/libssh2/sources/src/kex.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/third-party/libssh2/sources/src/kex.c b/src/third-party/libssh2/sources/src/kex.c index 74e75c9bc..604fd9d70 100644 --- a/src/third-party/libssh2/sources/src/kex.c +++ b/src/third-party/libssh2/sources/src/kex.c @@ -1708,11 +1708,10 @@ kex_method_diffie_helman_group_exchange_sha256 = { }; static const LIBSSH2_KEX_METHOD *libssh2_kex_methods[] = { - //&kex_method_diffie_helman_group_exchange_sha256, // #1090: Patch for libssh2 for ssh connection issue due to Ubuntu 16.04/OSX's - // OpenSSH 6.9 version have disabled obsolete form of KEX "Diffie-Hellman group exchange" algorithm . - &kex_method_diffie_helman_group_exchange_sha1, &kex_method_diffie_helman_group14_sha1, &kex_method_diffie_helman_group1_sha1, + &kex_method_diffie_helman_group_exchange_sha1, + &kex_method_diffie_helman_group_exchange_sha256, NULL };