OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

crypto: use &error_fatal in crypto tests

Browse Source 
Using error_fatal provides better diagnostics when tests
failed, than using asserts, because we see the text of
the error message.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-06-25 18:48:41 +01:00
parent 295736cfc8
commit 7ea450b0f0
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/test-crypto-hash.c
View File

@ -104,7 +104,7 @@ static void test_hash_alloc(void)
strlen(INPUT_TEXT), strlen(INPUT_TEXT),
&result, &result,
&resultlen, &resultlen,
NULL); &error_fatal);
g_assert(ret == 0); g_assert(ret == 0);
g_assert(resultlen == expected_lens[i]); g_assert(resultlen == expected_lens[i]);
@ -139,7 +139,7 @@ static void test_hash_prealloc(void)
strlen(INPUT_TEXT), strlen(INPUT_TEXT),
&result, &result,
&resultlen, &resultlen,
NULL); &error_fatal);
g_assert(ret == 0); g_assert(ret == 0);
g_assert(resultlen == expected_lens[i]); g_assert(resultlen == expected_lens[i]);
@ -176,7 +176,7 @@ static void test_hash_iov(void)
iov, 3, iov, 3,
&result, &result,
&resultlen, &resultlen,
NULL); &error_fatal);
g_assert(ret == 0); g_assert(ret == 0);
g_assert(resultlen == expected_lens[i]); g_assert(resultlen == expected_lens[i]);
for (j = 0; j < resultlen; j++) { for (j = 0; j < resultlen; j++) {
@ -210,7 +210,7 @@ static void test_hash_digest(void)
INPUT_TEXT, INPUT_TEXT,
strlen(INPUT_TEXT), strlen(INPUT_TEXT),
&digest, &digest,
NULL); &error_fatal);
g_assert(ret == 0); g_assert(ret == 0);
g_assert_cmpstr(digest, ==, expected_outputs[i]); g_assert_cmpstr(digest, ==, expected_outputs[i]);
g_free(digest); g_free(digest);
@ -234,7 +234,7 @@ static void test_hash_base64(void)
INPUT_TEXT, INPUT_TEXT,
strlen(INPUT_TEXT), strlen(INPUT_TEXT),
&digest, &digest,
NULL); &error_fatal);
g_assert(ret == 0); g_assert(ret == 0);
g_assert_cmpstr(digest, ==, expected_outputs_b64[i]); g_assert_cmpstr(digest, ==, expected_outputs_b64[i]);
g_free(digest); g_free(digest);
@ -243,7 +243,8 @@ static void test_hash_base64(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
g_assert(qcrypto_init(NULL) == 0); int ret = qcrypto_init(&error_fatal);
g_assert(ret == 0);
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);
g_test_add_func("/crypto/hash/iov", test_hash_iov); g_test_add_func("/crypto/hash/iov", test_hash_iov);

28
tests/unit/test-crypto-hmac.c
View File

