shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 10:40:27 +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

30
tests/unittests/torture_pki_rsa.c
View File

@@ -196,7 +196,7 @@ static void torture_pki_rsa_import_privkey_base64(void **state)
(void) state; /* unused */
key_str = torture_pki_read_file(LIBSSH_RSA_TESTKEY);
assert_true(key_str != NULL);
assert_non_null(key_str);
rc = ssh_pki_import_privkey_base64(key_str, passphrase, NULL, NULL, &key);
assert_true(rc == 0);
@@ -276,7 +276,7 @@ static void torture_pki_rsa_copy_cert_to_privkey(void **state)
assert_true(rc == SSH_ERROR);
/* A public key doesn't have a cert, copy should fail. */
assert_true(pubkey->cert == NULL);
assert_null(pubkey->cert);
rc = ssh_pki_copy_cert_to_privkey(pubkey, privkey);
assert_true(rc == SSH_ERROR);
@@ -325,7 +325,7 @@ static void torture_pki_rsa_publickey_base64(void **state)
(void) state; /* unused */
key_buf = strdup(torture_get_testkey_pub(SSH_KEYTYPE_RSA, 0));
assert_true(key_buf != NULL);
assert_non_null(key_buf);
q = p = key_buf;
while (p != NULL && *p != '\0' && *p != ' ') p++;
@@ -454,9 +454,9 @@ static void torture_pki_rsa_generate_key(void **state)
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 1024, &key);
assert_true(rc == SSH_OK);
assert_true(key != NULL);
assert_non_null(key);
sign = pki_do_sign(key, RSA_HASH, 20);
assert_true(sign != NULL);
assert_non_null(sign);
rc = pki_signature_verify(session,sign,key,RSA_HASH,20);
assert_true(rc == SSH_OK);
ssh_signature_free(sign);
@@ -465,9 +465,9 @@ static void torture_pki_rsa_generate_key(void **state)
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &key);
assert_true(rc == SSH_OK);
assert_true(key != NULL);
assert_non_null(key);
sign = pki_do_sign(key, RSA_HASH, 20);
assert_true(sign != NULL);
assert_non_null(sign);
rc = pki_signature_verify(session,sign,key,RSA_HASH,20);
assert_true(rc == SSH_OK);
ssh_signature_free(sign);
@@ -476,9 +476,9 @@ static void torture_pki_rsa_generate_key(void **state)
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 4096, &key);
assert_true(rc == SSH_OK);
assert_true(key != NULL);
assert_non_null(key);
sign = pki_do_sign(key, RSA_HASH, 20);
assert_true(sign != NULL);
assert_non_null(sign);
rc = pki_signature_verify(session,sign,key,RSA_HASH,20);
assert_true(rc == SSH_OK);
ssh_signature_free(sign);
@@ -501,32 +501,32 @@ static void torture_pki_rsa_sha2(void **state)
/* Setup */
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &key);
assert_true(rc == SSH_OK);
assert_true(key != NULL);
assert_non_null(key);
/* Sign using automatic digest */
sign = pki_do_sign_hash(key, RSA_HASH, 20, SSH_DIGEST_AUTO);
assert_true(sign != NULL);
assert_non_null(sign);
rc = pki_signature_verify(session, sign, key, RSA_HASH, 20);
assert_ssh_return_code(session, rc);
ssh_signature_free(sign);
/* Sign using old SHA1 digest */
sign = pki_do_sign_hash(key, RSA_HASH, 20, SSH_DIGEST_SHA1);
assert_true(sign != NULL);
assert_non_null(sign);
rc = pki_signature_verify(session, sign, key, RSA_HASH, 20);
assert_ssh_return_code(session, rc);
ssh_signature_free(sign);
/* Sign using new SHA256 digest */
sign = pki_do_sign_hash(key, SHA256_HASH, 32, SSH_DIGEST_SHA256);
assert_true(sign != NULL);
assert_non_null(sign);
rc = pki_signature_verify(session, sign, key, SHA256_HASH, 32);
assert_ssh_return_code(session, rc);
ssh_signature_free(sign);
/* Sign using rsa-sha2-512 algorithm */
sign = pki_do_sign_hash(key, SHA512_HASH, 64, SSH_DIGEST_SHA512);
assert_true(sign != NULL);
assert_non_null(sign);
rc = pki_signature_verify(session, sign, key, SHA512_HASH, 64);
assert_ssh_return_code(session, rc);
ssh_signature_free(sign);
@@ -671,7 +671,7 @@ torture_pki_rsa_import_openssh_privkey_base64_passphrase(void **state)
(void) state; /* unused */
keystring = torture_get_openssh_testkey(SSH_KEYTYPE_RSA, 0, 1);
assert_true(keystring != NULL);
assert_non_null(keystring);
rc = ssh_pki_import_privkey_base64(keystring,
passphrase,