diff --git a/0001-an-undeclared-function-is-called-in-the-patch.patch b/0001-an-undeclared-function-is-called-in-the-patch.patch new file mode 100644 index 0000000000000000000000000000000000000000..9ee232923aa4f1b9865fb841795731a926016b07 --- /dev/null +++ b/0001-an-undeclared-function-is-called-in-the-patch.patch @@ -0,0 +1,37 @@ +From 6c3b7fb5e69e5f6c5eef47b4c9348e9491389726 Mon Sep 17 00:00:00 2001 +From: shen-chenbang <1944340417@qq.com> +Date: Fri, 27 Sep 2024 22:07:27 +0800 +Subject: [PATCH] an undeclared function is called in the patch + +--- + ssh-ecdsa.c | 1 + + ssh-rsa.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c +index e4a29cf..cf4f1a2 100644 +--- a/ssh-ecdsa.c ++++ b/ssh-ecdsa.c +@@ -44,6 +44,7 @@ + #include "digest.h" + #define SSHKEY_INTERNAL + #include "sshkey.h" ++#include "ssh-pkcs11.h" + + #include "openbsd-compat/openssl-compat.h" + +diff --git a/ssh-rsa.c b/ssh-rsa.c +index 5139587..a6df447 100644 +--- a/ssh-rsa.c ++++ b/ssh-rsa.c +@@ -35,6 +35,7 @@ + #include "sshkey.h" + #include "digest.h" + #include "log.h" ++#include "ssh-pkcs11.h" + + #include "openbsd-compat/openssl-compat.h" + +-- +2.45.2.windows.1 + diff --git a/openssh-9.3p2.tar.gz b/openssh-9.3p2.tar.gz index a670bd8ef9841e04c51b55d924630261ee007880..80e1ca206dacea61af63e89b24e7ccd951e77e4d 100644 Binary files a/openssh-9.3p2.tar.gz and b/openssh-9.3p2.tar.gz differ diff --git a/openssh.spec b/openssh.spec index 50b2c374d06d49eb503ec60952c3d3fb7b9b1b68..5592e91b2fcec87911497d284e143ee80cba615e 100644 --- a/openssh.spec +++ b/openssh.spec @@ -6,7 +6,7 @@ %{?no_gtk2:%global gtk2 0} %global sshd_uid 74 -%global openssh_release 5 +%global openssh_release 6 Name: openssh Version: 9.3p2 @@ -101,6 +101,7 @@ Patch78: backport-CVE-2023-48795-upstream-implement-strict-key-exchange-i Patch79: backport-CVE-2023-51385-upstream-ban-user-hostnames-with-most-shell-metachar.patch Patch80: backport-fix-CVE-2024-6387.patch Patch81: backport-CVE-2023-51384-upstream-apply-destination-constraints-to-all-p11-ke.patch +Patch82: 0001-an-undeclared-function-is-called-in-the-patch.patch Requires: /sbin/nologin Requires: libselinux >= 2.3-5 audit-libs >= 1.0.8 @@ -251,6 +252,7 @@ popd %patch79 -p1 %patch80 -p1 %patch81 -p1 +%patch82 -p1 autoreconf pushd pam_ssh_agent_auth-pam_ssh_agent_auth-0.10.4 @@ -467,6 +469,12 @@ getent passwd sshd >/dev/null || \ %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* %changelog +* Tue Aug 27 2024 shenchenbang <1944340417@qq.com> - 9.3p2-6 +- Type:bugfix +- CVE: +- SUG:NA +- DESC:Fix an undeclared function is called in the patch + * Fri Jul 12 2024 renmingshuai - 9.3p2-5 - Type:CVE - CVE:CVE-2023-51384