diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2015-05-06 09:47:37 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2015-05-06 09:47:37 +0200 |
commit | 8979150745c04d4aa44370d2e6e7ba5944e2a0de (patch) | |
tree | c7d3d4ee58dee467e84fe1de0ea57ab436f5db3b /tests | |
parent | f81d296e54a3ca153d051ccc2ca335eb47d1ee68 (diff) | |
download | libssh-8979150745c04d4aa44370d2e6e7ba5944e2a0de.tar.gz libssh-8979150745c04d4aa44370d2e6e7ba5944e2a0de.tar.xz libssh-8979150745c04d4aa44370d2e6e7ba5944e2a0de.zip |
tests: Migrate torture_keyfiles to testkey functions
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unittests/torture_keyfiles.c | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/tests/unittests/torture_keyfiles.c b/tests/unittests/torture_keyfiles.c index b1d88c5f..1af4ac67 100644 --- a/tests/unittests/torture_keyfiles.c +++ b/tests/unittests/torture_keyfiles.c @@ -5,17 +5,17 @@ #define LIBSSH_RSA_TESTKEY "libssh_testkey.id_rsa" #define LIBSSH_DSA_TESTKEY "libssh_testkey.id_dsa" -#define LIBSSH_PASSPHRASE "libssh-rocks" static void setup_rsa_key(void **state) { ssh_session session; - int rc; unlink(LIBSSH_RSA_TESTKEY); unlink(LIBSSH_RSA_TESTKEY ".pub"); - rc = system("ssh-keygen -t rsa -q -N \"\" -f " LIBSSH_RSA_TESTKEY); - assert_true(rc == 0); + torture_write_file(LIBSSH_RSA_TESTKEY, + torture_get_testkey(SSH_KEYTYPE_RSA, 0, 0)); + torture_write_file(LIBSSH_RSA_TESTKEY ".pub", + torture_get_testkey_pub(SSH_KEYTYPE_RSA, 0)); session = ssh_new(); *state = session; @@ -23,13 +23,14 @@ static void setup_rsa_key(void **state) { static void setup_dsa_key(void **state) { ssh_session session; - int rc; unlink(LIBSSH_DSA_TESTKEY); unlink(LIBSSH_DSA_TESTKEY ".pub"); - rc = system("ssh-keygen -t dsa -q -N \"\" -f " LIBSSH_DSA_TESTKEY); - assert_true(rc == 0); + torture_write_file(LIBSSH_DSA_TESTKEY, + torture_get_testkey(SSH_KEYTYPE_DSS, 0, 0)); + torture_write_file(LIBSSH_DSA_TESTKEY ".pub", + torture_get_testkey_pub(SSH_KEYTYPE_DSS, 0)); session = ssh_new(); *state = session; @@ -43,13 +44,16 @@ static void setup_both_keys(void **state) { static void setup_both_keys_passphrase(void **state) { ssh_session session; - int rc; - rc = system("ssh-keygen -t rsa -N " LIBSSH_PASSPHRASE " -f " LIBSSH_RSA_TESTKEY); - assert_true(rc == 0); + torture_write_file(LIBSSH_RSA_TESTKEY, + torture_get_testkey(SSH_KEYTYPE_RSA, 0, 1)); + torture_write_file(LIBSSH_RSA_TESTKEY ".pub", + torture_get_testkey_pub(SSH_KEYTYPE_RSA, 0)); - rc = system("ssh-keygen -t dsa -N " LIBSSH_PASSPHRASE " -f " LIBSSH_DSA_TESTKEY); - assert_true(rc == 0); + torture_write_file(LIBSSH_DSA_TESTKEY, + torture_get_testkey(SSH_KEYTYPE_DSS, 0, 1)); + torture_write_file(LIBSSH_DSA_TESTKEY ".pub", + torture_get_testkey_pub(SSH_KEYTYPE_DSS, 0)); session = ssh_new(); *state = session; @@ -116,6 +120,7 @@ static void torture_pubkey_generate_from_privkey(void **state) { ssh_string pubkey_new = NULL; char pubkey_line_orig[512] = {0}; char pubkey_line_new[512] = {0}; + char *p; int type_orig = 0; int type_new = 0; int rc; @@ -158,6 +163,16 @@ static void torture_pubkey_generate_from_privkey(void **state) { sizeof(pubkey_line_new)); assert_true(rc == 0); + /* do not compare hostname */ + p = strrchr(pubkey_line_orig, ' '); + if (p != NULL) { + *p = '\0'; + } + p = strrchr(pubkey_line_new, ' '); + if (p != NULL) { + *p = '\0'; + } + assert_string_equal(pubkey_line_orig, pubkey_line_new); ssh_string_free(pubkey_orig); @@ -208,14 +223,14 @@ static void torture_privatekey_from_file_passphrase(void **state) { ssh_session session = *state; ssh_private_key key = NULL; - key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, SSH_KEYTYPE_RSA, LIBSSH_PASSPHRASE); + key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, SSH_KEYTYPE_RSA, TORTURE_TESTKEY_PASSWORD); assert_true(key != NULL); if (key != NULL) { privatekey_free(key); key = NULL; } - key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, SSH_KEYTYPE_DSS, LIBSSH_PASSPHRASE); + key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, SSH_KEYTYPE_DSS, TORTURE_TESTKEY_PASSWORD); assert_true(key != NULL); if (key != NULL) { privatekey_free(key); @@ -223,14 +238,14 @@ static void torture_privatekey_from_file_passphrase(void **state) { } /* Test the automatic type discovery */ - key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, 0, LIBSSH_PASSPHRASE); + key = privatekey_from_file(session, LIBSSH_RSA_TESTKEY, 0, TORTURE_TESTKEY_PASSWORD); assert_true(key != NULL); if (key != NULL) { privatekey_free(key); key = NULL; } - key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, 0, LIBSSH_PASSPHRASE); + key = privatekey_from_file(session, LIBSSH_DSA_TESTKEY, 0, TORTURE_TESTKEY_PASSWORD); assert_true(key != NULL); if (key != NULL) { privatekey_free(key); |