diff options
| author | Ben Toews <mastahyeti@gmail.com> | 2019-03-12 10:25:49 -0600 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-04-17 10:21:42 +0200 |
| commit | b1f3cfec34c6a4acf779dac926535217d7312fba (patch) | |
| tree | 30a095cf4be1dae2dc392599a2b6afaf9d0181e9 /tests/server | |
| parent | 78f764b7c983e030f07ad162fa18a3c69aa4a973 (diff) | |
| download | libssh-b1f3cfec34c6a4acf779dac926535217d7312fba.tar.gz libssh-b1f3cfec34c6a4acf779dac926535217d7312fba.tar.xz libssh-b1f3cfec34c6a4acf779dac926535217d7312fba.zip | |
libssh: deprecate SSH_KEYTYPE_ECDSA
This type is imprecise. We often need the ecdsa_nid in addition to the key type
in order to do anything. We replace this singluar ECDSA type with one type per
curve.
Signed-off-by: Ben Toews <mastahyeti@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Diffstat (limited to 'tests/server')
| -rw-r--r-- | tests/server/torture_server.c | 10 | ||||
| -rw-r--r-- | tests/server/torture_server_auth_kbdint.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/server/torture_server.c b/tests/server/torture_server.c index 25742645..19dda32c 100644 --- a/tests/server/torture_server.c +++ b/tests/server/torture_server.c @@ -109,28 +109,28 @@ static int setup_default_server(void **state) "%s/sshd/ssh_host_ed25519_key", s->socket_dir); torture_write_file(ed25519_hostkey, - torture_get_openssh_testkey(SSH_KEYTYPE_ED25519, 0, 0)); + torture_get_openssh_testkey(SSH_KEYTYPE_ED25519, 0)); #ifdef HAVE_DSA snprintf(dsa_hostkey, sizeof(dsa_hostkey), "%s/sshd/ssh_host_dsa_key", s->socket_dir); - torture_write_file(dsa_hostkey, torture_get_testkey(SSH_KEYTYPE_DSS, 0, 0)); + torture_write_file(dsa_hostkey, torture_get_testkey(SSH_KEYTYPE_DSS, 0)); #endif /* HAVE_DSA */ snprintf(rsa_hostkey, sizeof(rsa_hostkey), "%s/sshd/ssh_host_rsa_key", s->socket_dir); - torture_write_file(rsa_hostkey, torture_get_testkey(SSH_KEYTYPE_RSA, 0, 0)); + torture_write_file(rsa_hostkey, torture_get_testkey(SSH_KEYTYPE_RSA, 0)); snprintf(ecdsa_hostkey, sizeof(ecdsa_hostkey), "%s/sshd/ssh_host_ecdsa_key", s->socket_dir); torture_write_file(ecdsa_hostkey, - torture_get_testkey(SSH_KEYTYPE_ECDSA, 521, 0)); + torture_get_testkey(SSH_KEYTYPE_ECDSA_P521, 0)); sftp_server = getenv("TORTURE_SFTP_SERVER"); if (sftp_server == NULL) { @@ -449,7 +449,7 @@ static void torture_server_hostkey_mismatch(void **state) assert_non_null(file); fprintf(file, "127.0.0.10 %s\n", - torture_get_testkey_pub(SSH_KEYTYPE_RSA, 0)); + torture_get_testkey_pub(SSH_KEYTYPE_RSA)); fclose(file); rc = ssh_options_set(session, SSH_OPTIONS_KNOWNHOSTS, known_hosts_file); diff --git a/tests/server/torture_server_auth_kbdint.c b/tests/server/torture_server_auth_kbdint.c index 829a8715..9cb9a20c 100644 --- a/tests/server/torture_server_auth_kbdint.c +++ b/tests/server/torture_server_auth_kbdint.c @@ -551,7 +551,7 @@ static int setup_kbdint_server(void **state) "%s/sshd/ssh_host_ed25519_key", s->socket_dir); torture_write_file(ed25519_hostkey, - torture_get_openssh_testkey(SSH_KEYTYPE_ED25519, 0, 0)); + torture_get_openssh_testkey(SSH_KEYTYPE_ED25519, 0)); /* Create the server state */ ss = (struct server_state_st *)calloc(1, sizeof(struct server_state_st)); |