aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson Toshiyuki Sasaki <ansasaki@redhat.com>2018-09-13 13:53:45 +0200
committerAndreas Schneider <asn@cryptomilk.org>2018-09-18 10:19:59 +0200
commit82c3faa44d99063f9d866767d3f9379e9f0d29b0 (patch)
treec833262ee90f670c0c035e3a17db496ad6962ef6
parent7c75e76d10c83744f451f9b75b79aebc3afc5b86 (diff)
downloadlibssh-82c3faa44d99063f9d866767d3f9379e9f0d29b0.tar.gz
libssh-82c3faa44d99063f9d866767d3f9379e9f0d29b0.tar.xz
libssh-82c3faa44d99063f9d866767d3f9379e9f0d29b0.zip
tests: Add return and null checks in torture_options.c
Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--tests/unittests/torture_options.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/tests/unittests/torture_options.c b/tests/unittests/torture_options.c
index a4e83285..0053cf1b 100644
--- a/tests/unittests/torture_options.c
+++ b/tests/unittests/torture_options.c
@@ -250,8 +250,10 @@ static void torture_options_get_user(void **state) {
char* user = NULL;
int rc;
rc = ssh_options_set(session, SSH_OPTIONS_USER, "magicaltrevor");
- assert_true(rc == SSH_OK);
+ assert_int_equal(rc, SSH_OK);
rc = ssh_options_get(session, SSH_OPTIONS_USER, &user);
+ assert_int_equal(rc, SSH_OK);
+ assert_non_null(user);
assert_string_equal(user, "magicaltrevor");
free(user);
}
@@ -329,15 +331,17 @@ static void torture_options_get_identity(void **state) {
rc = ssh_options_set(session, SSH_OPTIONS_ADD_IDENTITY, "identity1");
assert_true(rc == 0);
rc = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &identity);
- assert_true(rc == SSH_OK);
+ assert_int_equal(rc, SSH_OK);
+ assert_non_null(identity);
assert_string_equal(identity, "identity1");
SAFE_FREE(identity);
rc = ssh_options_set(session, SSH_OPTIONS_IDENTITY, "identity2");
- assert_true(rc == 0);
+ assert_int_equal(rc, SSH_OK);
assert_string_equal(session->opts.identity->root->data, "identity2");
rc = ssh_options_get(session, SSH_OPTIONS_IDENTITY, &identity);
- assert_true(rc == SSH_OK);
+ assert_int_equal(rc, SSH_OK);
+ assert_non_null(identity);
assert_string_equal(identity, "identity2");
free(identity);
}
@@ -562,19 +566,26 @@ static void torture_bind_options_import_key(void **state)
base64_key = torture_get_testkey(SSH_KEYTYPE_RSA, 0, 0);
rc = ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
assert_int_equal(rc, SSH_OK);
+ assert_non_null(key);
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, key);
assert_int_equal(rc, 0);
#ifdef HAVE_DSA
/* set dsa key */
base64_key = torture_get_testkey(SSH_KEYTYPE_DSS, 0, 0);
- ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
+ rc = ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
+ assert_int_equal(rc, SSH_OK);
+ assert_non_null(key);
+
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, key);
assert_int_equal(rc, 0);
#endif
/* set ecdsa key */
base64_key = torture_get_testkey(SSH_KEYTYPE_ECDSA, 512, 0);
- ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
+ rc = ssh_pki_import_privkey_base64(base64_key, NULL, NULL, NULL, &key);
+ assert_int_equal(rc, SSH_OK);
+ assert_non_null(key);
+
rc = ssh_bind_options_set(bind, SSH_BIND_OPTIONS_IMPORT_KEY, key);
assert_int_equal(rc, 0);
}