← Commit list

cf3b9657bc

Daniel Stenberg
Daniel Stenberg
2025-09-20
FAILED Duration: 179s

Subject

libssh2: up the minimum requirement to 1.9.0

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

.github/workflows/linux-old.yml +5 -5configure.ac +2 -2docs/INTERNALS.md +1 -1lib/vssh/libssh2.c +2 -57
.github/workflows/linux-old.yml+5 -5
@@ -68,7 +68,7 @@ jobs:
dpkg -i freexian-archive-keyring_2022.06.08_all.deb
echo 'deb http://deb.freexian.com/extended-lts stretch-lts main contrib non-free' | tee /etc/apt/sources.list.d/extended-lts.list
apt-get -o Dpkg::Use-Pty=0 update
- apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends cmake make automake autoconf libtool gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libgnutls28-dev libssh-dev libssh2-1-dev libc-ares-dev heimdal-dev libldap2-dev librtmp-dev stunnel4 groff
+ apt-get -o Dpkg::Use-Pty=0 install -y --no-install-suggests --no-install-recommends cmake make automake autoconf libtool gcc pkg-config libpsl-dev libzstd-dev zlib1g-dev libgnutls28-dev libc-ares-dev heimdal-dev libldap2-dev librtmp-dev stunnel4 groff
# GitHub's actions/checkout needs newer glibc and libstdc++. The latter also depends on
# gcc-8-base, but it doesn't actually seem used in our situation and isn't available in
# the main repo, so force the install.
@@ -80,12 +80,12 @@ jobs:
with:
persist-credentials: false
- - name: 'cmake build-only (out-of-tree, libssh2)'
+ - name: 'cmake build-only (out-of-tree)'
run: |
mkdir bld-1
cd bld-1
cmake .. -DCMAKE_UNITY_BUILD=ON -DCURL_WERROR=ON -DBUILD_SHARED_LIBS=ON \
- -DCURL_USE_GNUTLS=ON -DENABLE_ARES=OFF -DCURL_ZSTD=OFF -DCURL_USE_GSSAPI=OFF -DCURL_USE_LIBSSH2=ON -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON
+ -DCURL_USE_GNUTLS=ON -DENABLE_ARES=OFF -DCURL_ZSTD=OFF -DCURL_USE_GSSAPI=OFF -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF -DUSE_LIBRTMP=ON
make install
src/curl --disable --version
@@ -129,12 +129,12 @@ jobs:
- name: 'autoreconf'
run: autoreconf -if
- - name: 'configure (out-of-tree, c-ares, libssh2, zstd, gssapi)'
+ - name: 'configure (out-of-tree, c-ares, zstd, gssapi)'
run: |
mkdir bld-am
cd bld-am
../configure --disable-dependency-tracking --enable-unity --enable-warnings --enable-werror \
- --with-gnutls --enable-ares --with-libssh2 --with-zstd --with-gssapi --with-librtmp \
+ --with-gnutls --enable-ares --without-libssh2 --with-zstd --with-gssapi --with-librtmp \
--prefix="$PWD"/../curl-install-am
- name: 'autotools curl_config.h'
configure.ac+2 -2
@@ -2292,8 +2292,8 @@ if test X"$OPT_LIBSSH2" != Xno; then
CPPFLAGS="$CPPFLAGS $CPP_SSH2"
LIBS="$LIB_SSH2 $LIBS"
- dnl check for function added in libssh2 version 1.2.8
- AC_CHECK_LIB(ssh2, libssh2_free)
+ dnl check for function added in libssh2 version 1.9.0
+ AC_CHECK_LIB(ssh2, libssh2_agent_get_identity_path)
AC_CHECK_HEADER(libssh2.h,
curl_ssh_msg="enabled (libssh2)"
docs/INTERNALS.md+1 -1
@@ -29,7 +29,7 @@ versions of libs and build tools.
- GnuTLS 3.1.10
- mbedTLS 3.2.0
- zlib 1.2.5.2
- - libssh2 1.2.8
+ - libssh2 1.9.0
- c-ares 1.6.0
- libssh 0.9.0
- libidn2 2.0.0
lib/vssh/libssh2.c+2 -57
@@ -464,26 +464,18 @@ static CURLcode ssh_knownhost(struct Curl_easy *data,
case LIBSSH2_HOSTKEY_TYPE_DSS:
keybit = LIBSSH2_KNOWNHOST_KEY_SSHDSS;
break;
-#ifdef LIBSSH2_HOSTKEY_TYPE_ECDSA_256
case LIBSSH2_HOSTKEY_TYPE_ECDSA_256:
keybit = LIBSSH2_KNOWNHOST_KEY_ECDSA_256;
break;
-#endif
-#ifdef LIBSSH2_HOSTKEY_TYPE_ECDSA_384
case LIBSSH2_HOSTKEY_TYPE_ECDSA_384:
keybit = LIBSSH2_KNOWNHOST_KEY_ECDSA_384;
break;
-#endif
-#ifdef LIBSSH2_HOSTKEY_TYPE_ECDSA_521
case LIBSSH2_HOSTKEY_TYPE_ECDSA_521:
keybit = LIBSSH2_KNOWNHOST_KEY_ECDSA_521;
break;
-#endif
-#ifdef LIBSSH2_HOSTKEY_TYPE_ED25519
case LIBSSH2_HOSTKEY_TYPE_ED25519:
keybit = LIBSSH2_KNOWNHOST_KEY_ED25519;
break;
-#endif
default:
infof(data, "unsupported key type, cannot check knownhosts");
keybit = 0;
@@ -606,22 +598,9 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data,
size_t pub_pos = 0;
size_t b64_pos = 0;
-#ifdef LIBSSH2_HOSTKEY_HASH_SHA256
/* The fingerprint points to static storage (!), do not free() it. */
fingerprint = libssh2_hostkey_hash(sshc->ssh_session,
LIBSSH2_HOSTKEY_HASH_SHA256);
-#else
- const char *hostkey;
- size_t len = 0;
- unsigned char hash[32];
-
- hostkey = libssh2_session_hostkey(sshc->ssh_session, &len, NULL);
- if(hostkey) {
- if(!Curl_sha256it(hash, (const unsigned char *) hostkey, len))
- fingerprint = (char *) hash;
- }
-#endif
-
if(!fingerprint) {
failf(data,
"Denied establishing ssh session: sha256 fingerprint "
@@ -755,24 +734,14 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data,
{
CURLcode result = CURLE_OK;
-#ifdef LIBSSH2_KNOWNHOST_KEY_ED25519
static const char * const hostkey_method_ssh_ed25519
= "ssh-ed25519";
-#endif
-#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_521
static const char * const hostkey_method_ssh_ecdsa_521
= "ecdsa-sha2-nistp521";
-#endif
-#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_384
static const char * const hostkey_method_ssh_ecdsa_384
= "ecdsa-sha2-nistp384";
-#endif
-#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_256
static const char * const hostkey_method_ssh_ecdsa_256
= "ecdsa-sha2-nistp256";
-#endif
- static const char * const hostkey_method_ssh_rsa
- = "ssh-rsa";
static const char * const hostkey_method_ssh_rsa_all
= "rsa-sha2-256,rsa-sha2-512,ssh-rsa";
static const char * const hostkey_method_ssh_dss
@@ -830,35 +799,20 @@ static CURLcode ssh_force_knownhost_key_type(struct Curl_easy *data,
conn->host.name, data->set.str[STRING_SSH_KNOWNHOSTS]);
switch(store->typemask & LIBSSH2_KNOWNHOST_KEY_MASK) {
-#ifdef LIBSSH2_KNOWNHOST_KEY_ED25519
case LIBSSH2_KNOWNHOST_KEY_ED25519:
hostkey_method = hostkey_method_ssh_ed25519;
break;
-#endif
-#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_521
case LIBSSH2_KNOWNHOST_KEY_ECDSA_521:
hostkey_method = hostkey_method_ssh_ecdsa_521;
break;
-#endif
-#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_384
case LIBSSH2_KNOWNHOST_KEY_ECDSA_384:
hostkey_method = hostkey_method_ssh_ecdsa_384;
break;
-#endif
-#ifdef LIBSSH2_KNOWNHOST_KEY_ECDSA_256
case LIBSSH2_KNOWNHOST_KEY_ECDSA_256:
hostkey_method = hostkey_method_ssh_ecdsa_256;
break;
-#endif
case LIBSSH2_KNOWNHOST_KEY_SSHRSA:
- if(libssh2_version(0x010900))
- /* since 1.9.0 libssh2_session_method_pref() works as expected */
- hostkey_method = hostkey_method_ssh_rsa_all;
- else
- /* old libssh2 which cannot correctly remove unsupported methods due
- * to bug in src/kex.c or does not support the new methods anyways.
- */
- hostkey_method = hostkey_method_ssh_rsa;
+ hostkey_method = hostkey_method_ssh_rsa_all;
break;
case LIBSSH2_KNOWNHOST_KEY_SSHDSS:
hostkey_method = hostkey_method_ssh_dss;
@@ -2428,18 +2382,9 @@ static CURLcode ssh_state_scp_download_init(struct Curl_easy *data,
*/
/* get a fresh new channel from the ssh layer */
-#if LIBSSH2_VERSION_NUM < 0x010700
- struct stat sb;
- memset(&sb, 0, sizeof(struct stat));
- sshc->ssh_channel = libssh2_scp_recv(sshc->ssh_session,
- sshp->path, &sb);
-#else
libssh2_struct_stat sb;
memset(&sb, 0, sizeof(libssh2_struct_stat));
- sshc->ssh_channel = libssh2_scp_recv2(sshc->ssh_session,
- sshp->path, &sb);
-#endif
-
+ sshc->ssh_channel = libssh2_scp_recv2(sshc->ssh_session, sshp->path, &sb);
if(!sshc->ssh_channel) {
int ssh_err;
char *err_msg = NULL;