diff --git a/SPECS/libssh/CVE-2025-5351.patch b/SPECS/libssh/CVE-2025-5351.patch new file mode 100644 index 00000000000..2f95cb7bb71 --- /dev/null +++ b/SPECS/libssh/CVE-2025-5351.patch @@ -0,0 +1,34 @@ +From bcffcb587d88f0a50a4965822ce164ed9178bfb3 Mon Sep 17 00:00:00 2001 +From: Azure Linux Security Servicing Account + +Date: Thu, 10 Jul 2025 13:22:23 +0000 +Subject: [PATCH] Fix CVE CVE-2025-5351 in libssh + +Upstream Patch Reference: https://git.libssh.org/projects/libssh.git/patch/?id=6ddb730a27338983851248af59b128b995aad256 +--- + src/pki_crypto.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pki_crypto.c b/src/pki_crypto.c +index 5b0d7de..aec4954 100644 +--- a/src/pki_crypto.c ++++ b/src/pki_crypto.c +@@ -2023,6 +2023,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key) + bignum_safe_free(bn); + bignum_safe_free(be); + OSSL_PARAM_free(params); ++ params = NULL; + #endif /* OPENSSL_VERSION_NUMBER */ + break; + } +@@ -2143,6 +2144,7 @@ ssh_string pki_publickey_to_blob(const ssh_key key) + */ + #if 0 + OSSL_PARAM_free(params); ++ params = NULL; + #endif /* OPENSSL_VERSION_NUMBER */ + + if (key->type == SSH_KEYTYPE_SK_ECDSA && +-- +2.45.3 + diff --git a/SPECS/libssh/libssh.spec b/SPECS/libssh/libssh.spec index 238cea54e00..20e25821593 100644 --- a/SPECS/libssh/libssh.spec +++ b/SPECS/libssh/libssh.spec @@ -2,7 +2,7 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: libssh Version: 0.10.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library implementing the SSH protocol License: LGPLv2+ URL: http://www.libssh.org @@ -12,6 +12,7 @@ Source1: https://www.libssh.org/files/0.10/%{name}-%{version}.tar.xz.asc Source2: https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/%{name}.keyring Source3: libssh_client.config Source4: libssh_server.config +Patch0: CVE-2025-5351.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -144,6 +145,9 @@ popd %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config %changelog +* Thu Jul 10 2025 Azure Linux Security Servicing Account - 0.10.6-2 +- Patch for CVE-2025-5351 + * Tue Feb 25 2025 CBL-Mariner Servicing Account - 0.10.6-1 - Auto-upgrade to 0.10.6 - for CVE-2023-6004, CVE-2023-6918 & CVE-2023-48795 [Medium] diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 52c662c18e7..eca84e5e6d1 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -193,8 +193,8 @@ e2fsprogs-1.47.0-2.azl3.aarch64.rpm e2fsprogs-devel-1.47.0-2.azl3.aarch64.rpm libsolv-0.7.28-3.azl3.aarch64.rpm libsolv-devel-0.7.28-3.azl3.aarch64.rpm -libssh2-1.11.1-1.azl3.aarch64.rpm -libssh2-devel-1.11.1-1.azl3.aarch64.rpm +libssh2-0.10.6-2.azl3.aarch64.rpm +libssh2-devel-0.10.6-2.azl3.aarch64.rpm krb5-1.21.3-2.azl3.aarch64.rpm krb5-devel-1.21.3-2.azl3.aarch64.rpm nghttp2-1.61.0-2.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 48d07af5196..daa8b92c393 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -193,8 +193,8 @@ e2fsprogs-1.47.0-2.azl3.x86_64.rpm e2fsprogs-devel-1.47.0-2.azl3.x86_64.rpm libsolv-0.7.28-3.azl3.x86_64.rpm libsolv-devel-0.7.28-3.azl3.x86_64.rpm -libssh2-1.11.1-1.azl3.x86_64.rpm -libssh2-devel-1.11.1-1.azl3.x86_64.rpm +libssh2-0.10.6-2.azl3.x86_64.rpm +libssh2-devel-0.10.6-2.azl3.x86_64.rpm krb5-1.21.3-2.azl3.x86_64.rpm krb5-devel-1.21.3-2.azl3.x86_64.rpm nghttp2-1.61.0-2.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 6b0ea5ecf2b..b7f02985502 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -229,9 +229,9 @@ libsolv-0.7.28-3.azl3.aarch64.rpm libsolv-debuginfo-0.7.28-3.azl3.aarch64.rpm libsolv-devel-0.7.28-3.azl3.aarch64.rpm libsolv-tools-0.7.28-3.azl3.aarch64.rpm -libssh2-1.11.1-1.azl3.aarch64.rpm -libssh2-debuginfo-1.11.1-1.azl3.aarch64.rpm -libssh2-devel-1.11.1-1.azl3.aarch64.rpm +libssh2-0.10.6-2.azl3.aarch64.rpm +libssh2-debuginfo-0.10.6-2.azl3.aarch64.rpm +libssh2-devel-0.10.6-2.azl3.aarch64.rpm libstdc++-13.2.0-7.azl3.aarch64.rpm libstdc++-devel-13.2.0-7.azl3.aarch64.rpm libtasn1-4.19.0-2.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index ec41b45a86a..121ec22a266 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -237,9 +237,9 @@ libsolv-0.7.28-3.azl3.x86_64.rpm libsolv-debuginfo-0.7.28-3.azl3.x86_64.rpm libsolv-devel-0.7.28-3.azl3.x86_64.rpm libsolv-tools-0.7.28-3.azl3.x86_64.rpm -libssh2-1.11.1-1.azl3.x86_64.rpm -libssh2-debuginfo-1.11.1-1.azl3.x86_64.rpm -libssh2-devel-1.11.1-1.azl3.x86_64.rpm +libssh2-0.10.6-2.azl3.x86_64.rpm +libssh2-debuginfo-0.10.6-2.azl3.x86_64.rpm +libssh2-devel-0.10.6-2.azl3.x86_64.rpm libstdc++-13.2.0-7.azl3.x86_64.rpm libstdc++-devel-13.2.0-7.azl3.x86_64.rpm libtasn1-4.19.0-2.azl3.x86_64.rpm