mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-11 02:38:09 +09:00
tests: Skip the workaround forcing SHA1 signatures
In certificate authentication with OpenSSH 8.0, the SHA2 signatures were
not accepted correctly [1]. This was not an issue up until the OpenSSH
8.8p1, which does no longer allow SHA1 signatures by default so this
broke the CI and tests against the new OpenSSH [2].
Fixes !107
[1] https://bugzilla.mindrot.org/show_bug.cgi?id=3016
[2] https://gitlab.com/libssh/libssh-mirror/-/issues/107
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 86ee3f5a00)
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
@@ -551,6 +551,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
|
||||||
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;
|
||||||
@@ -570,6 +571,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 */
|
||||||
|
|
||||||
/* 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);
|
||||||
@@ -577,6 +579,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
|
||||||
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;
|
||||||
@@ -596,6 +599,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 */
|
||||||
|
|
||||||
torture_auth_agent_nonblocking(state);
|
torture_auth_agent_nonblocking(state);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user