From c2776f70c102f1b0a5a743c064cea3ba26193b44 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 6 Aug 2018 08:32:07 +0200 Subject: [PATCH] tests: Improve test checks CID 1394620 Signed-off-by: Andreas Schneider --- tests/unittests/torture_threads_buffer.c | 2 +- tests/unittests/torture_threads_pki_rsa.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/unittests/torture_threads_buffer.c b/tests/unittests/torture_threads_buffer.c index f8a68cea..11252eac 100644 --- a/tests/unittests/torture_threads_buffer.c +++ b/tests/unittests/torture_threads_buffer.c @@ -239,7 +239,7 @@ static void *thread_ssh_buffer_get_ssh_string(void *threadid) assert_non_null(buffer); for (l = 0; l < k; ++l) { - rc = ssh_buffer_add_u32(buffer,htonl(values[i])); + rc = ssh_buffer_add_u32(buffer, htonl(values[i])); assert_int_equal(rc, 0); } rc = ssh_buffer_add_data(buffer,data,j); diff --git a/tests/unittests/torture_threads_pki_rsa.c b/tests/unittests/torture_threads_pki_rsa.c index 2497583a..5cef6a53 100644 --- a/tests/unittests/torture_threads_pki_rsa.c +++ b/tests/unittests/torture_threads_pki_rsa.c @@ -447,12 +447,13 @@ static void torture_pki_rsa_publickey_base64(void **state) static void *thread_pki_rsa_duplicate_key(void *threadid) { - int rc; char *b64_key; char *b64_key_gen; ssh_key pubkey; ssh_key privkey; ssh_key privkey_dup; + int cmp; + int rc; (void) threadid; @@ -471,18 +472,20 @@ static void *thread_pki_rsa_duplicate_key(void *threadid) assert_true(rc == 0); privkey_dup = ssh_key_dup(privkey); - assert_true(privkey_dup != NULL); + assert_non_null(privkey_dup); rc = ssh_pki_export_privkey_to_pubkey(privkey, &pubkey); assert_true(rc == SSH_OK); + assert_non_null(pubkey); rc = ssh_pki_export_pubkey_base64(pubkey, &b64_key_gen); assert_true(rc == 0); + assert_non_null(b64_key_gen); assert_string_equal(b64_key, b64_key_gen); - rc = ssh_key_cmp(privkey, privkey_dup, SSH_KEY_CMP_PRIVATE); - assert_true(rc == 0); + cmp = ssh_key_cmp(privkey, privkey_dup, SSH_KEY_CMP_PRIVATE); + assert_true(cmp == 0); ssh_key_free(pubkey); ssh_key_free(privkey);