shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

tests: Prefer assert_non_null over assert_true

Browse Source 
This also replaces some occurrences of assert_true with assert_null.

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2019-01-15 11:19:49 +01:00
committed by Andreas Schneider
parent 89f58decb6
commit 603b6d7222
14 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unittests/torture_pki.c
View File

@@ -29,10 +29,10 @@ static void torture_pki_keytype(void **state) {
assert_true(type == SSH_KEYTYPE_UNKNOWN);
type_c = ssh_key_type_to_char(SSH_KEYTYPE_UNKNOWN);
assert_true(type_c == NULL);
assert_null(type_c);
type_c = ssh_key_type_to_char(42);
assert_true(type_c == NULL);
assert_null(type_c);
}
static void torture_pki_signature(void **state)
@@ -42,7 +42,7 @@ static void torture_pki_signature(void **state)
(void) state; /* unused */
sig = ssh_signature_new();
assert_true(sig != NULL);
assert_non_null(sig);
ssh_signature_free(sig);
}
@@ -134,7 +134,7 @@ static void torture_pki_verify_mismatch(void **state)
}
rc = ssh_pki_generate(sig_type, key_sizes[sig_type], &key);
assert_true(rc == SSH_OK);
assert_true(key != NULL);
assert_non_null(key);
assert_int_equal(key->type, sig_type);
assert_string_equal(key->type_c, key_types[sig_type]);
@@ -149,7 +149,7 @@ static void torture_pki_verify_mismatch(void **state)
/* Create a valid signature using this key */
sign = pki_do_sign_hash(key, HASH, hash_length, hash);
assert_true(sign != NULL);
assert_non_null(sign);
assert_int_equal(sign->type, key->type);
if (hash == SSH_DIGEST_AUTO) {
assert_string_equal(sign->type_c, key->type_c);
@@ -196,7 +196,7 @@ static void torture_pki_verify_mismatch(void **state)
rc = ssh_pki_generate(key_type, key_sizes[key_type], &verify_key);
assert_true(rc == SSH_OK);
assert_true(verify_key != NULL);
assert_non_null(verify_key);
/* Should gracefully fail, but not crash */
rc = pki_signature_verify(session,
@@ -220,10 +220,10 @@ static void torture_pki_verify_mismatch(void **state)
sig_type,
import_sig->hash_type);
if (sig_type != key_type) {
assert_true(new_sig == NULL);
assert_null(new_sig);
} else {
/* Importing with the same key type should work */
assert_true(new_sig != NULL);
assert_non_null(new_sig);
assert_int_equal(new_sig->type, key->type);
if (key_type == SSH_KEYTYPE_RSA && new_sig->hash_type != SSH_DIGEST_AUTO) {
assert_string_equal(new_sig->type_c, hash_signatures[new_sig->hash_type]);