@ -89,7 +89,6 @@ static void test_hmac_alloc(void)
QCryptoHmac *hmac = NULL; QCryptoHmac *hmac = NULL;
uint8_t *result = NULL; uint8_t *result = NULL;
size_t resultlen = 0; size_t resultlen = 0;
Error *err = NULL;
const char *exp_output = NULL; const char *exp_output = NULL;
int ret; int ret;
size_t j; size_t j;
@ -101,14 +100,12 @@ static void test_hmac_alloc(void)
exp_output = data->hex_digest; exp_output = data->hex_digest;
hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY, hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY,
strlen(KEY), &err); strlen(KEY), &error_fatal);
g_assert(err == NULL);
g_assert(hmac != NULL); g_assert(hmac != NULL);
ret = qcrypto_hmac_bytes(hmac, (const char *)INPUT_TEXT, ret = qcrypto_hmac_bytes(hmac, (const char *)INPUT_TEXT,
strlen(INPUT_TEXT), &result, strlen(INPUT_TEXT), &result,
&resultlen, &err); &resultlen, &error_fatal);
g_assert(err == NULL);
g_assert(ret == 0); g_assert(ret == 0);
for (j = 0; j < resultlen; j++) { for (j = 0; j < resultlen; j++) {
@ -131,7 +128,6 @@ static void test_hmac_prealloc(void)
QCryptoHmac *hmac = NULL; QCryptoHmac *hmac = NULL;
uint8_t *result = NULL; uint8_t *result = NULL;
size_t resultlen = 0; size_t resultlen = 0;
Error *err = NULL;
const char *exp_output = NULL; const char *exp_output = NULL;
int ret; int ret;
size_t j; size_t j;
@ -146,14 +142,12 @@ static void test_hmac_prealloc(void)
result = g_new0(uint8_t, resultlen); result = g_new0(uint8_t, resultlen);
hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY, hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY,
strlen(KEY), &err); strlen(KEY), &error_fatal);
g_assert(err == NULL);
g_assert(hmac != NULL); g_assert(hmac != NULL);
ret = qcrypto_hmac_bytes(hmac, (const char *)INPUT_TEXT, ret = qcrypto_hmac_bytes(hmac, (const char *)INPUT_TEXT,
strlen(INPUT_TEXT), &result, strlen(INPUT_TEXT), &result,
&resultlen, &err); &resultlen, &error_fatal);
g_assert(err == NULL);
g_assert(ret == 0); g_assert(ret == 0);
exp_output = data->hex_digest; exp_output = data->hex_digest;
@ -177,7 +171,6 @@ static void test_hmac_iov(void)
QCryptoHmac *hmac = NULL; QCryptoHmac *hmac = NULL;
uint8_t *result = NULL; uint8_t *result = NULL;
size_t resultlen = 0; size_t resultlen = 0;
Error *err = NULL;
const char *exp_output = NULL; const char *exp_output = NULL;
int ret; int ret;
size_t j; size_t j;
@ -194,13 +187,11 @@ static void test_hmac_iov(void)
exp_output = data->hex_digest; exp_output = data->hex_digest;
hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY, hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY,
strlen(KEY), &err); strlen(KEY), &error_fatal);
g_assert(err == NULL);
g_assert(hmac != NULL); g_assert(hmac != NULL);
ret = qcrypto_hmac_bytesv(hmac, iov, 3, &result, ret = qcrypto_hmac_bytesv(hmac, iov, 3, &result,
&resultlen, &err); &resultlen, &error_fatal);
g_assert(err == NULL);
g_assert(ret == 0); g_assert(ret == 0);
for (j = 0; j < resultlen; j++) { for (j = 0; j < resultlen; j++) {
@ -222,7 +213,6 @@ static void test_hmac_digest(void)
QCryptoHmacTestData *data = &test_data[i]; QCryptoHmacTestData *data = &test_data[i];
QCryptoHmac *hmac = NULL; QCryptoHmac *hmac = NULL;
uint8_t *result = NULL; uint8_t *result = NULL;
Error *err = NULL;
const char *exp_output = NULL; const char *exp_output = NULL;
int ret; int ret;
@ -233,14 +223,12 @@ static void test_hmac_digest(void)
exp_output = data->hex_digest; exp_output = data->hex_digest;
hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY, hmac = qcrypto_hmac_new(data->alg, (const uint8_t *)KEY,
strlen(KEY), &err); strlen(KEY), &error_fatal);
g_assert(err == NULL);
g_assert(hmac != NULL); g_assert(hmac != NULL);
ret = qcrypto_hmac_digest(hmac, (const char *)INPUT_TEXT, ret = qcrypto_hmac_digest(hmac, (const char *)INPUT_TEXT,
strlen(INPUT_TEXT), (char **)&result, strlen(INPUT_TEXT), (char **)&result,
&err); &error_fatal);
g_assert(err == NULL);
g_assert(ret == 0); g_assert(ret == 0);
g_assert_cmpstr((const char *)result, ==, exp_output); g_assert_cmpstr((const char *)result, ==, exp_output);