aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-08-30 10:28:57 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-30 10:28:57 +0200
commit822c68eb8e06204170a2b0f9641f5886a45d397f (patch)
tree92b0872cc10f949108848309dc6aeb3ab0307ee9 /tests
parent60b92e458e1cf16f0029d9251e0f117ff27a02d0 (diff)
downloadlibssh-822c68eb8e06204170a2b0f9641f5886a45d397f.tar.gz
libssh-822c68eb8e06204170a2b0f9641f5886a45d397f.tar.xz
libssh-822c68eb8e06204170a2b0f9641f5886a45d397f.zip
pki: Use consistent API for ssh_pki_export_privkey_to_pubkey().
Diffstat (limited to 'tests')
-rw-r--r--tests/unittests/torture_pki.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/unittests/torture_pki.c b/tests/unittests/torture_pki.c
index 02dd818..bf924f2 100644
--- a/tests/unittests/torture_pki.c
+++ b/tests/unittests/torture_pki.c
@@ -292,8 +292,8 @@ static void torture_pki_pki_publickey_from_privatekey_RSA(void **state) {
rc = ssh_pki_import_privkey_base64(key_str, passphrase, NULL, NULL, &key);
assert_true(rc == 0);
- pubkey = ssh_pki_publickey_from_privatekey(key);
- assert_true(pubkey != NULL);
+ rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
+ assert_true(rc == SSH_OK);
free(key_str);
ssh_key_free(key);
@@ -315,8 +315,8 @@ static void torture_pki_pki_publickey_from_privatekey_DSA(void **state) {
rc = ssh_pki_import_privkey_base64(key_str, passphrase, NULL, NULL, &key);
assert_true(rc == 0);
- pubkey = ssh_pki_publickey_from_privatekey(key);
- assert_true(pubkey != NULL);
+ rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
+ assert_true(rc == SSH_OK);
free(key_str);
ssh_key_free(key);
@@ -422,8 +422,8 @@ static void torture_generate_pubkey_from_privkey_rsa(void **state) {
&privkey);
assert_true(rc == 0);
- pubkey = ssh_pki_publickey_from_privatekey(privkey);
- assert_true(pubkey != NULL);
+ rc = ssh_pki_export_privkey_to_pubkey(privkey, &pubkey);
+ assert_true(rc == SSH_OK);
rc = ssh_pki_export_pubkey_file(pubkey, LIBSSH_RSA_TESTKEY ".pub");
assert_true(rc == 0);
@@ -463,8 +463,8 @@ static void torture_generate_pubkey_from_privkey_dsa(void **state) {
&privkey);
assert_true(rc == 0);
- pubkey = ssh_pki_publickey_from_privatekey(privkey);
- assert_true(pubkey != NULL);
+ rc = ssh_pki_export_privkey_to_pubkey(privkey, &pubkey);
+ assert_true(rc == SSH_OK);
rc = ssh_pki_export_pubkey_file(pubkey, LIBSSH_DSA_TESTKEY ".pub");
assert_true(rc == 0);
@@ -508,8 +508,8 @@ static void torture_pki_duplicate_key_rsa(void **state)
privkey_dup = ssh_key_dup(privkey);
assert_true(privkey_dup != NULL);
- pubkey = ssh_pki_publickey_from_privatekey(privkey_dup);
- assert_true(pubkey != NULL);
+ rc = ssh_pki_export_privkey_to_pubkey(privkey, &pubkey);
+ assert_true(rc == SSH_OK);
rc = ssh_pki_export_pubkey_base64(pubkey, &b64_key_gen);
assert_true(rc == 0);
@@ -551,8 +551,8 @@ static void torture_pki_duplicate_key_dsa(void **state)
privkey_dup = ssh_key_dup(privkey);
assert_true(privkey_dup != NULL);
- pubkey = ssh_pki_publickey_from_privatekey(privkey_dup);
- assert_true(pubkey != NULL);
+ rc = ssh_pki_export_privkey_to_pubkey(privkey, &pubkey);
+ assert_true(rc == SSH_OK);
rc = ssh_pki_export_pubkey_base64(pubkey, &b64_key_gen);
assert_true(rc == 0);
@@ -589,7 +589,7 @@ int torture_run_tests(void) {
unit_test_setup_teardown(torture_pki_import_privkey_base64_passphrase,
setup_both_keys_passphrase,
teardown),
- /* ssh_pki_publickey_from_privatekey */
+ /* ssh_pki_export_privkey_to_pubkey */
unit_test_setup_teardown(torture_pki_pki_publickey_from_privatekey_RSA,
setup_rsa_key,
teardown),