lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-31 00:03:07 +03:00
Code Activity

tests: Update to unbreak agent_cert test for CentOS 8

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 2ba5a5e976)
This commit is contained in:
Jakub Jelen
2023-04-14 18:42:32 +02:00
parent ec5bd83e50
commit 6a187990c1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/client/torture_auth.c
View File

@ -736,7 +736,7 @@ static void torture_auth_cert(void **state) {
static void torture_auth_agent_cert(void **state) static void torture_auth_agent_cert(void **state)
{ {
#if OPENSSH_VERSION_MAJOR < 8 #if OPENSSH_VERSION_MAJOR < 8 || (OPENSSH_VERSION_MAJOR == 8 && OPENSSH_VERSION_MINOR == 0)
struct torture_state *s = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session; ssh_session session = s->ssh.session;
int rc; int rc;
@ -756,7 +756,7 @@ static void torture_auth_agent_cert(void **state)
"ssh-rsa-cert-v01@openssh.com"); "ssh-rsa-cert-v01@openssh.com");
assert_int_equal(rc, SSH_OK); assert_int_equal(rc, SSH_OK);
} }
#endif /* OPENSSH_VERSION_MAJOR < 8 */ #endif /* OPENSSH_VERSION_MAJOR < 8.1 */
/* Setup loads a different key, tests are exactly the same. */ /* Setup loads a different key, tests are exactly the same. */
torture_auth_agent(state); torture_auth_agent(state);
@ -764,7 +764,7 @@ static void torture_auth_agent_cert(void **state)
static void torture_auth_agent_cert_nonblocking(void **state) static void torture_auth_agent_cert_nonblocking(void **state)
{ {
#if OPENSSH_VERSION_MAJOR < 8 #if OPENSSH_VERSION_MAJOR < 8 || (OPENSSH_VERSION_MAJOR == 8 && OPENSSH_VERSION_MINOR == 0)
struct torture_state *s = *state; struct torture_state *s = *state;
ssh_session session = s->ssh.session; ssh_session session = s->ssh.session;
int rc; int rc;
@ -784,7 +784,7 @@ static void torture_auth_agent_cert_nonblocking(void **state)
"ssh-rsa-cert-v01@openssh.com"); "ssh-rsa-cert-v01@openssh.com");
assert_int_equal(rc, SSH_OK); assert_int_equal(rc, SSH_OK);
} }
#endif /* OPENSSH_VERSION_MAJOR < 8 */ #endif /* OPENSSH_VERSION_MAJOR < 8.1 */
torture_auth_agent_nonblocking(state); torture_auth_agent_nonblocking(state);
} }