Apply upstream fix instead of skipping rekey test altogether

libssh-0.10.6-rekey-timeout.patch

@@ -0,0 +1,37 @@
+From 96d76161666b117099696afebcef2fe42ae80715 Mon Sep 17 00:00:00 2001
+From: Jakub Jelen <jjelen@redhat.com>
+Date: Tue, 16 May 2023 22:55:11 +0200
+Subject: [PATCH] tests: Give the server more time handle rekey
+
+Signed-off-by: Jakub Jelen <jjelen@redhat.com>
+Reviewed-by: Norbert Pocs <npocs@redhat.com>
+---
+ 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
+
+

libssh.spec

@@ -10,6 +10,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
+Patch1:         libssh-0.10.6-rekey-timeout.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -110,8 +111,7 @@ popd
 %check
 # Tests are randomly failing when run in parallel
 %global _smp_build_ncpus 1
-# the torture rekey tests with different than initial kex is now failing in rawhide because of OpenSSH bug #2203241
+%ctest
-%ctest -E torture_rekey
 
 %files
 %doc AUTHORS BSD CHANGELOG README