1
0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-26 01:03:15 +03:00

Remove remained HAVE_DSA ifdefs and WITH_DSA

Signed-off-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Norbert Pocs
2023-05-30 16:27:43 +02:00
parent 5c7bfaa5f6
commit 3951bbabd5
5 changed files with 1 additions and 40 deletions

View File

@@ -145,7 +145,6 @@ close_fp:
return rc;
}
#ifndef HAVE_DSA
static int setup_knownhosts_file_unsupported_type(void **state)
{
char *tmp_file = NULL;
@@ -175,7 +174,6 @@ close_fp:
return rc;
}
#endif
static int teardown_knownhosts_file(void **state)
{
@@ -429,7 +427,6 @@ static void torture_knownhosts_get_algorithms_names(void **state)
ssh_free(session);
}
#ifndef HAVE_DSA
/* Do not remove this test if we completely remove DSA support! */
static void torture_knownhosts_get_algorithms_names_unsupported(void **state)
{
@@ -452,7 +449,6 @@ static void torture_knownhosts_get_algorithms_names_unsupported(void **state)
ssh_free(session);
}
#endif
static void torture_knownhosts_algorithms_wanted(void **state)
{
@@ -722,11 +718,9 @@ int torture_run_tests(void) {
cmocka_unit_test_setup_teardown(torture_knownhosts_get_algorithms_names,
setup_knownhosts_file,
teardown_knownhosts_file),
#ifndef HAVE_DSA
cmocka_unit_test_setup_teardown(torture_knownhosts_get_algorithms_names_unsupported,
setup_knownhosts_file_unsupported_type,
teardown_knownhosts_file),
#endif
cmocka_unit_test_setup_teardown(torture_knownhosts_algorithms_wanted,
setup_knownhosts_file,
teardown_knownhosts_file),

View File

@@ -1455,11 +1455,6 @@ static void torture_options_apply (void **state) {
id = ssh_path_expand_escape(session, "%d/id_rsa");
rc = ssh_list_append(awaited_list, id);
assert_int_equal(rc, SSH_OK);
#ifdef HAVE_DSA
id = ssh_path_expand_escape(session, "%d/id_dsa");
rc = ssh_list_append(awaited_list, id);
assert_int_equal(rc, SSH_OK);
#endif
assert_int_equal(ssh_list_count(awaited_list),
ssh_list_count(session->opts.identity));