41f3f94d91
Viktor Szakats
2026-04-24
Subject
sshserver.pl: add option to enable KEX algorithms in sshd
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/windows.yml+2 -0
| @@ -510,6 +510,7 @@ jobs: | |
| if [[ "${MATRIX_INSTALL}" = *'libssh2-wincng'* ]]; then | |
| TFLAGS+=' ~SCP ~SFTP' # Flaky: `-8, Unable to exchange encryption keys`. https://github.com/libssh2/libssh2/issues/804 | |
| unset CURL_TEST_SSH_KEYALGO # libssh2 built with WinCNG does not support ssh-ed25519 hostkeys | |
| + | export CURL_TEST_SSH_ENABLE_KEX=diffie-hellman-group-exchange-sha256 |
| fi | |
| if [[ "${TFLAGS}" = *'-t'* ]]; then | |
| TFLAGS+=' !2300' # Leaks memory and file handle via tool_doswin.c / win32_stdin_read_thread() | |
| @@ -1164,6 +1165,7 @@ jobs: | |
| "${MATRIX_INSTALL_VCPKG}" = *'libssh2[core,zlib]'* ]]; then | |
| TFLAGS+=' ~SCP ~SFTP' # Flaky: `-8, Unable to exchange encryption keys`. https://github.com/libssh2/libssh2/issues/804 | |
| unset CURL_TEST_SSH_KEYALGO # libssh2 built with WinCNG does not support ssh-ed25519 hostkeys | |
| + | export CURL_TEST_SSH_ENABLE_KEX=diffie-hellman-group-exchange-sha256 |
| fi | |
| if [ -n "${MATRIX_OPENSSH}" ]; then # OpenSSH-Windows | |
| TFLAGS+=' ~601 ~603 ~617 ~619 ~621 ~641 ~665 ~2004' # SCP | |
tests/sshserver.pl+3 -0
| @@ -630,6 +630,9 @@ push @cfgarr, 'HostbasedAuthentication no'; | |
| push @cfgarr, 'HostbasedUsesNameFromPacketOnly no'; | |
| push @cfgarr, 'IgnoreRhosts yes'; | |
| push @cfgarr, 'IgnoreUserKnownHosts yes'; | |
| + | if(($sshdid =~ /OpenSSH/) && ($sshdvernum >= 700) && $ENV{'CURL_TEST_SSH_ENABLE_KEX'}) { |
| + | push @cfgarr, 'KexAlgorithms +' . $ENV{'CURL_TEST_SSH_ENABLE_KEX'}; |
| + | } |
| if(($sshdid =~ /OpenSSH/) && ($sshdvernum >= 750) && $ENV{'CURL_TEST_SSH_DISABLE_KEX'}) { | |
| push @cfgarr, 'KexAlgorithms -' . $ENV{'CURL_TEST_SSH_DISABLE_KEX'}; | |
| } | |