07e9f73f32
Viktor Szakats
2026-04-19
Subject
runtests: skip setting ed25519 SSH key format
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/windows.yml+1 -2
| @@ -33,7 +33,7 @@ permissions: {} | |
| env: | |
| CURL_CI: github | |
| - | CURL_TEST_MIN: 1750 |
| + | CURL_TEST_MIN: 1800 |
| CURL_TEST_SSH_KEYALGO: ed25519 | |
| OPENSSH_WINDOWS_VERSION: 10.0.0.0p2-Preview | |
| OPENSSH_WINDOWS_SHA256_ARM64: 698c6aec31c1dd0fb996206e8741f4531a97355686b5431ef347d531b07fcd42 | |
| @@ -76,7 +76,6 @@ jobs: | |
| run: | |
| shell: D:\cygwin\bin\bash.exe '{0}' # zizmor: ignore[misfeature] | |
| env: | |
| - | CURL_TEST_MIN: 1800 |
| LDFLAGS: -s | |
| MAKEFLAGS: -j 5 | |
| SHELLOPTS: 'igncr' | |
tests/sshserver.pl+2 -3
| @@ -406,14 +406,13 @@ if((! -e pp($hstprvkeyf)) || (! -s pp($hstprvkeyf)) || | |
| pp($hstpubsha256f), pp($cliprvkeyf), pp($clipubkeyf)); | |
| my @sshkeygenopt; | |
| - | if(($sshid =~ /OpenSSH/) && ($sshvernum >= 560)) { |
| + | if(($sshid =~ /OpenSSH/) && ($sshvernum >= 560) && ($keyalgo ne 'ed25519')) { |
| # Override the default key format. Necessary to force legacy PEM format | |
| # for libssh2 crypto backends that do not understand the OpenSSH (RFC4716) | |
| # format, e.g. WinCNG. | |
| # Accepted values: RFC4716, PKCS8, PEM (see also 'man ssh-keygen') | |
| - | push @sshkeygenopt, '-m'; |
| # Default to the most compatible format for tests. | |
| - | push @sshkeygenopt, $ENV{'CURL_TEST_SSH_KEY_FORMAT'} ? $ENV{'CURL_TEST_SSH_KEY_FORMAT'} : 'PEM'; |
| + | push @sshkeygenopt, '-m', $ENV{'CURL_TEST_SSH_KEY_FORMAT'} ? $ENV{'CURL_TEST_SSH_KEY_FORMAT'} : 'PEM'; |
| } | |
| logmsg "generating host keys...\n" if($verbose); | |
| if(system($sshkeygen, ('-q', '-t', $keyalgo, '-f', pp($hstprvkeyf), '-C', 'curl test server', '-N', '', @sshkeygenopt))) { | |