diff --git a/0022-libssh-0.10.6-rekey-timeout.patch b/0022-libssh-0.10.6-rekey-timeout.patch new file mode 100644 index 0000000000000000000000000000000000000000..3fe277e236b10177246c255002b6e97664ef332d --- /dev/null +++ b/0022-libssh-0.10.6-rekey-timeout.patch @@ -0,0 +1,35 @@ +From 96d76161666b117099696afebcef2fe42ae80715 Mon Sep 17 00:00:00 2001 +From: Jakub Jelen +Date: Tue, 16 May 2023 22:55:11 +0200 +Subject: [PATCH] tests: Give the server more time handle rekey + +Signed-off-by: Jakub Jelen +Reviewed-by: Norbert Pocs +--- + tests/client/torture_rekey.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/client/torture_rekey.c b/tests/client/torture_rekey.c +index ccd5ae2cf..0fc13b8b3 100644 +--- a/tests/client/torture_rekey.c ++++ b/tests/client/torture_rekey.c +@@ -505,7 +505,7 @@ static void torture_rekey_different_kex(void **state) + memset(data, 'A', 128); + for (i = 0; i < KEX_RETRY; i++) { + ssh_send_ignore(s->ssh.session, data); +- ssh_handle_packets(s->ssh.session, 100); ++ ssh_handle_packets(s->ssh.session, 1000); + + c = s->ssh.session->current_crypto; + /* SHA256 len */ +@@ -583,7 +583,7 @@ static void torture_rekey_server_different_kex(void **state) + memset(data, 'A', 128); + for (i = 0; i < KEX_RETRY; i++) { + ssh_send_ignore(s->ssh.session, data); +- ssh_handle_packets(s->ssh.session, 100); ++ ssh_handle_packets(s->ssh.session, 1000); + + c = s->ssh.session->current_crypto; + /* SHA256 len */ +-- +GitLab diff --git a/libssh.spec b/libssh.spec index 282ee64597bcec8b998418aa789320eea968cacd..467b782266545b127877e0ee45ad68af9cc3ae44 100644 --- a/libssh.spec +++ b/libssh.spec @@ -1,4 +1,4 @@ -%define anolis_release 4 +%define anolis_release 5 %global _smp_build_ncpus 1 Name: libssh @@ -37,6 +37,7 @@ Patch0018: 0018-CVE-2023-6918-tests-Code-coverage-for-ssh_get_pubkey.patch Patch0019: 0019-CVE-2023-6004-torture_config-Allow-multiple-in-usern.patch Patch0020: 0020-Fix-regression-in-IPv6-addresses-in-hostname-parsing.patch Patch0021: 0021-tests-Increase-test-coverage-for-IPv6-address-parsin.patch +Patch0022: 0022-libssh-0.10.6-rekey-timeout.patch BuildRequires: cmake gcc-c++ BuildRequires: openssl-devel zlib-devel krb5-devel libcmocka-devel @@ -147,6 +148,9 @@ popd %doc AUTHORS CHANGELOG README %changelog +* Tue Jun 10 2025 Yihao Yan - 0.10.5-5 +- fix rekey test timeout + * Tue Jun 10 2025 Weisson - 0.10.5-4 - Rebuild for cmake-3.30.5.