From ea69da32665f90a6d970389207ca44bddfd7ec65 Mon Sep 17 00:00:00 2001 From: shen-chenbang <1944340417@qq.com> Date: Fri, 27 Sep 2024 23:22:56 +0800 Subject: [PATCH] support clang --- openssh-9.3p1-merged-openssl-evp.patch | 2 +- openssh.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/openssh-9.3p1-merged-openssl-evp.patch b/openssh-9.3p1-merged-openssl-evp.patch index d8c2ca3..19aa356 100644 --- a/openssh-9.3p1-merged-openssl-evp.patch +++ b/openssh-9.3p1-merged-openssl-evp.patch @@ -317,7 +317,7 @@ diff --color -ru -x regress -x autom4te.cache -x '*.o' -x '*.lo' -x Makefile -x - digest, sizeof(digest))) != 0) + +#ifdef ENABLE_PKCS11 -+ if (is_ecdsa_pkcs11(key->ecdsa)) { ++ int is_ecdsa_pkcs11(EC_KEY *k); if (key->ecdsa != NULL && is_ecdsa_pkcs11(key->ecdsa)) { + if ((pkey = EVP_PKEY_new()) == NULL || + EVP_PKEY_set1_EC_KEY(pkey, key->ecdsa) != 1) + return SSH_ERR_ALLOC_FAIL; diff --git a/openssh.spec b/openssh.spec index 50b2c37..70f42c3 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 @@ -467,6 +467,9 @@ 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 +- Fix Supplement function definition + * Fri Jul 12 2024 renmingshuai - 9.3p2-5 - Type:CVE - CVE:CVE-2023-51384 -- Gitee