yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6253 from tom-cosgrove-arm/rename-assert_compare-to-test_assert_compare

Browse source 
Rename test macros `ASSERT_COMPARE()`, `ASSERT_ALLOC()` and `ASSERT_ALLOC_WEAK()`
This commit is contained in:
Dave Rodgman 2023-08-04 13:45:10 +00:00 committed by GitHub
commit 2ec9892f24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 944 additions and 941 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
tests/include/test/macros.h
View file

@ -107,52 +107,52 @@
* The allocated memory will be filled with zeros. * The allocated memory will be filled with zeros.
* *
* You must set \p pointer to \c NULL before calling this macro and * You must set \p pointer to \c NULL before calling this macro and
* put `mbedtls_free( pointer )` in the test's cleanup code. * put `mbedtls_free(pointer)` in the test's cleanup code.
* *
* If \p length is zero, the resulting \p pointer will be \c NULL. * If \p item_count is zero, the resulting \p pointer will be \c NULL.
* This is usually what we want in tests since API functions are * This is usually what we want in tests since API functions are
* supposed to accept null pointers when a buffer size is zero. * supposed to accept null pointers when a buffer size is zero.
* *
* This macro expands to an instruction, not an expression. * This macro expands to an instruction, not an expression.
* It may jump to the \c exit label. * It may jump to the \c exit label.
* *
* \param pointer An lvalue where the address of the allocated buffer * \param pointer An lvalue where the address of the allocated buffer
* will be stored. * will be stored.
* This expression may be evaluated multiple times. * This expression may be evaluated multiple times.
* \param length Number of elements to allocate. * \param item_count Number of elements to allocate.
* This expression may be evaluated multiple times. * This expression may be evaluated multiple times.
* *
*/ */
#define ASSERT_ALLOC(pointer, length) \ #define TEST_CALLOC(pointer, item_count) \
do \ do { \
{ \ TEST_ASSERT((pointer) == NULL); \
TEST_ASSERT((pointer) == NULL); \ if ((item_count) != 0) { \
if ((length) != 0) \ (pointer) = mbedtls_calloc(sizeof(*(pointer)), \
{ \ (item_count)); \
(pointer) = mbedtls_calloc(sizeof(*(pointer)), \ TEST_ASSERT((pointer) != NULL); \
(length)); \ } \
TEST_ASSERT((pointer) != NULL); \ } while (0)
} \
} \ /* For backwards compatibility */
while (0) #define ASSERT_ALLOC(pointer, item_count) TEST_CALLOC(pointer, item_count)
/** Allocate memory dynamically. If the allocation fails, skip the test case. /** Allocate memory dynamically. If the allocation fails, skip the test case.
* *
* This macro behaves like #ASSERT_ALLOC, except that if the allocation * This macro behaves like #TEST_CALLOC, except that if the allocation
* fails, it marks the test as skipped rather than failed. * fails, it marks the test as skipped rather than failed.
*/ */
#define ASSERT_ALLOC_WEAK(pointer, length) \ #define TEST_CALLOC_OR_SKIP(pointer, item_count) \
do \ do { \
{ \ TEST_ASSERT((pointer) == NULL); \
TEST_ASSERT((pointer) == NULL); \ if ((item_count) != 0) { \
if ((length) != 0) \ (pointer) = mbedtls_calloc(sizeof(*(pointer)), \
{ \ (item_count)); \
(pointer) = mbedtls_calloc(sizeof(*(pointer)), \ TEST_ASSUME((pointer) != NULL); \
(length)); \ } \
TEST_ASSUME((pointer) != NULL); \ } while (0)
} \
} \ /* For backwards compatibility */
while (0) #define ASSERT_ALLOC_WEAK(pointer, item_count) TEST_CALLOC_OR_SKIP(pointer, item_count)
/** Compare two buffers and fail the test case if they differ. /** Compare two buffers and fail the test case if they differ.
* *
@ -166,14 +166,16 @@
* \param size2 Size of the second buffer in bytes. * \param size2 Size of the second buffer in bytes.
* This expression may be evaluated multiple times. * This expression may be evaluated multiple times.
*/ */
#define ASSERT_COMPARE(p1, size1, p2, size2) \ #define TEST_MEMORY_COMPARE(p1, size1, p2, size2) \
do \ do { \
{ \
TEST_EQUAL((size1), (size2)); \ TEST_EQUAL((size1), (size2)); \
if ((size1) != 0) \ if ((size1) != 0) { \
TEST_ASSERT(memcmp((p1), (p2), (size1)) == 0); \ TEST_ASSERT(memcmp((p1), (p2), (size1)) == 0); \
} \ } \
while (0) } while (0)
/* For backwards compatibility */
#define ASSERT_COMPARE(p1, size1, p2, size2) TEST_MEMORY_COMPARE(p1, size1, p2, size2)
/** /**
* \brief This macro tests the expression passed to it and skips the * \brief This macro tests the expression passed to it and skips the

10
tests/src/psa_exercise_key.c
View file

@ -506,7 +506,7 @@ psa_status_t mbedtls_test_psa_key_agreement_with_self(
key_bits = psa_get_key_bits(&attributes); key_bits = psa_get_key_bits(&attributes);
public_key_type = PSA_KEY_TYPE_PUBLIC_KEY_OF_KEY_PAIR(private_key_type); public_key_type = PSA_KEY_TYPE_PUBLIC_KEY_OF_KEY_PAIR(private_key_type);
public_key_length = PSA_EXPORT_PUBLIC_KEY_OUTPUT_SIZE(public_key_type, key_bits); public_key_length = PSA_EXPORT_PUBLIC_KEY_OUTPUT_SIZE(public_key_type, key_bits);
ASSERT_ALLOC(public_key, public_key_length); TEST_CALLOC(public_key, public_key_length);
PSA_ASSERT(psa_export_public_key(key, public_key, public_key_length, PSA_ASSERT(psa_export_public_key(key, public_key, public_key_length,
&public_key_length)); &public_key_length));
@ -548,7 +548,7 @@ psa_status_t mbedtls_test_psa_raw_key_agreement_with_self(
key_bits = psa_get_key_bits(&attributes); key_bits = psa_get_key_bits(&attributes);
public_key_type = PSA_KEY_TYPE_PUBLIC_KEY_OF_KEY_PAIR(private_key_type); public_key_type = PSA_KEY_TYPE_PUBLIC_KEY_OF_KEY_PAIR(private_key_type);
public_key_length = PSA_EXPORT_PUBLIC_KEY_OUTPUT_SIZE(public_key_type, key_bits); public_key_length = PSA_EXPORT_PUBLIC_KEY_OUTPUT_SIZE(public_key_type, key_bits);
ASSERT_ALLOC(public_key, public_key_length); TEST_CALLOC(public_key, public_key_length);
PSA_ASSERT(psa_export_public_key(key, PSA_ASSERT(psa_export_public_key(key,
public_key, public_key_length, public_key, public_key_length,
&public_key_length)); &public_key_length));
@ -838,7 +838,7 @@ static int exercise_export_key(mbedtls_svc_key_id_t key,
exported_size = PSA_EXPORT_KEY_OUTPUT_SIZE( exported_size = PSA_EXPORT_KEY_OUTPUT_SIZE(
psa_get_key_type(&attributes), psa_get_key_type(&attributes),
psa_get_key_bits(&attributes)); psa_get_key_bits(&attributes));
ASSERT_ALLOC(exported, exported_size); TEST_CALLOC(exported, exported_size);
if ((usage & PSA_KEY_USAGE_EXPORT) == 0 && if ((usage & PSA_KEY_USAGE_EXPORT) == 0 &&
!PSA_KEY_TYPE_IS_PUBLIC_KEY(psa_get_key_type(&attributes))) { !PSA_KEY_TYPE_IS_PUBLIC_KEY(psa_get_key_type(&attributes))) {
@ -881,7 +881,7 @@ static int exercise_export_public_key(mbedtls_svc_key_id_t key)
exported_size = PSA_EXPORT_KEY_OUTPUT_SIZE( exported_size = PSA_EXPORT_KEY_OUTPUT_SIZE(
psa_get_key_type(&attributes), psa_get_key_type(&attributes),
psa_get_key_bits(&attributes)); psa_get_key_bits(&attributes));
ASSERT_ALLOC(exported, exported_size); TEST_CALLOC(exported, exported_size);
TEST_EQUAL(psa_export_public_key(key, exported, TEST_EQUAL(psa_export_public_key(key, exported,
exported_size, &exported_length), exported_size, &exported_length),
@ -894,7 +894,7 @@ static int exercise_export_public_key(mbedtls_svc_key_id_t key)
psa_get_key_type(&attributes)); psa_get_key_type(&attributes));
exported_size = PSA_EXPORT_PUBLIC_KEY_OUTPUT_SIZE(public_type, exported_size = PSA_EXPORT_PUBLIC_KEY_OUTPUT_SIZE(public_type,
psa_get_key_bits(&attributes)); psa_get_key_bits(&attributes));
ASSERT_ALLOC(exported, exported_size); TEST_CALLOC(exported, exported_size);
PSA_ASSERT(psa_export_public_key(key, PSA_ASSERT(psa_export_public_key(key,
exported, exported_size, exported, exported_size,

8
tests/src/test_helpers/ssl_helpers.c
View file

@ -91,7 +91,7 @@ void mbedtls_test_init_handshake_options(
opts->resize_buffers = 1; opts->resize_buffers = 1;
#if defined(MBEDTLS_SSL_CACHE_C) #if defined(MBEDTLS_SSL_CACHE_C)
opts->cache = NULL; opts->cache = NULL;
ASSERT_ALLOC(opts->cache, 1); TEST_CALLOC(opts->cache, 1);
mbedtls_ssl_cache_init(opts->cache); mbedtls_ssl_cache_init(opts->cache);
#if defined(MBEDTLS_HAVE_TIME) #if defined(MBEDTLS_HAVE_TIME)
TEST_EQUAL(mbedtls_ssl_cache_get_timeout(opts->cache), TEST_EQUAL(mbedtls_ssl_cache_get_timeout(opts->cache),
@ -627,9 +627,9 @@ int mbedtls_test_ssl_endpoint_certificate_init(mbedtls_test_ssl_endpoint *ep,
} }
cert = &(ep->cert); cert = &(ep->cert);
ASSERT_ALLOC(cert->ca_cert, 1); TEST_CALLOC(cert->ca_cert, 1);
ASSERT_ALLOC(cert->cert, 1); TEST_CALLOC(cert->cert, 1);
ASSERT_ALLOC(cert->pkey, 1); TEST_CALLOC(cert->pkey, 1);
mbedtls_x509_crt_init(cert->ca_cert); mbedtls_x509_crt_init(cert->ca_cert);
mbedtls_x509_crt_init(cert->cert); mbedtls_x509_crt_init(cert->cert);

28
tests/suites/test_suite_aes.function
View file

@ -38,13 +38,13 @@ static int test_copy(const data_t *key,
// Encrypt with copied context // Encrypt with copied context
TEST_ASSERT(mbedtls_aes_crypt_ecb(enc, MBEDTLS_AES_ENCRYPT, TEST_ASSERT(mbedtls_aes_crypt_ecb(enc, MBEDTLS_AES_ENCRYPT,
plaintext, output) == 0); plaintext, output) == 0);
ASSERT_COMPARE(ciphertext, 16, output, 16); TEST_MEMORY_COMPARE(ciphertext, 16, output, 16);
mbedtls_aes_free(enc); mbedtls_aes_free(enc);
// Decrypt with copied context // Decrypt with copied context
TEST_ASSERT(mbedtls_aes_crypt_ecb(dec, MBEDTLS_AES_DECRYPT, TEST_ASSERT(mbedtls_aes_crypt_ecb(dec, MBEDTLS_AES_DECRYPT,
ciphertext, output) == 0); ciphertext, output) == 0);
ASSERT_COMPARE(plaintext, 16, output, 16); TEST_MEMORY_COMPARE(plaintext, 16, output, 16);
mbedtls_aes_free(dec); mbedtls_aes_free(dec);
return 1; return 1;
@ -545,9 +545,9 @@ void aes_ecb_copy_context(data_t *key)
struct align1 *dec1 = NULL; struct align1 *dec1 = NULL;
/* All peak alignment */ /* All peak alignment */
ASSERT_ALLOC(src0, 1); TEST_CALLOC(src0, 1);
ASSERT_ALLOC(enc0, 1); TEST_CALLOC(enc0, 1);
ASSERT_ALLOC(dec0, 1); TEST_CALLOC(dec0, 1);
if (!test_copy(key, &src0->ctx, &enc0->ctx, &dec0->ctx)) { if (!test_copy(key, &src0->ctx, &enc0->ctx, &dec0->ctx)) {
goto exit; goto exit;
} }
@ -559,9 +559,9 @@ void aes_ecb_copy_context(data_t *key)
dec0 = NULL; dec0 = NULL;
/* Original shifted */ /* Original shifted */
ASSERT_ALLOC(src1, 1); TEST_CALLOC(src1, 1);
ASSERT_ALLOC(enc0, 1); TEST_CALLOC(enc0, 1);
ASSERT_ALLOC(dec0, 1); TEST_CALLOC(dec0, 1);
if (!test_copy(key, &src1->ctx, &enc0->ctx, &dec0->ctx)) { if (!test_copy(key, &src1->ctx, &enc0->ctx, &dec0->ctx)) {
goto exit; goto exit;
} }
@ -573,9 +573,9 @@ void aes_ecb_copy_context(data_t *key)
dec0 = NULL; dec0 = NULL;
/* Copies shifted */ /* Copies shifted */
ASSERT_ALLOC(src0, 1); TEST_CALLOC(src0, 1);
ASSERT_ALLOC(enc1, 1); TEST_CALLOC(enc1, 1);
ASSERT_ALLOC(dec1, 1); TEST_CALLOC(dec1, 1);
if (!test_copy(key, &src0->ctx, &enc1->ctx, &dec1->ctx)) { if (!test_copy(key, &src0->ctx, &enc1->ctx, &dec1->ctx)) {
goto exit; goto exit;
} }
@ -587,9 +587,9 @@ void aes_ecb_copy_context(data_t *key)
dec1 = NULL; dec1 = NULL;
/* Source and copies shifted */ /* Source and copies shifted */
ASSERT_ALLOC(src1, 1); TEST_CALLOC(src1, 1);
ASSERT_ALLOC(enc1, 1); TEST_CALLOC(enc1, 1);
ASSERT_ALLOC(dec1, 1); TEST_CALLOC(dec1, 1);
if (!test_copy(key, &src1->ctx, &enc1->ctx, &dec1->ctx)) { if (!test_copy(key, &src1->ctx, &enc1->ctx, &dec1->ctx)) {
goto exit; goto exit;
} }

32
tests/suites/test_suite_aria.function
View file

@ -77,8 +77,8 @@ void aria_encrypt_ecb(data_t *key_str, data_t *src_str,
output + i) == 0); output + i) == 0);
} }
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
} }
exit: exit:
@ -105,8 +105,8 @@ void aria_decrypt_ecb(data_t *key_str, data_t *src_str,
output + i) == 0); output + i) == 0);
} }
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
} }
exit: exit:
@ -130,8 +130,8 @@ void aria_encrypt_cbc(data_t *key_str, data_t *iv_str,
src_str->len, iv_str->x, src_str->x, src_str->len, iv_str->x, src_str->x,
output) == cbc_result); output) == cbc_result);
if (cbc_result == 0) { if (cbc_result == 0) {
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
} }
exit: exit:
@ -155,8 +155,8 @@ void aria_decrypt_cbc(data_t *key_str, data_t *iv_str,
src_str->len, iv_str->x, src_str->x, src_str->len, iv_str->x, src_str->x,
output) == cbc_result); output) == cbc_result);
if (cbc_result == 0) { if (cbc_result == 0) {
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
} }
exit: exit:
@ -182,8 +182,8 @@ void aria_encrypt_cfb128(data_t *key_str, data_t *iv_str,
iv_str->x, src_str->x, output) iv_str->x, src_str->x, output)
== result); == result);
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
exit: exit:
mbedtls_aria_free(&ctx); mbedtls_aria_free(&ctx);
@ -208,8 +208,8 @@ void aria_decrypt_cfb128(data_t *key_str, data_t *iv_str,
iv_str->x, src_str->x, output) iv_str->x, src_str->x, output)
== result); == result);
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
exit: exit:
mbedtls_aria_free(&ctx); mbedtls_aria_free(&ctx);
@ -234,8 +234,8 @@ void aria_encrypt_ctr(data_t *key_str, data_t *iv_str,
iv_str->x, blk, src_str->x, output) iv_str->x, blk, src_str->x, output)
== result); == result);
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
exit: exit:
mbedtls_aria_free(&ctx); mbedtls_aria_free(&ctx);
@ -260,8 +260,8 @@ void aria_decrypt_ctr(data_t *key_str, data_t *iv_str,
iv_str->x, blk, src_str->x, output) iv_str->x, blk, src_str->x, output)
== result); == result);
ASSERT_COMPARE(output, expected_output->len, TEST_MEMORY_COMPARE(output, expected_output->len,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
exit: exit:
mbedtls_aria_free(&ctx); mbedtls_aria_free(&ctx);

14
tests/suites/test_suite_asn1parse.function
View file

@ -135,11 +135,11 @@ int get_len_step(const data_t *input, size_t buffer_size,
/* Allocate a new buffer of exactly the length to parse each time. /* Allocate a new buffer of exactly the length to parse each time.
* This gives memory sanitizers a chance to catch buffer overreads. */ * This gives memory sanitizers a chance to catch buffer overreads. */
if (buffer_size == 0) { if (buffer_size == 0) {
ASSERT_ALLOC(buf, 1); TEST_CALLOC(buf, 1);
end = buf + 1; end = buf + 1;
p = end; p = end;
} else { } else {
ASSERT_ALLOC_WEAK(buf, buffer_size); TEST_CALLOC_OR_SKIP(buf, buffer_size);
if (buffer_size > input->len) { if (buffer_size > input->len) {
memcpy(buf, input->x, input->len); memcpy(buf, input->x, input->len);
memset(buf + input->len, 'A', buffer_size - input->len); memset(buf + input->len, 'A', buffer_size - input->len);
@ -247,7 +247,7 @@ void parse_prefixes(const data_t *input,
mbedtls_test_set_step(buffer_size); mbedtls_test_set_step(buffer_size);
/* Allocate a new buffer of exactly the length to parse each time. /* Allocate a new buffer of exactly the length to parse each time.
* This gives memory sanitizers a chance to catch buffer overreads. */ * This gives memory sanitizers a chance to catch buffer overreads. */
ASSERT_ALLOC(buf, buffer_size); TEST_CALLOC(buf, buffer_size);
memcpy(buf, input->x, buffer_size); memcpy(buf, input->x, buffer_size);
p = buf; p = buf;
ret = nested_parse(&p, buf + buffer_size); ret = nested_parse(&p, buf + buffer_size);
@ -506,7 +506,7 @@ void get_mpi_too_large()
mbedtls_mpi_init(&actual_mpi); mbedtls_mpi_init(&actual_mpi);
ASSERT_ALLOC(buf, size); TEST_CALLOC(buf, size);
buf[0] = 0x02; /* tag: INTEGER */ buf[0] = 0x02; /* tag: INTEGER */
buf[1] = 0x84; /* 4-octet length */ buf[1] = 0x84; /* 4-octet length */
buf[2] = (too_many_octets >> 24) & 0xff; buf[2] = (too_many_octets >> 24) & 0xff;
@ -729,10 +729,10 @@ void free_named_data(int with_oid, int with_val, int with_next)
{ { 0x06, 0, NULL }, { 0, 0, NULL }, NULL, 0 }; { { 0x06, 0, NULL }, { 0, 0, NULL }, NULL, 0 };
if (with_oid) { if (with_oid) {
ASSERT_ALLOC(head.oid.p, 1); TEST_CALLOC(head.oid.p, 1);
} }
if (with_val) { if (with_val) {
ASSERT_ALLOC(head.val.p, 1); TEST_CALLOC(head.val.p, 1);
} }
if (with_next) { if (with_next) {
head.next = &next; head.next = &next;
@ -758,7 +758,7 @@ void free_named_data_list(int length)
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
mbedtls_asn1_named_data *new = NULL; mbedtls_asn1_named_data *new = NULL;
ASSERT_ALLOC(new, 1); TEST_CALLOC(new, 1);
new->next = head; new->next = head;
head = new; head = new;
} }

30
tests/suites/test_suite_asn1write.function
View file

@ -17,7 +17,7 @@ int generic_write_start_step(generic_write_data_t *data)
mbedtls_test_set_step(data->size); mbedtls_test_set_step(data->size);
mbedtls_free(data->output); mbedtls_free(data->output);
data->output = NULL; data->output = NULL;
ASSERT_ALLOC(data->output, data->size == 0 ? 1 : data->size); TEST_CALLOC(data->output, data->size == 0 ? 1 : data->size);
data->end = data->output + data->size; data->end = data->output + data->size;
data->p = data->end; data->p = data->end;
data->start = data->end - data->size; data->start = data->end - data->size;
@ -37,8 +37,8 @@ int generic_write_finish_step(generic_write_data_t *data,
TEST_EQUAL(ret, data->end - data->p); TEST_EQUAL(ret, data->end - data->p);
TEST_ASSERT(data->p >= data->start); TEST_ASSERT(data->p >= data->start);
TEST_ASSERT(data->p <= data->end); TEST_ASSERT(data->p <= data->end);
ASSERT_COMPARE(data->p, (size_t) (data->end - data->p), TEST_MEMORY_COMPARE(data->p, (size_t) (data->end - data->p),
expected->x, expected->len); expected->x, expected->len);
} }
ok = 1; ok = 1;
@ -296,7 +296,7 @@ void mbedtls_asn1_write_algorithm_identifier(data_t *oid,
size_t len_complete = data_len + par_len; size_t len_complete = data_len + par_len;
unsigned char expected_params_tag; unsigned char expected_params_tag;
size_t expected_params_len; size_t expected_params_len;
ASSERT_ALLOC(buf_complete, len_complete); TEST_CALLOC(buf_complete, len_complete);
unsigned char *end_complete = buf_complete + len_complete; unsigned char *end_complete = buf_complete + len_complete;
memcpy(buf_complete, data.p, data_len); memcpy(buf_complete, data.p, data_len);
if (par_len == 0) { if (par_len == 0) {
@ -322,7 +322,7 @@ void mbedtls_asn1_write_algorithm_identifier(data_t *oid,
TEST_EQUAL(mbedtls_asn1_get_alg(&p, end_complete, TEST_EQUAL(mbedtls_asn1_get_alg(&p, end_complete,
&alg, &params), 0); &alg, &params), 0);
TEST_EQUAL(alg.tag, MBEDTLS_ASN1_OID); TEST_EQUAL(alg.tag, MBEDTLS_ASN1_OID);
ASSERT_COMPARE(alg.p, alg.len, oid->x, oid->len); TEST_MEMORY_COMPARE(alg.p, alg.len, oid->x, oid->len);
TEST_EQUAL(params.tag, expected_params_tag); TEST_EQUAL(params.tag, expected_params_tag);
TEST_EQUAL(params.len, expected_params_len); TEST_EQUAL(params.len, expected_params_len);
mbedtls_free(buf_complete); mbedtls_free(buf_complete);
@ -404,7 +404,7 @@ void test_asn1_write_bitstrings(data_t *bitstring, int bits,
TEST_ASSERT(bitstring->len >= byte_length); TEST_ASSERT(bitstring->len >= byte_length);
#if defined(MBEDTLS_ASN1_PARSE_C) #if defined(MBEDTLS_ASN1_PARSE_C)
ASSERT_ALLOC(masked_bitstring, byte_length); TEST_CALLOC(masked_bitstring, byte_length);
if (byte_length != 0) { if (byte_length != 0) {
memcpy(masked_bitstring, bitstring->x, byte_length); memcpy(masked_bitstring, bitstring->x, byte_length);
if (bits % 8 != 0) { if (bits % 8 != 0) {
@ -440,8 +440,8 @@ void test_asn1_write_bitstrings(data_t *bitstring, int bits,
mbedtls_asn1_bitstring read = { 0, 0, NULL }; mbedtls_asn1_bitstring read = { 0, 0, NULL };
TEST_EQUAL(mbedtls_asn1_get_bitstring(&data.p, data.end, TEST_EQUAL(mbedtls_asn1_get_bitstring(&data.p, data.end,
&read), 0); &read), 0);
ASSERT_COMPARE(read.p, read.len, TEST_MEMORY_COMPARE(read.p, read.len,
masked_bitstring, byte_length); masked_bitstring, byte_length);
TEST_EQUAL(read.unused_bits, 8 * byte_length - value_bits); TEST_EQUAL(read.unused_bits, 8 * byte_length - value_bits);
} }
#endif /* MBEDTLS_ASN1_PARSE_C */ #endif /* MBEDTLS_ASN1_PARSE_C */
@ -477,7 +477,7 @@ void store_named_data_find(data_t *oid0, data_t *oid1,
} }
pointers[ARRAY_LENGTH(nd)] = NULL; pointers[ARRAY_LENGTH(nd)] = NULL;
for (i = 0; i < ARRAY_LENGTH(nd); i++) { for (i = 0; i < ARRAY_LENGTH(nd); i++) {
ASSERT_ALLOC(nd[i].oid.p, oid[i]->len); TEST_CALLOC(nd[i].oid.p, oid[i]->len);
memcpy(nd[i].oid.p, oid[i]->x, oid[i]->len); memcpy(nd[i].oid.p, oid[i]->x, oid[i]->len);
nd[i].oid.len = oid[i]->len; nd[i].oid.len = oid[i]->len;
nd[i].next = pointers[i+1]; nd[i].next = pointers[i+1];
@ -529,7 +529,7 @@ void store_named_data_val_found(int old_len, int new_len)
unsigned char *new_val = (unsigned char *) "new value"; unsigned char *new_val = (unsigned char *) "new value";
if (old_len != 0) { if (old_len != 0) {
ASSERT_ALLOC(nd.val.p, (size_t) old_len); TEST_CALLOC(nd.val.p, (size_t) old_len);
old_val = nd.val.p; old_val = nd.val.p;
nd.val.len = old_len; nd.val.len = old_len;
memset(old_val, 'x', old_len); memset(old_val, 'x', old_len);
@ -545,8 +545,8 @@ void store_named_data_val_found(int old_len, int new_len)
TEST_ASSERT(found == head); TEST_ASSERT(found == head);
if (new_val != NULL) { if (new_val != NULL) {
ASSERT_COMPARE(found->val.p, found->val.len, TEST_MEMORY_COMPARE(found->val.p, found->val.len,
new_val, (size_t) new_len); new_val, (size_t) new_len);
} }
if (new_len == 0) { if (new_len == 0) {
TEST_ASSERT(found->val.p == NULL); TEST_ASSERT(found->val.p == NULL);
@ -580,15 +580,15 @@ void store_named_data_val_new(int new_len, int set_new_val)
TEST_ASSERT(found != NULL); TEST_ASSERT(found != NULL);
TEST_ASSERT(found == head); TEST_ASSERT(found == head);
TEST_ASSERT(found->oid.p != oid); TEST_ASSERT(found->oid.p != oid);
ASSERT_COMPARE(found->oid.p, found->oid.len, oid, oid_len); TEST_MEMORY_COMPARE(found->oid.p, found->oid.len, oid, oid_len);
if (new_len == 0) { if (new_len == 0) {
TEST_ASSERT(found->val.p == NULL); TEST_ASSERT(found->val.p == NULL);
} else if (new_val == NULL) { } else if (new_val == NULL) {
TEST_ASSERT(found->val.p != NULL); TEST_ASSERT(found->val.p != NULL);
} else { } else {
TEST_ASSERT(found->val.p != new_val); TEST_ASSERT(found->val.p != new_val);
ASSERT_COMPARE(found->val.p, found->val.len, TEST_MEMORY_COMPARE(found->val.p, found->val.len,
new_val, (size_t) new_len); new_val, (size_t) new_len);
} }
exit: exit:

139
tests/suites/test_suite_bignum_core.function
View file

@ -34,45 +34,45 @@ static int mpi_core_verify_add(mbedtls_mpi_uint *A,
/* A + B => correct result and carry */ /* A + B => correct result and carry */
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, A, B, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, A, B, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* A + B; alias output and first operand => correct result and carry */ /* A + B; alias output and first operand => correct result and carry */
memcpy(X, A, bytes); memcpy(X, A, bytes);
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, X, B, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, X, B, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* A + B; alias output and second operand => correct result and carry */ /* A + B; alias output and second operand => correct result and carry */
memcpy(X, B, bytes); memcpy(X, B, bytes);
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, A, X, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, A, X, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
if (memcmp(A, B, bytes) == 0) { if (memcmp(A, B, bytes) == 0) {
/* A == B, so test where A and B are aliased */ /* A == B, so test where A and B are aliased */
/* A + A => correct result and carry */ /* A + A => correct result and carry */
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, A, A, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, A, A, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* A + A, output aliased to both operands => correct result and carry */ /* A + A, output aliased to both operands => correct result and carry */
memcpy(X, A, bytes); memcpy(X, A, bytes);
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, X, X, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, X, X, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
} else { } else {
/* A != B, so test B + A */ /* A != B, so test B + A */
/* B + A => correct result and carry */ /* B + A => correct result and carry */
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, B, A, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, B, A, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* B + A; alias output and first operand => correct result and carry */ /* B + A; alias output and first operand => correct result and carry */
memcpy(X, B, bytes); memcpy(X, B, bytes);
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, X, A, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, X, A, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* B + A; alias output and second operand => correct result and carry */ /* B + A; alias output and second operand => correct result and carry */
memcpy(X, A, bytes); memcpy(X, A, bytes);
TEST_EQUAL(carry, mbedtls_mpi_core_add(X, B, X, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_add(X, B, X, limbs));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
} }
ret = 1; ret = 1;
@ -111,11 +111,11 @@ static int mpi_core_verify_add_if(mbedtls_mpi_uint *A,
/* cond = 0 => X unchanged, no carry */ /* cond = 0 => X unchanged, no carry */
memcpy(X, A, bytes); memcpy(X, A, bytes);
TEST_EQUAL(0, mbedtls_mpi_core_add_if(X, B, limbs, 0)); TEST_EQUAL(0, mbedtls_mpi_core_add_if(X, B, limbs, 0));
ASSERT_COMPARE(X, bytes, A, bytes); TEST_MEMORY_COMPARE(X, bytes, A, bytes);
/* cond = 1 => correct result and carry */ /* cond = 1 => correct result and carry */
TEST_EQUAL(carry, mbedtls_mpi_core_add_if(X, B, limbs, 1)); TEST_EQUAL(carry, mbedtls_mpi_core_add_if(X, B, limbs, 1));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
if (memcmp(A, B, bytes) == 0) { if (memcmp(A, B, bytes) == 0) {
/* A == B, so test where A and B are aliased */ /* A == B, so test where A and B are aliased */
@ -123,22 +123,22 @@ static int mpi_core_verify_add_if(mbedtls_mpi_uint *A,
/* cond = 0 => X unchanged, no carry */ /* cond = 0 => X unchanged, no carry */
memcpy(X, B, bytes); memcpy(X, B, bytes);
TEST_EQUAL(0, mbedtls_mpi_core_add_if(X, X, limbs, 0)); TEST_EQUAL(0, mbedtls_mpi_core_add_if(X, X, limbs, 0));
ASSERT_COMPARE(X, bytes, B, bytes); TEST_MEMORY_COMPARE(X, bytes, B, bytes);
/* cond = 1 => correct result and carry */ /* cond = 1 => correct result and carry */
TEST_EQUAL(carry, mbedtls_mpi_core_add_if(X, X, limbs, 1)); TEST_EQUAL(carry, mbedtls_mpi_core_add_if(X, X, limbs, 1));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
} else { } else {
/* A != B, so test B + A */ /* A != B, so test B + A */
/* cond = 0 => d unchanged, no carry */ /* cond = 0 => d unchanged, no carry */
memcpy(X, B, bytes); memcpy(X, B, bytes);
TEST_EQUAL(0, mbedtls_mpi_core_add_if(X, A, limbs, 0)); TEST_EQUAL(0, mbedtls_mpi_core_add_if(X, A, limbs, 0));
ASSERT_COMPARE(X, bytes, B, bytes); TEST_MEMORY_COMPARE(X, bytes, B, bytes);
/* cond = 1 => correct result and carry */ /* cond = 1 => correct result and carry */
TEST_EQUAL(carry, mbedtls_mpi_core_add_if(X, A, limbs, 1)); TEST_EQUAL(carry, mbedtls_mpi_core_add_if(X, A, limbs, 1));
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
} }
ret = 1; ret = 1;
@ -458,10 +458,10 @@ void mpi_core_cond_assign(char *input_X,
TEST_CF_PUBLIC(X, bytes); TEST_CF_PUBLIC(X, bytes);
TEST_CF_PUBLIC(Y, bytes); TEST_CF_PUBLIC(Y, bytes);
ASSERT_COMPARE(X, copy_bytes, Y, copy_bytes); TEST_MEMORY_COMPARE(X, copy_bytes, Y, copy_bytes);
TEST_ASSERT(memcmp(X, Y, bytes) != 0); TEST_ASSERT(memcmp(X, Y, bytes) != 0);
} else { } else {
ASSERT_COMPARE(X, bytes, Y, bytes); TEST_MEMORY_COMPARE(X, bytes, Y, bytes);
} }
exit: exit:
@ -493,10 +493,10 @@ void mpi_core_cond_swap(char *input_X,
TEST_EQUAL(limbs_X, limbs_Y); TEST_EQUAL(limbs_X, limbs_Y);
TEST_ASSERT(copy_limbs <= limbs); TEST_ASSERT(copy_limbs <= limbs);
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
memcpy(X, tmp_X, bytes); memcpy(X, tmp_X, bytes);
ASSERT_ALLOC(Y, limbs); TEST_CALLOC(Y, limbs);
memcpy(Y, tmp_Y, bytes); memcpy(Y, tmp_Y, bytes);
/* condition is false */ /* condition is false */
@ -508,8 +508,8 @@ void mpi_core_cond_swap(char *input_X,
TEST_CF_PUBLIC(X, bytes); TEST_CF_PUBLIC(X, bytes);
TEST_CF_PUBLIC(Y, bytes); TEST_CF_PUBLIC(Y, bytes);
ASSERT_COMPARE(X, bytes, tmp_X, bytes); TEST_MEMORY_COMPARE(X, bytes, tmp_X, bytes);
ASSERT_COMPARE(Y, bytes, tmp_Y, bytes); TEST_MEMORY_COMPARE(Y, bytes, tmp_Y, bytes);
/* condition is true */ /* condition is true */
TEST_CF_SECRET(X, bytes); TEST_CF_SECRET(X, bytes);
@ -523,15 +523,15 @@ void mpi_core_cond_swap(char *input_X,
/* Check if the given length is copied even it is smaller /* Check if the given length is copied even it is smaller
than the length of the given MPIs. */ than the length of the given MPIs. */
if (copy_limbs < limbs) { if (copy_limbs < limbs) {
ASSERT_COMPARE(X, copy_bytes, tmp_Y, copy_bytes); TEST_MEMORY_COMPARE(X, copy_bytes, tmp_Y, copy_bytes);
ASSERT_COMPARE(Y, copy_bytes, tmp_X, copy_bytes); TEST_MEMORY_COMPARE(Y, copy_bytes, tmp_X, copy_bytes);
TEST_ASSERT(memcmp(X, tmp_X, bytes) != 0); TEST_ASSERT(memcmp(X, tmp_X, bytes) != 0);
TEST_ASSERT(memcmp(X, tmp_Y, bytes) != 0); TEST_ASSERT(memcmp(X, tmp_Y, bytes) != 0);
TEST_ASSERT(memcmp(Y, tmp_X, bytes) != 0); TEST_ASSERT(memcmp(Y, tmp_X, bytes) != 0);
TEST_ASSERT(memcmp(Y, tmp_Y, bytes) != 0); TEST_ASSERT(memcmp(Y, tmp_Y, bytes) != 0);
} else { } else {
ASSERT_COMPARE(X, bytes, tmp_Y, bytes); TEST_MEMORY_COMPARE(X, bytes, tmp_Y, bytes);
ASSERT_COMPARE(Y, bytes, tmp_X, bytes); TEST_MEMORY_COMPARE(Y, bytes, tmp_X, bytes);
} }
exit: exit:
@ -554,7 +554,7 @@ void mpi_core_shift_r(char *input, int count, char *result)
TEST_EQUAL(limbs, n); TEST_EQUAL(limbs, n);
mbedtls_mpi_core_shift_r(X, limbs, count); mbedtls_mpi_core_shift_r(X, limbs, count);
ASSERT_COMPARE(X, limbs * ciL, Y, limbs * ciL); TEST_MEMORY_COMPARE(X, limbs * ciL, Y, limbs * ciL);
exit: exit:
mbedtls_free(X); mbedtls_free(X);
@ -574,7 +574,7 @@ void mpi_core_shift_l(char *input, int count, char *result)
TEST_EQUAL(limbs, n); TEST_EQUAL(limbs, n);
mbedtls_mpi_core_shift_l(X, limbs, count); mbedtls_mpi_core_shift_l(X, limbs, count);
ASSERT_COMPARE(X, limbs * ciL, Y, limbs * ciL); TEST_MEMORY_COMPARE(X, limbs * ciL, Y, limbs * ciL);
exit: exit:
mbedtls_free(X); mbedtls_free(X);
@ -601,7 +601,7 @@ void mpi_core_add_and_add_if(char *input_A, char *input_B,
TEST_EQUAL(A_limbs, S_limbs); TEST_EQUAL(A_limbs, S_limbs);
size_t limbs = A_limbs; size_t limbs = A_limbs;
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
TEST_ASSERT(mpi_core_verify_add(A, B, limbs, S, carry, X)); TEST_ASSERT(mpi_core_verify_add(A, B, limbs, S, carry, X));
TEST_ASSERT(mpi_core_verify_add_if(A, B, limbs, S, carry, X)); TEST_ASSERT(mpi_core_verify_add_if(A, B, limbs, S, carry, X));
@ -646,15 +646,15 @@ void mpi_core_sub(char *input_A, char *input_B,
/* Now let's get arrays of mbedtls_mpi_uints, rather than MPI structures */ /* Now let's get arrays of mbedtls_mpi_uints, rather than MPI structures */
/* ASSERT_ALLOC() uses calloc() under the hood, so these do get zeroed */ /* TEST_CALLOC() uses calloc() under the hood, so these do get zeroed */
ASSERT_ALLOC(a, bytes); TEST_CALLOC(a, bytes);
ASSERT_ALLOC(b, bytes); TEST_CALLOC(b, bytes);
ASSERT_ALLOC(x, bytes); TEST_CALLOC(x, bytes);
ASSERT_ALLOC(r, bytes); TEST_CALLOC(r, bytes);
/* Populate the arrays. As the mbedtls_mpi_uint[]s in mbedtls_mpis (and as /* Populate the arrays. As the mbedtls_mpi_uint[]s in mbedtls_mpis (and as
* processed by mbedtls_mpi_core_sub()) are little endian, we can just * processed by mbedtls_mpi_core_sub()) are little endian, we can just
* copy what we have as long as MSBs are 0 (which they are from ASSERT_ALLOC()) * copy what we have as long as MSBs are 0 (which they are from TEST_CALLOC())
*/ */
memcpy(a, A.p, A.n * sizeof(mbedtls_mpi_uint)); memcpy(a, A.p, A.n * sizeof(mbedtls_mpi_uint));
memcpy(b, B.p, B.n * sizeof(mbedtls_mpi_uint)); memcpy(b, B.p, B.n * sizeof(mbedtls_mpi_uint));
@ -664,7 +664,7 @@ void mpi_core_sub(char *input_A, char *input_B,
TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, a, b, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, a, b, limbs));
/* 1b) r = a - b => we should get the correct result */ /* 1b) r = a - b => we should get the correct result */
ASSERT_COMPARE(r, bytes, x, bytes); TEST_MEMORY_COMPARE(r, bytes, x, bytes);
/* 2 and 3 test "r may be aliased to a or b" */ /* 2 and 3 test "r may be aliased to a or b" */
/* 2a) r = a; r -= b => we should get the correct carry (use r to avoid clobbering a) */ /* 2a) r = a; r -= b => we should get the correct carry (use r to avoid clobbering a) */
@ -672,20 +672,20 @@ void mpi_core_sub(char *input_A, char *input_B,
TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, r, b, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, r, b, limbs));
/* 2b) r -= b => we should get the correct result */ /* 2b) r -= b => we should get the correct result */
ASSERT_COMPARE(r, bytes, x, bytes); TEST_MEMORY_COMPARE(r, bytes, x, bytes);
/* 3a) r = b; r = a - r => we should get the correct carry (use r to avoid clobbering b) */ /* 3a) r = b; r = a - r => we should get the correct carry (use r to avoid clobbering b) */
memcpy(r, b, bytes); memcpy(r, b, bytes);
TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, a, r, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, a, r, limbs));
/* 3b) r = a - b => we should get the correct result */ /* 3b) r = a - b => we should get the correct result */
ASSERT_COMPARE(r, bytes, x, bytes); TEST_MEMORY_COMPARE(r, bytes, x, bytes);
/* 4 tests "r may be aliased to [...] both" */ /* 4 tests "r may be aliased to [...] both" */
if (A.n == B.n && memcmp(A.p, B.p, bytes) == 0) { if (A.n == B.n && memcmp(A.p, B.p, bytes) == 0) {
memcpy(r, b, bytes); memcpy(r, b, bytes);
TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, r, r, limbs)); TEST_EQUAL(carry, mbedtls_mpi_core_sub(r, r, r, limbs));
ASSERT_COMPARE(r, bytes, x, bytes); TEST_MEMORY_COMPARE(r, bytes, x, bytes);
} }
exit: exit:
@ -759,13 +759,13 @@ void mpi_core_mla(char *input_A, char *input_B, char *input_S,
/* Now let's get arrays of mbedtls_mpi_uints, rather than MPI structures */ /* Now let's get arrays of mbedtls_mpi_uints, rather than MPI structures */
/* ASSERT_ALLOC() uses calloc() under the hood, so these do get zeroed */ /* TEST_CALLOC() uses calloc() under the hood, so these do get zeroed */
ASSERT_ALLOC(a, bytes); TEST_CALLOC(a, bytes);
ASSERT_ALLOC(x, bytes); TEST_CALLOC(x, bytes);
/* Populate the arrays. As the mbedtls_mpi_uint[]s in mbedtls_mpis (and as /* Populate the arrays. As the mbedtls_mpi_uint[]s in mbedtls_mpis (and as
* processed by mbedtls_mpi_core_mla()) are little endian, we can just * processed by mbedtls_mpi_core_mla()) are little endian, we can just
* copy what we have as long as MSBs are 0 (which they are from ASSERT_ALLOC()). * copy what we have as long as MSBs are 0 (which they are from TEST_CALLOC()).
*/ */
memcpy(a, A.p, A.n * sizeof(mbedtls_mpi_uint)); memcpy(a, A.p, A.n * sizeof(mbedtls_mpi_uint));
memcpy(x, X->p, X->n * sizeof(mbedtls_mpi_uint)); memcpy(x, X->p, X->n * sizeof(mbedtls_mpi_uint));
@ -774,13 +774,13 @@ void mpi_core_mla(char *input_A, char *input_B, char *input_S,
TEST_EQUAL(mbedtls_mpi_core_mla(a, limbs, B.p, B.n, *S.p), *cy->p); TEST_EQUAL(mbedtls_mpi_core_mla(a, limbs, B.p, B.n, *S.p), *cy->p);
/* 1b) A += B * s => we should get the correct result */ /* 1b) A += B * s => we should get the correct result */
ASSERT_COMPARE(a, bytes, x, bytes); TEST_MEMORY_COMPARE(a, bytes, x, bytes);
if (A.n == B.n && memcmp(A.p, B.p, bytes) == 0) { if (A.n == B.n && memcmp(A.p, B.p, bytes) == 0) {
/* Check when A and B are aliased */ /* Check when A and B are aliased */
memcpy(a, A.p, A.n * sizeof(mbedtls_mpi_uint)); memcpy(a, A.p, A.n * sizeof(mbedtls_mpi_uint));
TEST_EQUAL(mbedtls_mpi_core_mla(a, limbs, a, limbs, *S.p), *cy->p); TEST_EQUAL(mbedtls_mpi_core_mla(a, limbs, a, limbs, *S.p), *cy->p);
ASSERT_COMPARE(a, bytes, x, bytes); TEST_MEMORY_COMPARE(a, bytes, x, bytes);
} }
exit: exit:
@ -890,14 +890,14 @@ void mpi_core_montmul(int limbs_AN4, int limbs_B4,
mbedtls_mpi_core_montmul(R.p, A.p, B.p, B.n, N.p, N.n, mm, T.p); mbedtls_mpi_core_montmul(R.p, A.p, B.p, B.n, N.p, N.n, mm, T.p);
size_t bytes = N.n * sizeof(mbedtls_mpi_uint); size_t bytes = N.n * sizeof(mbedtls_mpi_uint);
ASSERT_COMPARE(R.p, bytes, X->p, bytes); TEST_MEMORY_COMPARE(R.p, bytes, X->p, bytes);
/* The output (R, above) may be aliased to A - use R to save the value of A */ /* The output (R, above) may be aliased to A - use R to save the value of A */
memcpy(R.p, A.p, bytes); memcpy(R.p, A.p, bytes);
mbedtls_mpi_core_montmul(A.p, A.p, B.p, B.n, N.p, N.n, mm, T.p); mbedtls_mpi_core_montmul(A.p, A.p, B.p, B.n, N.p, N.n, mm, T.p);
ASSERT_COMPARE(A.p, bytes, X->p, bytes); TEST_MEMORY_COMPARE(A.p, bytes, X->p, bytes);
memcpy(A.p, R.p, bytes); /* restore A */ memcpy(A.p, R.p, bytes); /* restore A */
@ -906,7 +906,7 @@ void mpi_core_montmul(int limbs_AN4, int limbs_B4,
memcpy(R.p, N.p, bytes); memcpy(R.p, N.p, bytes);
mbedtls_mpi_core_montmul(N.p, A.p, B.p, B.n, N.p, N.n, mm, T.p); mbedtls_mpi_core_montmul(N.p, A.p, B.p, B.n, N.p, N.n, mm, T.p);
ASSERT_COMPARE(N.p, bytes, X->p, bytes); TEST_MEMORY_COMPARE(N.p, bytes, X->p, bytes);
memcpy(N.p, R.p, bytes); memcpy(N.p, R.p, bytes);
@ -917,7 +917,7 @@ void mpi_core_montmul(int limbs_AN4, int limbs_B4,
* don't bother with yet another test with only A and B aliased */ * don't bother with yet another test with only A and B aliased */
mbedtls_mpi_core_montmul(B.p, B.p, B.p, B.n, N.p, N.n, mm, T.p); mbedtls_mpi_core_montmul(B.p, B.p, B.p, B.n, N.p, N.n, mm, T.p);
ASSERT_COMPARE(B.p, bytes, X->p, bytes); TEST_MEMORY_COMPARE(B.p, bytes, X->p, bytes);
memcpy(B.p, A.p, bytes); /* restore B from equal value A */ memcpy(B.p, A.p, bytes); /* restore B from equal value A */
} }
@ -925,7 +925,7 @@ void mpi_core_montmul(int limbs_AN4, int limbs_B4,
/* The output may be aliased to B - last test, so we don't save B */ /* The output may be aliased to B - last test, so we don't save B */
mbedtls_mpi_core_montmul(B.p, A.p, B.p, B.n, N.p, N.n, mm, T.p); mbedtls_mpi_core_montmul(B.p, A.p, B.p, B.n, N.p, N.n, mm, T.p);
ASSERT_COMPARE(B.p, bytes, X->p, bytes); TEST_MEMORY_COMPARE(B.p, bytes, X->p, bytes);
} }
exit: exit:
@ -1017,8 +1017,8 @@ void mpi_core_ct_uint_table_lookup(int bitlen, int window_size)
mbedtls_mpi_uint *table = NULL; mbedtls_mpi_uint *table = NULL;
mbedtls_mpi_uint *dest = NULL; mbedtls_mpi_uint *dest = NULL;
ASSERT_ALLOC(table, limbs * count); TEST_CALLOC(table, limbs * count);
ASSERT_ALLOC(dest, limbs); TEST_CALLOC(dest, limbs);
/* /*
* Fill the table with a unique counter so that differences are easily * Fill the table with a unique counter so that differences are easily
@ -1046,8 +1046,8 @@ void mpi_core_ct_uint_table_lookup(int bitlen, int window_size)
TEST_CF_PUBLIC(dest, limbs * sizeof(*dest)); TEST_CF_PUBLIC(dest, limbs * sizeof(*dest));
TEST_CF_PUBLIC(table, count * limbs * sizeof(*table)); TEST_CF_PUBLIC(table, count * limbs * sizeof(*table));
ASSERT_COMPARE(dest, limbs * sizeof(*dest), TEST_MEMORY_COMPARE(dest, limbs * sizeof(*dest),
current, limbs * sizeof(*current)); current, limbs * sizeof(*current));
TEST_CF_PUBLIC(&i, sizeof(i)); TEST_CF_PUBLIC(&i, sizeof(i));
} }
@ -1070,7 +1070,7 @@ void mpi_core_fill_random(int wanted_bytes_arg, int extra_rng_bytes,
int ret; int ret;
/* Prepare an RNG with known output, limited to rng_bytes. */ /* Prepare an RNG with known output, limited to rng_bytes. */
ASSERT_ALLOC(rnd_data, rng_bytes); TEST_CALLOC(rnd_data, rng_bytes);
TEST_EQUAL(0, mbedtls_test_rnd_std_rand(NULL, rnd_data, rng_bytes)); TEST_EQUAL(0, mbedtls_test_rnd_std_rand(NULL, rnd_data, rng_bytes));
rnd_info.buf = rnd_data; rnd_info.buf = rnd_data;
@ -1078,7 +1078,7 @@ void mpi_core_fill_random(int wanted_bytes_arg, int extra_rng_bytes,
* extra_limbs may be negative but the total limb count must be positive. * extra_limbs may be negative but the total limb count must be positive.
* Fill the MPI with the byte value in before. */ * Fill the MPI with the byte value in before. */
TEST_LE_U(1, X_limbs); TEST_LE_U(1, X_limbs);
ASSERT_ALLOC(X, X_limbs); TEST_CALLOC(X, X_limbs);
memset(X, before, X_limbs * sizeof(*X)); memset(X, before, X_limbs * sizeof(*X));
ret = mbedtls_mpi_core_fill_random(X, X_limbs, wanted_bytes, ret = mbedtls_mpi_core_fill_random(X, X_limbs, wanted_bytes,
@ -1128,14 +1128,14 @@ void mpi_core_mul(char *input_A,
const size_t X_limbs = A_limbs + B_limbs; const size_t X_limbs = A_limbs + B_limbs;
const size_t X_bytes = X_limbs * sizeof(mbedtls_mpi_uint); const size_t X_bytes = X_limbs * sizeof(mbedtls_mpi_uint);
ASSERT_ALLOC(X, X_limbs); TEST_CALLOC(X, X_limbs);
const size_t A_bytes = A_limbs * sizeof(mbedtls_mpi_uint); const size_t A_bytes = A_limbs * sizeof(mbedtls_mpi_uint);
ASSERT_ALLOC(A_orig, A_limbs); TEST_CALLOC(A_orig, A_limbs);
memcpy(A_orig, A, A_bytes); memcpy(A_orig, A, A_bytes);
const size_t B_bytes = B_limbs * sizeof(mbedtls_mpi_uint); const size_t B_bytes = B_limbs * sizeof(mbedtls_mpi_uint);
ASSERT_ALLOC(B_orig, B_limbs); TEST_CALLOC(B_orig, B_limbs);
memcpy(B_orig, B, B_bytes); memcpy(B_orig, B, B_bytes);
/* Set result to something that is unlikely to be correct */ /* Set result to something that is unlikely to be correct */
@ -1143,24 +1143,24 @@ void mpi_core_mul(char *input_A,
/* 1. X = A * B - result should be correct, A and B unchanged */ /* 1. X = A * B - result should be correct, A and B unchanged */
mbedtls_mpi_core_mul(X, A, A_limbs, B, B_limbs); mbedtls_mpi_core_mul(X, A, A_limbs, B, B_limbs);
ASSERT_COMPARE(X, X_bytes, R, X_bytes); TEST_MEMORY_COMPARE(X, X_bytes, R, X_bytes);
ASSERT_COMPARE(A, A_bytes, A_orig, A_bytes); TEST_MEMORY_COMPARE(A, A_bytes, A_orig, A_bytes);
ASSERT_COMPARE(B, B_bytes, B_orig, B_bytes); TEST_MEMORY_COMPARE(B, B_bytes, B_orig, B_bytes);
/* 2. A == B: alias A and B - result should be correct, A and B unchanged */ /* 2. A == B: alias A and B - result should be correct, A and B unchanged */
if (A_bytes == B_bytes && memcmp(A, B, A_bytes) == 0) { if (A_bytes == B_bytes && memcmp(A, B, A_bytes) == 0) {
memset(X, '!', X_bytes); memset(X, '!', X_bytes);
mbedtls_mpi_core_mul(X, A, A_limbs, A, A_limbs); mbedtls_mpi_core_mul(X, A, A_limbs, A, A_limbs);
ASSERT_COMPARE(X, X_bytes, R, X_bytes); TEST_MEMORY_COMPARE(X, X_bytes, R, X_bytes);
ASSERT_COMPARE(A, A_bytes, A_orig, A_bytes); TEST_MEMORY_COMPARE(A, A_bytes, A_orig, A_bytes);
} }
/* 3. X = B * A - result should be correct, A and B unchanged */ /* 3. X = B * A - result should be correct, A and B unchanged */
else { else {
memset(X, '!', X_bytes); memset(X, '!', X_bytes);
mbedtls_mpi_core_mul(X, B, B_limbs, A, A_limbs); mbedtls_mpi_core_mul(X, B, B_limbs, A, A_limbs);
ASSERT_COMPARE(X, X_bytes, R, X_bytes); TEST_MEMORY_COMPARE(X, X_bytes, R, X_bytes);
ASSERT_COMPARE(A, A_bytes, A_orig, A_bytes); TEST_MEMORY_COMPARE(A, A_bytes, A_orig, A_bytes);
ASSERT_COMPARE(B, B_bytes, B_orig, B_bytes); TEST_MEMORY_COMPARE(B, B_bytes, B_orig, B_bytes);
} }
exit: exit:
@ -1195,7 +1195,7 @@ void mpi_core_exp_mod(char *input_N, char *input_A,
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&E, &E_limbs, input_E)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&E, &E_limbs, input_E));
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&N, &N_limbs, input_N)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&N, &N_limbs, input_N));
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X));
ASSERT_ALLOC(Y, N_limbs); TEST_CALLOC(Y, N_limbs);
TEST_EQUAL(A_limbs, N_limbs); TEST_EQUAL(A_limbs, N_limbs);
TEST_EQUAL(X_limbs, N_limbs); TEST_EQUAL(X_limbs, N_limbs);
@ -1227,7 +1227,7 @@ void mpi_core_exp_mod(char *input_N, char *input_A,
TEST_LE_U(mbedtls_mpi_core_montmul_working_limbs(N_limbs), TEST_LE_U(mbedtls_mpi_core_montmul_working_limbs(N_limbs),
working_limbs); working_limbs);
ASSERT_ALLOC(T, working_limbs); TEST_CALLOC(T, working_limbs);
mbedtls_mpi_core_exp_mod(Y, A, N, N_limbs, E, E_limbs, R2, T); mbedtls_mpi_core_exp_mod(Y, A, N, N_limbs, E, E_limbs, R2, T);
@ -1277,10 +1277,11 @@ void mpi_core_sub_int(char *input_A, char *input_B,
TEST_EQUAL(A_limbs, X_limbs); TEST_EQUAL(A_limbs, X_limbs);
size_t limbs = A_limbs; size_t limbs = A_limbs;
ASSERT_ALLOC(R, limbs); TEST_CALLOC(R, limbs);
#define TEST_COMPARE_CORE_MPIS(A, B, limbs) \ #define TEST_COMPARE_CORE_MPIS(A, B, limbs) \
ASSERT_COMPARE(A, (limbs) * sizeof(mbedtls_mpi_uint), B, (limbs) * sizeof(mbedtls_mpi_uint)) TEST_MEMORY_COMPARE(A, (limbs) * sizeof(mbedtls_mpi_uint), \
B, (limbs) * sizeof(mbedtls_mpi_uint))
/* 1. R = A - b. Result and borrow should be correct */ /* 1. R = A - b. Result and borrow should be correct */
TEST_EQUAL(mbedtls_mpi_core_sub_int(R, A, B[0], limbs), borrow); TEST_EQUAL(mbedtls_mpi_core_sub_int(R, A, B[0], limbs), borrow);

54
tests/suites/test_suite_bignum_mod.function
View file

@ -7,8 +7,8 @@
#include "test/constant_flow.h" #include "test/constant_flow.h"
#define TEST_COMPARE_MPI_RESIDUES(a, b) \ #define TEST_COMPARE_MPI_RESIDUES(a, b) \
ASSERT_COMPARE((a).p, (a).limbs * sizeof(mbedtls_mpi_uint), \ TEST_MEMORY_COMPARE((a).p, (a).limbs * sizeof(mbedtls_mpi_uint), \
(b).p, (b).limbs * sizeof(mbedtls_mpi_uint)) (b).p, (b).limbs * sizeof(mbedtls_mpi_uint))
static int test_read_residue(mbedtls_mpi_mod_residue *r, static int test_read_residue(mbedtls_mpi_mod_residue *r,
const mbedtls_mpi_mod_modulus *m, const mbedtls_mpi_mod_modulus *m,
@ -123,47 +123,47 @@ void mpi_mod_mul(char *input_A,
TEST_EQUAL(rB.limbs, limbs); TEST_EQUAL(rB.limbs, limbs);
TEST_EQUAL(rR.limbs, limbs); TEST_EQUAL(rR.limbs, limbs);
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rX, &m, X, limbs), 0); TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rX, &m, X, limbs), 0);
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rB, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rB, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
/* alias X to A */ /* alias X to A */
memcpy(rX.p, rA.p, bytes); memcpy(rX.p, rA.p, bytes);
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rX, &rB, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rX, &rB, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
/* alias X to B */ /* alias X to B */
memcpy(rX.p, rB.p, bytes); memcpy(rX.p, rB.p, bytes);
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rX, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rX, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
/* A == B: alias A and B */ /* A == B: alias A and B */
if (memcmp(rA.p, rB.p, bytes) == 0) { if (memcmp(rA.p, rB.p, bytes) == 0) {
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rA, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rA, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
/* X, A, B all aliased together */ /* X, A, B all aliased together */
memcpy(rX.p, rA.p, bytes); memcpy(rX.p, rA.p, bytes);
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rX, &rX, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rX, &rX, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
} }
/* A != B: test B * A */ /* A != B: test B * A */
else { else {
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rB, &rA, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rB, &rA, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
/* B * A: alias X to A */ /* B * A: alias X to A */
memcpy(rX.p, rA.p, bytes); memcpy(rX.p, rA.p, bytes);
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rB, &rX, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rB, &rX, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
/* B + A: alias X to B */ /* B + A: alias X to B */
memcpy(rX.p, rB.p, bytes); memcpy(rX.p, rB.p, bytes);
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rX, &rA, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rX, &rA, &m), 0);
ASSERT_COMPARE(rX.p, bytes, rR.p, bytes); TEST_MEMORY_COMPARE(rX.p, bytes, rR.p, bytes);
} }
exit: exit:
@ -206,7 +206,7 @@ void mpi_mod_mul_neg(char *input_A,
const size_t limbs = m.limbs; const size_t limbs = m.limbs;
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rX, &m, X, limbs), 0); TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rX, &m, X, limbs), 0);
rX.limbs = rR.limbs; rX.limbs = rR.limbs;
@ -259,7 +259,7 @@ void mpi_mod_sub(char *input_N,
if (expected_ret == 0) { if (expected_ret == 0) {
/* Negative test with too many limbs in output */ /* Negative test with too many limbs in output */
ASSERT_ALLOC(X_raw, limbs + 1); TEST_CALLOC(X_raw, limbs + 1);
x.p = X_raw; x.p = X_raw;
x.limbs = limbs + 1; x.limbs = limbs + 1;
@ -271,7 +271,7 @@ void mpi_mod_sub(char *input_N,
/* Negative test with too few limbs in output */ /* Negative test with too few limbs in output */
if (limbs > 1) { if (limbs > 1) {
ASSERT_ALLOC(X_raw, limbs - 1); TEST_CALLOC(X_raw, limbs - 1);
x.p = X_raw; x.p = X_raw;
x.limbs = limbs - 1; x.limbs = limbs - 1;
@ -286,7 +286,7 @@ void mpi_mod_sub(char *input_N,
* manually-written test cases with expected_ret != 0. */ * manually-written test cases with expected_ret != 0. */
} }
ASSERT_ALLOC(X_raw, limbs); TEST_CALLOC(X_raw, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &m, X_raw, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &m, X_raw, limbs));
@ -358,7 +358,7 @@ void mpi_mod_inv_mont(char *input_N,
size_t limbs = N.limbs; size_t limbs = N.limbs;
size_t bytes = limbs * sizeof(*X_raw); size_t bytes = limbs * sizeof(*X_raw);
ASSERT_ALLOC(X_raw, limbs); TEST_CALLOC(X_raw, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &N, X_raw, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &N, X_raw, limbs));
@ -408,7 +408,7 @@ void mpi_mod_inv_non_mont(char *input_N,
size_t limbs = N.limbs; size_t limbs = N.limbs;
size_t bytes = limbs * sizeof(*X_raw); size_t bytes = limbs * sizeof(*X_raw);
ASSERT_ALLOC(X_raw, limbs); TEST_CALLOC(X_raw, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &N, X_raw, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &N, X_raw, limbs));
@ -462,7 +462,7 @@ void mpi_mod_add(char *input_N,
if (expected_ret == 0) { if (expected_ret == 0) {
/* Negative test with too many limbs in output */ /* Negative test with too many limbs in output */
ASSERT_ALLOC(X_raw, limbs + 1); TEST_CALLOC(X_raw, limbs + 1);
x.p = X_raw; x.p = X_raw;
x.limbs = limbs + 1; x.limbs = limbs + 1;
@ -474,7 +474,7 @@ void mpi_mod_add(char *input_N,
/* Negative test with too few limbs in output */ /* Negative test with too few limbs in output */
if (limbs > 1) { if (limbs > 1) {
ASSERT_ALLOC(X_raw, limbs - 1); TEST_CALLOC(X_raw, limbs - 1);
x.p = X_raw; x.p = X_raw;
x.limbs = limbs - 1; x.limbs = limbs - 1;
@ -490,7 +490,7 @@ void mpi_mod_add(char *input_N,
} }
/* Allocate correct number of limbs for X_raw */ /* Allocate correct number of limbs for X_raw */
ASSERT_ALLOC(X_raw, limbs); TEST_CALLOC(X_raw, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &m, X_raw, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&x, &m, X_raw, limbs));
@ -582,7 +582,7 @@ void mpi_mod_io_neg(char *input_N, data_t *buf, int ret)
size_t n_limbs; size_t n_limbs;
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&N, &n_limbs, input_N)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&N, &n_limbs, input_N));
size_t r_limbs = n_limbs; size_t r_limbs = n_limbs;
ASSERT_ALLOC(R, r_limbs); TEST_CALLOC(R, r_limbs);
/* modulus->p == NULL || residue->p == NULL ( m has not been set-up ) */ /* modulus->p == NULL || residue->p == NULL ( m has not been set-up ) */
TEST_EQUAL(MBEDTLS_ERR_MPI_BAD_INPUT_DATA, TEST_EQUAL(MBEDTLS_ERR_MPI_BAD_INPUT_DATA,
@ -658,8 +658,8 @@ void mpi_mod_io(char *input_N, data_t *input_A, int endian)
a_bytes = input_A->len; a_bytes = input_A->len;
/* Allocate the memory for intermediate data structures */ /* Allocate the memory for intermediate data structures */
ASSERT_ALLOC(R, n_bytes); TEST_CALLOC(R, n_bytes);
ASSERT_ALLOC(R_COPY, n_bytes); TEST_CALLOC(R_COPY, n_bytes);
/* Test that input's size is not greater to modulo's */ /* Test that input's size is not greater to modulo's */
TEST_LE_U(a_bytes, n_bytes); TEST_LE_U(a_bytes, n_bytes);
@ -698,14 +698,14 @@ void mpi_mod_io(char *input_N, data_t *input_A, int endian)
obuf_sizes[2] = a_bytes + 8; obuf_sizes[2] = a_bytes + 8;
for (size_t i = 0; i < obuf_sizes_len; i++) { for (size_t i = 0; i < obuf_sizes_len; i++) {
ASSERT_ALLOC(obuf, obuf_sizes[i]); TEST_CALLOC(obuf, obuf_sizes[i]);
TEST_EQUAL(0, mbedtls_mpi_mod_write(&r, &m, obuf, obuf_sizes[i], endian)); TEST_EQUAL(0, mbedtls_mpi_mod_write(&r, &m, obuf, obuf_sizes[i], endian));
/* Make sure that writing didn't corrupt the value of r */ /* Make sure that writing didn't corrupt the value of r */
ASSERT_COMPARE(r.p, r.limbs, r_copy.p, r_copy.limbs); TEST_MEMORY_COMPARE(r.p, r.limbs, r_copy.p, r_copy.limbs);
/* Set up reference output for checking the result */ /* Set up reference output for checking the result */
ASSERT_ALLOC(ref_buf, obuf_sizes[i]); TEST_CALLOC(ref_buf, obuf_sizes[i]);
switch (endian) { switch (endian) {
case MBEDTLS_MPI_MOD_EXT_REP_LE: case MBEDTLS_MPI_MOD_EXT_REP_LE:
memcpy(ref_buf, input_A->x, a_bytes_trimmed); memcpy(ref_buf, input_A->x, a_bytes_trimmed);
@ -723,7 +723,7 @@ void mpi_mod_io(char *input_N, data_t *input_A, int endian)
} }
/* Check the result */ /* Check the result */
ASSERT_COMPARE(obuf, obuf_sizes[i], ref_buf, obuf_sizes[i]); TEST_MEMORY_COMPARE(obuf, obuf_sizes[i], ref_buf, obuf_sizes[i]);
mbedtls_free(ref_buf); mbedtls_free(ref_buf);
ref_buf = NULL; ref_buf = NULL;

122
tests/suites/test_suite_bignum_mod_raw.function
View file

@ -133,7 +133,7 @@ void mpi_mod_raw_cond_assign(char *input_X,
TEST_EQUAL(limbs_X, limbs_Y); TEST_EQUAL(limbs_X, limbs_Y);
TEST_ASSERT(copy_limbs <= limbs); TEST_ASSERT(copy_limbs <= limbs);
ASSERT_ALLOC(buff_m, copy_limbs); TEST_CALLOC(buff_m, copy_limbs);
memset(buff_m, 0xFF, copy_limbs); memset(buff_m, 0xFF, copy_limbs);
TEST_EQUAL(mbedtls_mpi_mod_modulus_setup( TEST_EQUAL(mbedtls_mpi_mod_modulus_setup(
&m, buff_m, copy_limbs), 0); &m, buff_m, copy_limbs), 0);
@ -161,10 +161,10 @@ void mpi_mod_raw_cond_assign(char *input_X,
/* Check if the given length is copied even it is smaller /* Check if the given length is copied even it is smaller
than the length of the given MPIs. */ than the length of the given MPIs. */
if (copy_limbs < limbs) { if (copy_limbs < limbs) {
ASSERT_COMPARE(X, copy_bytes, Y, copy_bytes); TEST_MEMORY_COMPARE(X, copy_bytes, Y, copy_bytes);
TEST_ASSERT(memcmp(X, Y, bytes) != 0); TEST_ASSERT(memcmp(X, Y, bytes) != 0);
} else { } else {
ASSERT_COMPARE(X, bytes, Y, bytes); TEST_MEMORY_COMPARE(X, bytes, Y, bytes);
} }
exit: exit:
@ -203,15 +203,15 @@ void mpi_mod_raw_cond_swap(char *input_X,
TEST_EQUAL(limbs_X, limbs_Y); TEST_EQUAL(limbs_X, limbs_Y);
TEST_ASSERT(copy_limbs <= limbs); TEST_ASSERT(copy_limbs <= limbs);
ASSERT_ALLOC(buff_m, copy_limbs); TEST_CALLOC(buff_m, copy_limbs);
memset(buff_m, 0xFF, copy_limbs); memset(buff_m, 0xFF, copy_limbs);
TEST_EQUAL(mbedtls_mpi_mod_modulus_setup( TEST_EQUAL(mbedtls_mpi_mod_modulus_setup(
&m, buff_m, copy_limbs), 0); &m, buff_m, copy_limbs), 0);
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
memcpy(X, tmp_X, bytes); memcpy(X, tmp_X, bytes);
ASSERT_ALLOC(Y, bytes); TEST_CALLOC(Y, bytes);
memcpy(Y, tmp_Y, bytes); memcpy(Y, tmp_Y, bytes);
/* condition is false */ /* condition is false */
@ -223,8 +223,8 @@ void mpi_mod_raw_cond_swap(char *input_X,
TEST_CF_PUBLIC(X, bytes); TEST_CF_PUBLIC(X, bytes);
TEST_CF_PUBLIC(Y, bytes); TEST_CF_PUBLIC(Y, bytes);
ASSERT_COMPARE(X, bytes, tmp_X, bytes); TEST_MEMORY_COMPARE(X, bytes, tmp_X, bytes);
ASSERT_COMPARE(Y, bytes, tmp_Y, bytes); TEST_MEMORY_COMPARE(Y, bytes, tmp_Y, bytes);
/* condition is true */ /* condition is true */
TEST_CF_SECRET(X, bytes); TEST_CF_SECRET(X, bytes);
@ -238,15 +238,15 @@ void mpi_mod_raw_cond_swap(char *input_X,
/* Check if the given length is copied even it is smaller /* Check if the given length is copied even it is smaller
than the length of the given MPIs. */ than the length of the given MPIs. */
if (copy_limbs < limbs) { if (copy_limbs < limbs) {
ASSERT_COMPARE(X, copy_bytes, tmp_Y, copy_bytes); TEST_MEMORY_COMPARE(X, copy_bytes, tmp_Y, copy_bytes);
ASSERT_COMPARE(Y, copy_bytes, tmp_X, copy_bytes); TEST_MEMORY_COMPARE(Y, copy_bytes, tmp_X, copy_bytes);
TEST_ASSERT(memcmp(X, tmp_X, bytes) != 0); TEST_ASSERT(memcmp(X, tmp_X, bytes) != 0);
TEST_ASSERT(memcmp(X, tmp_Y, bytes) != 0); TEST_ASSERT(memcmp(X, tmp_Y, bytes) != 0);
TEST_ASSERT(memcmp(Y, tmp_X, bytes) != 0); TEST_ASSERT(memcmp(Y, tmp_X, bytes) != 0);
TEST_ASSERT(memcmp(Y, tmp_Y, bytes) != 0); TEST_ASSERT(memcmp(Y, tmp_Y, bytes) != 0);
} else { } else {
ASSERT_COMPARE(X, bytes, tmp_Y, bytes); TEST_MEMORY_COMPARE(X, bytes, tmp_Y, bytes);
ASSERT_COMPARE(Y, bytes, tmp_X, bytes); TEST_MEMORY_COMPARE(Y, bytes, tmp_X, bytes);
} }
exit: exit:
@ -291,33 +291,33 @@ void mpi_mod_raw_sub(char *input_A,
TEST_EQUAL(limbs_B, limbs); TEST_EQUAL(limbs_B, limbs);
TEST_EQUAL(limbs_res, limbs); TEST_EQUAL(limbs_res, limbs);
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
TEST_EQUAL(mbedtls_mpi_mod_modulus_setup( TEST_EQUAL(mbedtls_mpi_mod_modulus_setup(
&m, N, limbs), 0); &m, N, limbs), 0);
mbedtls_mpi_mod_raw_sub(X, A, B, &m); mbedtls_mpi_mod_raw_sub(X, A, B, &m);
ASSERT_COMPARE(X, bytes, res, bytes); TEST_MEMORY_COMPARE(X, bytes, res, bytes);
/* alias X to A */ /* alias X to A */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_sub(X, X, B, &m); mbedtls_mpi_mod_raw_sub(X, X, B, &m);
ASSERT_COMPARE(X, bytes, res, bytes); TEST_MEMORY_COMPARE(X, bytes, res, bytes);
/* alias X to B */ /* alias X to B */
memcpy(X, B, bytes); memcpy(X, B, bytes);
mbedtls_mpi_mod_raw_sub(X, A, X, &m); mbedtls_mpi_mod_raw_sub(X, A, X, &m);
ASSERT_COMPARE(X, bytes, res, bytes); TEST_MEMORY_COMPARE(X, bytes, res, bytes);
/* A == B: alias A and B */ /* A == B: alias A and B */
if (memcmp(A, B, bytes) == 0) { if (memcmp(A, B, bytes) == 0) {
mbedtls_mpi_mod_raw_sub(X, A, A, &m); mbedtls_mpi_mod_raw_sub(X, A, A, &m);
ASSERT_COMPARE(X, bytes, res, bytes); TEST_MEMORY_COMPARE(X, bytes, res, bytes);
/* X, A, B all aliased together */ /* X, A, B all aliased together */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_sub(X, X, X, &m); mbedtls_mpi_mod_raw_sub(X, X, X, &m);
ASSERT_COMPARE(X, bytes, res, bytes); TEST_MEMORY_COMPARE(X, bytes, res, bytes);
} }
exit: exit:
mbedtls_free(A); mbedtls_free(A);
@ -356,7 +356,7 @@ void mpi_mod_raw_fix_quasi_reduction(char *input_N,
TEST_EQUAL(limbs_X, limbs); TEST_EQUAL(limbs_X, limbs);
TEST_EQUAL(limbs_res, limbs); TEST_EQUAL(limbs_res, limbs);
ASSERT_ALLOC(tmp, limbs); TEST_CALLOC(tmp, limbs);
memcpy(tmp, X, bytes); memcpy(tmp, X, bytes);
/* Check that 0 <= X < 2N */ /* Check that 0 <= X < 2N */
@ -367,7 +367,7 @@ void mpi_mod_raw_fix_quasi_reduction(char *input_N,
&m, N, limbs), 0); &m, N, limbs), 0);
mbedtls_mpi_mod_raw_fix_quasi_reduction(X, &m); mbedtls_mpi_mod_raw_fix_quasi_reduction(X, &m);
ASSERT_COMPARE(X, bytes, res, bytes); TEST_MEMORY_COMPARE(X, bytes, res, bytes);
exit: exit:
mbedtls_free(X); mbedtls_free(X);
@ -411,51 +411,51 @@ void mpi_mod_raw_mul(char *input_A,
TEST_EQUAL(limbs_B, limbs); TEST_EQUAL(limbs_B, limbs);
TEST_EQUAL(limbs_R, limbs); TEST_EQUAL(limbs_R, limbs);
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
TEST_EQUAL(mbedtls_mpi_mod_modulus_setup( TEST_EQUAL(mbedtls_mpi_mod_modulus_setup(
&m, N, limbs), 0); &m, N, limbs), 0);
const size_t limbs_T = limbs * 2 + 1; const size_t limbs_T = limbs * 2 + 1;
ASSERT_ALLOC(T, limbs_T); TEST_CALLOC(T, limbs_T);
mbedtls_mpi_mod_raw_mul(X, A, B, &m, T); mbedtls_mpi_mod_raw_mul(X, A, B, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
/* alias X to A */ /* alias X to A */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_mul(X, X, B, &m, T); mbedtls_mpi_mod_raw_mul(X, X, B, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
/* alias X to B */ /* alias X to B */
memcpy(X, B, bytes); memcpy(X, B, bytes);
mbedtls_mpi_mod_raw_mul(X, A, X, &m, T); mbedtls_mpi_mod_raw_mul(X, A, X, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
/* A == B: alias A and B */ /* A == B: alias A and B */
if (memcmp(A, B, bytes) == 0) { if (memcmp(A, B, bytes) == 0) {
mbedtls_mpi_mod_raw_mul(X, A, A, &m, T); mbedtls_mpi_mod_raw_mul(X, A, A, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
/* X, A, B all aliased together */ /* X, A, B all aliased together */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_mul(X, X, X, &m, T); mbedtls_mpi_mod_raw_mul(X, X, X, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
} }
/* A != B: test B * A */ /* A != B: test B * A */
else { else {
mbedtls_mpi_mod_raw_mul(X, B, A, &m, T); mbedtls_mpi_mod_raw_mul(X, B, A, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
/* B * A: alias X to A */ /* B * A: alias X to A */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_mul(X, B, X, &m, T); mbedtls_mpi_mod_raw_mul(X, B, X, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
/* B + A: alias X to B */ /* B + A: alias X to B */
memcpy(X, B, bytes); memcpy(X, B, bytes);
mbedtls_mpi_mod_raw_mul(X, X, A, &m, T); mbedtls_mpi_mod_raw_mul(X, X, A, &m, T);
ASSERT_COMPARE(X, bytes, R, bytes); TEST_MEMORY_COMPARE(X, bytes, R, bytes);
} }
exit: exit:
@ -489,7 +489,7 @@ void mpi_mod_raw_inv_prime(char *input_N, char *input_A, char *input_X)
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&A, &A_limbs, input_A)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&A, &A_limbs, input_A));
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&N, &N_limbs, input_N)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&N, &N_limbs, input_N));
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X));
ASSERT_ALLOC(Y, N_limbs); TEST_CALLOC(Y, N_limbs);
TEST_EQUAL(A_limbs, N_limbs); TEST_EQUAL(A_limbs, N_limbs);
TEST_EQUAL(X_limbs, N_limbs); TEST_EQUAL(X_limbs, N_limbs);
@ -519,7 +519,7 @@ void mpi_mod_raw_inv_prime(char *input_N, char *input_A, char *input_X)
TEST_LE_U(mbedtls_mpi_core_montmul_working_limbs(N_limbs), TEST_LE_U(mbedtls_mpi_core_montmul_working_limbs(N_limbs),
working_limbs); working_limbs);
ASSERT_ALLOC(T, working_limbs); TEST_CALLOC(T, working_limbs);
mbedtls_mpi_mod_raw_inv_prime(Y, A, N, N_limbs, R2, T); mbedtls_mpi_mod_raw_inv_prime(Y, A, N, N_limbs, R2, T);
@ -571,52 +571,52 @@ void mpi_mod_raw_add(char *input_N,
TEST_EQUAL(B_limbs, limbs); TEST_EQUAL(B_limbs, limbs);
TEST_EQUAL(S_limbs, limbs); TEST_EQUAL(S_limbs, limbs);
ASSERT_ALLOC(X, limbs); TEST_CALLOC(X, limbs);
TEST_EQUAL(mbedtls_mpi_mod_modulus_setup( TEST_EQUAL(mbedtls_mpi_mod_modulus_setup(
&m, N, limbs), 0); &m, N, limbs), 0);
/* A + B => Correct result */ /* A + B => Correct result */
mbedtls_mpi_mod_raw_add(X, A, B, &m); mbedtls_mpi_mod_raw_add(X, A, B, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* A + B: alias X to A => Correct result */ /* A + B: alias X to A => Correct result */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_add(X, X, B, &m); mbedtls_mpi_mod_raw_add(X, X, B, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* A + B: alias X to B => Correct result */ /* A + B: alias X to B => Correct result */
memcpy(X, B, bytes); memcpy(X, B, bytes);
mbedtls_mpi_mod_raw_add(X, A, X, &m); mbedtls_mpi_mod_raw_add(X, A, X, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
if (memcmp(A, B, bytes) == 0) { if (memcmp(A, B, bytes) == 0) {
/* A == B: alias A and B */ /* A == B: alias A and B */
/* A + A => Correct result */ /* A + A => Correct result */
mbedtls_mpi_mod_raw_add(X, A, A, &m); mbedtls_mpi_mod_raw_add(X, A, A, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* A + A: X, A, B all aliased together => Correct result */ /* A + A: X, A, B all aliased together => Correct result */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_add(X, X, X, &m); mbedtls_mpi_mod_raw_add(X, X, X, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
} else { } else {
/* A != B: test B + A */ /* A != B: test B + A */
/* B + A => Correct result */ /* B + A => Correct result */
mbedtls_mpi_mod_raw_add(X, B, A, &m); mbedtls_mpi_mod_raw_add(X, B, A, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* B + A: alias X to A => Correct result */ /* B + A: alias X to A => Correct result */
memcpy(X, A, bytes); memcpy(X, A, bytes);
mbedtls_mpi_mod_raw_add(X, B, X, &m); mbedtls_mpi_mod_raw_add(X, B, X, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
/* B + A: alias X to B => Correct result */ /* B + A: alias X to B => Correct result */
memcpy(X, B, bytes); memcpy(X, B, bytes);
mbedtls_mpi_mod_raw_add(X, X, A, &m); mbedtls_mpi_mod_raw_add(X, X, A, &m);
ASSERT_COMPARE(X, bytes, S, bytes); TEST_MEMORY_COMPARE(X, bytes, S, bytes);
} }
exit: exit:
@ -647,8 +647,8 @@ void mpi_mod_raw_canonical_to_modulus_rep(const char *input_N, int rep,
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X));
TEST_EQUAL(0, mbedtls_mpi_mod_raw_canonical_to_modulus_rep(A, &N)); TEST_EQUAL(0, mbedtls_mpi_mod_raw_canonical_to_modulus_rep(A, &N));
ASSERT_COMPARE(A, A_limbs * sizeof(mbedtls_mpi_uint), TEST_MEMORY_COMPARE(A, A_limbs * sizeof(mbedtls_mpi_uint),
X, X_limbs * sizeof(mbedtls_mpi_uint)); X, X_limbs * sizeof(mbedtls_mpi_uint));
exit: exit:
mbedtls_test_mpi_mod_modulus_free_with_limbs(&N); mbedtls_test_mpi_mod_modulus_free_with_limbs(&N);
@ -674,8 +674,8 @@ void mpi_mod_raw_modulus_to_canonical_rep(const char *input_N, int rep,
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X)); TEST_EQUAL(0, mbedtls_test_read_mpi_core(&X, &X_limbs, input_X));
TEST_EQUAL(0, mbedtls_mpi_mod_raw_modulus_to_canonical_rep(A, &N)); TEST_EQUAL(0, mbedtls_mpi_mod_raw_modulus_to_canonical_rep(A, &N));
ASSERT_COMPARE(A, A_limbs * sizeof(mbedtls_mpi_uint), TEST_MEMORY_COMPARE(A, A_limbs * sizeof(mbedtls_mpi_uint),
X, X_limbs * sizeof(mbedtls_mpi_uint)); X, X_limbs * sizeof(mbedtls_mpi_uint));
exit: exit:
mbedtls_test_mpi_mod_modulus_free_with_limbs(&N); mbedtls_test_mpi_mod_modulus_free_with_limbs(&N);
@ -718,25 +718,25 @@ void mpi_mod_raw_to_mont_rep(char *input_N, char *input_A, char *input_X)
/* It has separate output, and requires temporary working storage */ /* It has separate output, and requires temporary working storage */
size_t temp_limbs = mbedtls_mpi_core_montmul_working_limbs(limbs); size_t temp_limbs = mbedtls_mpi_core_montmul_working_limbs(limbs);
ASSERT_ALLOC(T, temp_limbs); TEST_CALLOC(T, temp_limbs);
ASSERT_ALLOC(R, limbs); TEST_CALLOC(R, limbs);
mbedtls_mpi_core_to_mont_rep(R, A, N, n_limbs, mbedtls_mpi_core_to_mont_rep(R, A, N, n_limbs,
m.rep.mont.mm, m.rep.mont.rr, T); m.rep.mont.mm, m.rep.mont.rr, T);
/* Test that the low-level function gives the required value */ /* Test that the low-level function gives the required value */
ASSERT_COMPARE(R, bytes, X, bytes); TEST_MEMORY_COMPARE(R, bytes, X, bytes);
/* Test when output is aliased to input */ /* Test when output is aliased to input */
memcpy(R, A, bytes); memcpy(R, A, bytes);
mbedtls_mpi_core_to_mont_rep(R, R, N, n_limbs, mbedtls_mpi_core_to_mont_rep(R, R, N, n_limbs,
m.rep.mont.mm, m.rep.mont.rr, T); m.rep.mont.mm, m.rep.mont.rr, T);
ASSERT_COMPARE(R, bytes, X, bytes); TEST_MEMORY_COMPARE(R, bytes, X, bytes);
/* 2. Test higher-level cannonical to Montgomery conversion */ /* 2. Test higher-level cannonical to Montgomery conversion */
TEST_EQUAL(0, mbedtls_mpi_mod_raw_to_mont_rep(A, &m)); TEST_EQUAL(0, mbedtls_mpi_mod_raw_to_mont_rep(A, &m));
/* The result matches expected value */ /* The result matches expected value */
ASSERT_COMPARE(A, bytes, X, bytes); TEST_MEMORY_COMPARE(A, bytes, X, bytes);
exit: exit:
mbedtls_mpi_mod_modulus_free(&m); mbedtls_mpi_mod_modulus_free(&m);
@ -782,25 +782,25 @@ void mpi_mod_raw_from_mont_rep(char *input_N, char *input_A, char *input_X)
/* It has separate output, and requires temporary working storage */ /* It has separate output, and requires temporary working storage */
size_t temp_limbs = mbedtls_mpi_core_montmul_working_limbs(limbs); size_t temp_limbs = mbedtls_mpi_core_montmul_working_limbs(limbs);
ASSERT_ALLOC(T, temp_limbs); TEST_CALLOC(T, temp_limbs);
ASSERT_ALLOC(R, limbs); TEST_CALLOC(R, limbs);
mbedtls_mpi_core_from_mont_rep(R, A, N, n_limbs, mbedtls_mpi_core_from_mont_rep(R, A, N, n_limbs,
m.rep.mont.mm, T); m.rep.mont.mm, T);
/* Test that the low-level function gives the required value */ /* Test that the low-level function gives the required value */
ASSERT_COMPARE(R, bytes, X, bytes); TEST_MEMORY_COMPARE(R, bytes, X, bytes);
/* Test when output is aliased to input */ /* Test when output is aliased to input */
memcpy(R, A, bytes); memcpy(R, A, bytes);
mbedtls_mpi_core_from_mont_rep(R, R, N, n_limbs, mbedtls_mpi_core_from_mont_rep(R, R, N, n_limbs,
m.rep.mont.mm, T); m.rep.mont.mm, T);
ASSERT_COMPARE(R, bytes, X, bytes); TEST_MEMORY_COMPARE(R, bytes, X, bytes);
/* 2. Test higher-level Montgomery to cannonical conversion */ /* 2. Test higher-level Montgomery to cannonical conversion */
TEST_EQUAL(0, mbedtls_mpi_mod_raw_from_mont_rep(A, &m)); TEST_EQUAL(0, mbedtls_mpi_mod_raw_from_mont_rep(A, &m));
/* The result matches expected value */ /* The result matches expected value */
ASSERT_COMPARE(A, bytes, X, bytes); TEST_MEMORY_COMPARE(A, bytes, X, bytes);
exit: exit:
mbedtls_mpi_mod_modulus_free(&m); mbedtls_mpi_mod_modulus_free(&m);
@ -834,26 +834,26 @@ void mpi_mod_raw_neg(char *input_N, char *input_A, char *input_X)
TEST_EQUAL(x_limbs, n_limbs); TEST_EQUAL(x_limbs, n_limbs);
bytes = n_limbs * sizeof(mbedtls_mpi_uint); bytes = n_limbs * sizeof(mbedtls_mpi_uint);
ASSERT_ALLOC(R, n_limbs); TEST_CALLOC(R, n_limbs);
ASSERT_ALLOC(Z, n_limbs); TEST_CALLOC(Z, n_limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_modulus_setup(&m, N, n_limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_modulus_setup(&m, N, n_limbs));
/* Neg( A == 0 ) => Zero result */ /* Neg( A == 0 ) => Zero result */
mbedtls_mpi_mod_raw_neg(R, Z, &m); mbedtls_mpi_mod_raw_neg(R, Z, &m);
ASSERT_COMPARE(R, bytes, Z, bytes); TEST_MEMORY_COMPARE(R, bytes, Z, bytes);
/* Neg( A == N ) => Zero result */ /* Neg( A == N ) => Zero result */
mbedtls_mpi_mod_raw_neg(R, N, &m); mbedtls_mpi_mod_raw_neg(R, N, &m);
ASSERT_COMPARE(R, bytes, Z, bytes); TEST_MEMORY_COMPARE(R, bytes, Z, bytes);
/* Neg( A ) => Correct result */ /* Neg( A ) => Correct result */
mbedtls_mpi_mod_raw_neg(R, A, &m); mbedtls_mpi_mod_raw_neg(R, A, &m);
ASSERT_COMPARE(R, bytes, X, bytes); TEST_MEMORY_COMPARE(R, bytes, X, bytes);
/* Neg( A ): alias A to R => Correct result */ /* Neg( A ): alias A to R => Correct result */
mbedtls_mpi_mod_raw_neg(A, A, &m); mbedtls_mpi_mod_raw_neg(A, A, &m);
ASSERT_COMPARE(A, bytes, X, bytes); TEST_MEMORY_COMPARE(A, bytes, X, bytes);
exit: exit:
mbedtls_mpi_mod_modulus_free(&m); mbedtls_mpi_mod_modulus_free(&m);
mbedtls_free(N); mbedtls_free(N);

44
tests/suites/test_suite_bignum_random.function
View file

@ -124,9 +124,9 @@ void mpi_core_random_basic(int min, char *bound_bytes, int expected_ret)
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&upper_bound, &limbs, TEST_EQUAL(0, mbedtls_test_read_mpi_core(&upper_bound, &limbs,
bound_bytes)); bound_bytes));
ASSERT_ALLOC(lower_bound, limbs); TEST_CALLOC(lower_bound, limbs);
lower_bound[0] = min; lower_bound[0] = min;
ASSERT_ALLOC(result, limbs); TEST_CALLOC(result, limbs);
TEST_EQUAL(expected_ret, TEST_EQUAL(expected_ret,
mbedtls_mpi_core_random(result, min, upper_bound, limbs, mbedtls_mpi_core_random(result, min, upper_bound, limbs,
@ -159,7 +159,7 @@ void mpi_legacy_random_values(int min, char *max_hex)
TEST_EQUAL(0, mbedtls_test_read_mpi(&max_legacy, max_hex)); TEST_EQUAL(0, mbedtls_test_read_mpi(&max_legacy, max_hex));
size_t limbs = max_legacy.n; size_t limbs = max_legacy.n;
ASSERT_ALLOC(R_core, limbs); TEST_CALLOC(R_core, limbs);
/* Call the legacy function and the core function with the same random /* Call the legacy function and the core function with the same random
* stream. */ * stream. */
@ -174,16 +174,16 @@ void mpi_legacy_random_values(int min, char *max_hex)
* same number, with the same limb count. */ * same number, with the same limb count. */
TEST_EQUAL(core_ret, legacy_ret); TEST_EQUAL(core_ret, legacy_ret);
if (core_ret == 0) { if (core_ret == 0) {
ASSERT_COMPARE(R_core, limbs * ciL, TEST_MEMORY_COMPARE(R_core, limbs * ciL,
R_legacy.p, R_legacy.n * ciL); R_legacy.p, R_legacy.n * ciL);
} }
/* Also check that they have consumed the RNG in the same way. */ /* Also check that they have consumed the RNG in the same way. */
/* This may theoretically fail on rare platforms with padding in /* This may theoretically fail on rare platforms with padding in
* the structure! If this is a problem in practice, change to a * the structure! If this is a problem in practice, change to a
* field-by-field comparison. */ * field-by-field comparison. */
ASSERT_COMPARE(&rnd_core, sizeof(rnd_core), TEST_MEMORY_COMPARE(&rnd_core, sizeof(rnd_core),
&rnd_legacy, sizeof(rnd_legacy)); &rnd_legacy, sizeof(rnd_legacy));
exit: exit:
mbedtls_mpi_free(&max_legacy); mbedtls_mpi_free(&max_legacy);
@ -209,9 +209,9 @@ void mpi_mod_random_values(int min, char *max_hex, int rep)
mbedtls_mpi_mod_modulus_init(&N); mbedtls_mpi_mod_modulus_init(&N);
TEST_EQUAL(mbedtls_test_read_mpi_modulus(&N, max_hex, rep), 0); TEST_EQUAL(mbedtls_test_read_mpi_modulus(&N, max_hex, rep), 0);
ASSERT_ALLOC(R_core, N.limbs); TEST_CALLOC(R_core, N.limbs);
ASSERT_ALLOC(R_mod_raw, N.limbs); TEST_CALLOC(R_mod_raw, N.limbs);
ASSERT_ALLOC(R_mod_digits, N.limbs); TEST_CALLOC(R_mod_digits, N.limbs);
TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&R_mod, &N, TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&R_mod, &N,
R_mod_digits, N.limbs), R_mod_digits, N.limbs),
0); 0);
@ -237,22 +237,22 @@ void mpi_mod_random_values(int min, char *max_hex, int rep)
if (core_ret == 0) { if (core_ret == 0) {
TEST_EQUAL(mbedtls_mpi_mod_raw_modulus_to_canonical_rep(R_mod_raw, &N), TEST_EQUAL(mbedtls_mpi_mod_raw_modulus_to_canonical_rep(R_mod_raw, &N),
0); 0);
ASSERT_COMPARE(R_core, N.limbs * ciL, TEST_MEMORY_COMPARE(R_core, N.limbs * ciL,
R_mod_raw, N.limbs * ciL); R_mod_raw, N.limbs * ciL);
TEST_EQUAL(mbedtls_mpi_mod_raw_modulus_to_canonical_rep(R_mod_digits, &N), TEST_EQUAL(mbedtls_mpi_mod_raw_modulus_to_canonical_rep(R_mod_digits, &N),
0); 0);
ASSERT_COMPARE(R_core, N.limbs * ciL, TEST_MEMORY_COMPARE(R_core, N.limbs * ciL,
R_mod_digits, N.limbs * ciL); R_mod_digits, N.limbs * ciL);
} }
/* Also check that they have consumed the RNG in the same way. */ /* Also check that they have consumed the RNG in the same way. */
/* This may theoretically fail on rare platforms with padding in /* This may theoretically fail on rare platforms with padding in
* the structure! If this is a problem in practice, change to a * the structure! If this is a problem in practice, change to a
* field-by-field comparison. */ * field-by-field comparison. */
ASSERT_COMPARE(&rnd_core, sizeof(rnd_core), TEST_MEMORY_COMPARE(&rnd_core, sizeof(rnd_core),
&rnd_mod_raw, sizeof(rnd_mod_raw)); &rnd_mod_raw, sizeof(rnd_mod_raw));
ASSERT_COMPARE(&rnd_core, sizeof(rnd_core), TEST_MEMORY_COMPARE(&rnd_core, sizeof(rnd_core),
&rnd_mod, sizeof(rnd_mod)); &rnd_mod, sizeof(rnd_mod));
exit: exit:
mbedtls_test_mpi_mod_modulus_free_with_limbs(&N); mbedtls_test_mpi_mod_modulus_free_with_limbs(&N);
@ -287,7 +287,7 @@ void mpi_random_many(int min, char *bound_hex, int iterations)
TEST_EQUAL(0, mbedtls_test_read_mpi_core(&upper_bound, &limbs, TEST_EQUAL(0, mbedtls_test_read_mpi_core(&upper_bound, &limbs,
bound_hex)); bound_hex));
ASSERT_ALLOC(result, limbs); TEST_CALLOC(result, limbs);
n_bits = mbedtls_mpi_core_bitlen(upper_bound, limbs); n_bits = mbedtls_mpi_core_bitlen(upper_bound, limbs);
/* Consider a bound "small" if it's less than 2^5. This value is chosen /* Consider a bound "small" if it's less than 2^5. This value is chosen
@ -302,7 +302,7 @@ void mpi_random_many(int min, char *bound_hex, int iterations)
full_stats = 0; full_stats = 0;
stats_len = n_bits; stats_len = n_bits;
} }
ASSERT_ALLOC(stats, stats_len); TEST_CALLOC(stats, stats_len);
for (i = 0; i < (size_t) iterations; i++) { for (i = 0; i < (size_t) iterations; i++) {
mbedtls_test_set_step(i); mbedtls_test_set_step(i);
@ -340,7 +340,7 @@ void mpi_random_many(int min, char *bound_hex, int iterations)
} }
} else { } else {
bound_bytes.len = limbs * sizeof(mbedtls_mpi_uint); bound_bytes.len = limbs * sizeof(mbedtls_mpi_uint);
ASSERT_ALLOC(bound_bytes.x, bound_bytes.len); TEST_CALLOC(bound_bytes.x, bound_bytes.len);
mbedtls_mpi_core_write_be(upper_bound, limbs, mbedtls_mpi_core_write_be(upper_bound, limbs,
bound_bytes.x, bound_bytes.len); bound_bytes.x, bound_bytes.len);
int statistically_safe_all_the_way = int statistically_safe_all_the_way =
@ -416,7 +416,7 @@ void mpi_mod_random_validation(int min, char *bound_hex,
MBEDTLS_MPI_MOD_REP_OPT_RED), MBEDTLS_MPI_MOD_REP_OPT_RED),
0); 0);
size_t result_limbs = N.limbs + result_limbs_delta; size_t result_limbs = N.limbs + result_limbs_delta;
ASSERT_ALLOC(result_digits, result_limbs); TEST_CALLOC(result_digits, result_limbs);
/* Build a reside that might not match the modulus, to test that /* Build a reside that might not match the modulus, to test that
* the library function rejects that as expected. */ * the library function rejects that as expected. */
mbedtls_mpi_mod_residue result = { result_digits, result_limbs }; mbedtls_mpi_mod_residue result = { result_digits, result_limbs };

72
tests/suites/test_suite_ccm.function
View file

@ -32,25 +32,25 @@ static int check_multipart(mbedtls_ccm_context *ctx,
/* Allocate a tight buffer for each update call. This way, if the function /* Allocate a tight buffer for each update call. This way, if the function
* tries to write beyond the advertised required buffer size, this will * tries to write beyond the advertised required buffer size, this will
* count as an overflow for memory sanitizers and static checkers. */ * count as an overflow for memory sanitizers and static checkers. */
ASSERT_ALLOC(output, n1); TEST_CALLOC(output, n1);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(0, mbedtls_ccm_update(ctx, input->x, n1, output, n1, &olen)); TEST_EQUAL(0, mbedtls_ccm_update(ctx, input->x, n1, output, n1, &olen));
TEST_EQUAL(n1, olen); TEST_EQUAL(n1, olen);
ASSERT_COMPARE(output, olen, expected_output->x, n1); TEST_MEMORY_COMPARE(output, olen, expected_output->x, n1);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
ASSERT_ALLOC(output, n2); TEST_CALLOC(output, n2);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(0, mbedtls_ccm_update(ctx, input->x + n1, n2, output, n2, &olen)); TEST_EQUAL(0, mbedtls_ccm_update(ctx, input->x + n1, n2, output, n2, &olen));
TEST_EQUAL(n2, olen); TEST_EQUAL(n2, olen);
ASSERT_COMPARE(output, olen, expected_output->x + n1, n2); TEST_MEMORY_COMPARE(output, olen, expected_output->x + n1, n2);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
ASSERT_ALLOC(output, tag->len); TEST_CALLOC(output, tag->len);
TEST_EQUAL(0, mbedtls_ccm_finish(ctx, output, tag->len)); TEST_EQUAL(0, mbedtls_ccm_finish(ctx, output, tag->len));
ASSERT_COMPARE(output, tag->len, tag->x, tag->len); TEST_MEMORY_COMPARE(output, tag->len, tag->x, tag->len);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
@ -107,7 +107,7 @@ void ccm_lengths(int msg_len, int iv_len, int add_len, int tag_len, int res)
mbedtls_ccm_init(&ctx); mbedtls_ccm_init(&ctx);
ASSERT_ALLOC_WEAK(add, add_len); TEST_CALLOC_OR_SKIP(add, add_len);
memset(key, 0, sizeof(key)); memset(key, 0, sizeof(key));
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
memset(iv, 0, sizeof(iv)); memset(iv, 0, sizeof(iv));
@ -190,13 +190,13 @@ void mbedtls_ccm_encrypt_and_tag(int cipher_id, data_t *key,
const uint8_t *expected_tag = result->x + msg->len; const uint8_t *expected_tag = result->x + msg->len;
/* Prepare input/output message buffer */ /* Prepare input/output message buffer */
ASSERT_ALLOC(io_msg_buf, msg->len); TEST_CALLOC(io_msg_buf, msg->len);
if (msg->len != 0) { if (msg->len != 0) {
memcpy(io_msg_buf, msg->x, msg->len); memcpy(io_msg_buf, msg->x, msg->len);
} }
/* Prepare tag buffer */ /* Prepare tag buffer */
ASSERT_ALLOC(tag_buf, expected_tag_len); TEST_CALLOC(tag_buf, expected_tag_len);
mbedtls_ccm_init(&ctx); mbedtls_ccm_init(&ctx);
TEST_EQUAL(mbedtls_ccm_setkey(&ctx, cipher_id, key->x, key->len * 8), 0); TEST_EQUAL(mbedtls_ccm_setkey(&ctx, cipher_id, key->x, key->len * 8), 0);
@ -204,8 +204,8 @@ void mbedtls_ccm_encrypt_and_tag(int cipher_id, data_t *key,
TEST_EQUAL(mbedtls_ccm_encrypt_and_tag(&ctx, msg->len, iv->x, iv->len, add->x, add->len, TEST_EQUAL(mbedtls_ccm_encrypt_and_tag(&ctx, msg->len, iv->x, iv->len, add->x, add->len,
io_msg_buf, io_msg_buf, tag_buf, expected_tag_len), 0); io_msg_buf, io_msg_buf, tag_buf, expected_tag_len), 0);
ASSERT_COMPARE(io_msg_buf, msg->len, result->x, msg->len); TEST_MEMORY_COMPARE(io_msg_buf, msg->len, result->x, msg->len);
ASSERT_COMPARE(tag_buf, expected_tag_len, expected_tag, expected_tag_len); TEST_MEMORY_COMPARE(tag_buf, expected_tag_len, expected_tag, expected_tag_len);
/* Prepare data_t structures for multipart testing */ /* Prepare data_t structures for multipart testing */
const data_t encrypted_expected = { .x = result->x, const data_t encrypted_expected = { .x = result->x,
@ -246,10 +246,10 @@ void mbedtls_ccm_star_no_tag(int cipher_id, int mode, data_t *key,
TEST_EQUAL(0, mbedtls_ccm_starts(&ctx, mode, iv->x, iv->len)); TEST_EQUAL(0, mbedtls_ccm_starts(&ctx, mode, iv->x, iv->len));
TEST_EQUAL(0, mbedtls_ccm_set_lengths(&ctx, 0, msg->len, 0)); TEST_EQUAL(0, mbedtls_ccm_set_lengths(&ctx, 0, msg->len, 0));
ASSERT_ALLOC(output, msg->len); TEST_CALLOC(output, msg->len);
TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen)); TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen));
TEST_EQUAL(result->len, olen); TEST_EQUAL(result->len, olen);
ASSERT_COMPARE(output, olen, result->x, result->len); TEST_MEMORY_COMPARE(output, olen, result->x, result->len);
TEST_EQUAL(0, mbedtls_ccm_finish(&ctx, NULL, 0)); TEST_EQUAL(0, mbedtls_ccm_finish(&ctx, NULL, 0));
exit: exit:
@ -272,7 +272,7 @@ void mbedtls_ccm_auth_decrypt(int cipher_id, data_t *key,
/* Prepare input/output message buffer */ /* Prepare input/output message buffer */
uint8_t *io_msg_buf = NULL; uint8_t *io_msg_buf = NULL;
ASSERT_ALLOC(io_msg_buf, expected_msg_len); TEST_CALLOC(io_msg_buf, expected_msg_len);
if (expected_msg_len) { if (expected_msg_len) {
memcpy(io_msg_buf, msg->x, expected_msg_len); memcpy(io_msg_buf, msg->x, expected_msg_len);
} }
@ -285,7 +285,7 @@ void mbedtls_ccm_auth_decrypt(int cipher_id, data_t *key,
result); result);
if (result == 0) { if (result == 0) {
ASSERT_COMPARE(io_msg_buf, expected_msg_len, expected_msg->x, expected_msg_len); TEST_MEMORY_COMPARE(io_msg_buf, expected_msg_len, expected_msg->x, expected_msg_len);
/* Prepare data_t structures for multipart testing */ /* Prepare data_t structures for multipart testing */
const data_t encrypted = { .x = msg->x, const data_t encrypted = { .x = msg->x,
@ -344,16 +344,16 @@ void mbedtls_ccm_star_encrypt_and_tag(int cipher_id,
} }
/* Prepare input/output message buffer */ /* Prepare input/output message buffer */
ASSERT_ALLOC(io_msg_buf, msg->len); TEST_CALLOC(io_msg_buf, msg->len);
if (msg->len) { if (msg->len) {
memcpy(io_msg_buf, msg->x, msg->len); memcpy(io_msg_buf, msg->x, msg->len);
} }
/* Prepare tag buffer */ /* Prepare tag buffer */
if (expected_tag_len == 0) { if (expected_tag_len == 0) {
ASSERT_ALLOC(tag_buf, 16); TEST_CALLOC(tag_buf, 16);
} else { } else {
ASSERT_ALLOC(tag_buf, expected_tag_len); TEST_CALLOC(tag_buf, expected_tag_len);
} }
/* Calculate iv */ /* Calculate iv */
@ -372,8 +372,8 @@ void mbedtls_ccm_star_encrypt_and_tag(int cipher_id,
add->x, add->len, io_msg_buf, add->x, add->len, io_msg_buf,
io_msg_buf, tag_buf, expected_tag_len), output_ret); io_msg_buf, tag_buf, expected_tag_len), output_ret);
ASSERT_COMPARE(io_msg_buf, msg->len, expected_result->x, msg->len); TEST_MEMORY_COMPARE(io_msg_buf, msg->len, expected_result->x, msg->len);
ASSERT_COMPARE(tag_buf, expected_tag_len, expected_tag, expected_tag_len); TEST_MEMORY_COMPARE(tag_buf, expected_tag_len, expected_tag, expected_tag_len);
if (output_ret == 0) { if (output_ret == 0) {
const data_t iv_data = { .x = iv, const data_t iv_data = { .x = iv,
@ -429,7 +429,7 @@ void mbedtls_ccm_star_auth_decrypt(int cipher_id,
/* Prepare input/output message buffer */ /* Prepare input/output message buffer */
uint8_t *io_msg_buf = NULL; uint8_t *io_msg_buf = NULL;
ASSERT_ALLOC(io_msg_buf, expected_msg_len); TEST_CALLOC(io_msg_buf, expected_msg_len);
if (expected_msg_len) { if (expected_msg_len) {
memcpy(io_msg_buf, msg->x, expected_msg_len); memcpy(io_msg_buf, msg->x, expected_msg_len);
} }
@ -450,7 +450,7 @@ void mbedtls_ccm_star_auth_decrypt(int cipher_id,
add->x, add->len, io_msg_buf, io_msg_buf, add->x, add->len, io_msg_buf, io_msg_buf,
expected_tag, expected_tag_len), output_ret); expected_tag, expected_tag_len), output_ret);
ASSERT_COMPARE(io_msg_buf, expected_msg_len, expected_result->x, expected_msg_len); TEST_MEMORY_COMPARE(io_msg_buf, expected_msg_len, expected_result->x, expected_msg_len);
if (output_ret == 0) { if (output_ret == 0) {
const data_t iv_data = { .x = iv, const data_t iv_data = { .x = iv,
@ -500,17 +500,17 @@ void mbedtls_ccm_skip_ad(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_starts(&ctx, mode, iv->x, iv->len)); TEST_EQUAL(0, mbedtls_ccm_starts(&ctx, mode, iv->x, iv->len));
TEST_EQUAL(0, mbedtls_ccm_set_lengths(&ctx, 0, msg->len, tag->len)); TEST_EQUAL(0, mbedtls_ccm_set_lengths(&ctx, 0, msg->len, tag->len));
ASSERT_ALLOC(output, result->len); TEST_CALLOC(output, result->len);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len, output, result->len, &olen)); TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len, output, result->len, &olen));
TEST_EQUAL(result->len, olen); TEST_EQUAL(result->len, olen);
ASSERT_COMPARE(output, olen, result->x, result->len); TEST_MEMORY_COMPARE(output, olen, result->x, result->len);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
ASSERT_ALLOC(output, tag->len); TEST_CALLOC(output, tag->len);
TEST_EQUAL(0, mbedtls_ccm_finish(&ctx, output, tag->len)); TEST_EQUAL(0, mbedtls_ccm_finish(&ctx, output, tag->len));
ASSERT_COMPARE(output, tag->len, tag->x, tag->len); TEST_MEMORY_COMPARE(output, tag->len, tag->x, tag->len);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
@ -536,9 +536,9 @@ void mbedtls_ccm_skip_update(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len)); TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len));
ASSERT_ALLOC(output, tag->len); TEST_CALLOC(output, tag->len);
TEST_EQUAL(0, mbedtls_ccm_finish(&ctx, output, tag->len)); TEST_EQUAL(0, mbedtls_ccm_finish(&ctx, output, tag->len));
ASSERT_COMPARE(output, tag->len, tag->x, tag->len); TEST_MEMORY_COMPARE(output, tag->len, tag->x, tag->len);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
@ -607,7 +607,7 @@ void mbedtls_ccm_unexpected_text(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len)); TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len));
ASSERT_ALLOC(output, msg->len); TEST_CALLOC(output, msg->len);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT,
mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen)); mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen));
@ -633,7 +633,7 @@ void mbedtls_ccm_incomplete_ad(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len - 1)); TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len - 1));
ASSERT_ALLOC(output, 16); TEST_CALLOC(output, 16);
TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, mbedtls_ccm_finish(&ctx, output, 16)); TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, mbedtls_ccm_finish(&ctx, output, 16));
exit: exit:
@ -713,7 +713,7 @@ void mbedtls_ccm_overflow_update(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len)); TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len));
ASSERT_ALLOC(output, msg->len); TEST_CALLOC(output, msg->len);
TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, \ TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, \
mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen)); mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen));
exit: exit:
@ -740,13 +740,13 @@ void mbedtls_ccm_incomplete_update(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len)); TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len));
ASSERT_ALLOC(output, msg->len); TEST_CALLOC(output, msg->len);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len - 1, output, msg->len, &olen)); TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len - 1, output, msg->len, &olen));
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
ASSERT_ALLOC(output, 16); TEST_CALLOC(output, 16);
TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, mbedtls_ccm_finish(&ctx, output, 16)); TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, mbedtls_ccm_finish(&ctx, output, 16));
exit: exit:
@ -774,7 +774,7 @@ void mbedtls_ccm_full_update_and_overflow(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len)); TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len));
ASSERT_ALLOC(output, msg->len); TEST_CALLOC(output, msg->len);
// pass full text // pass full text
TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen)); TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len, output, msg->len, &olen));
// pass 1 extra byte // pass 1 extra byte
@ -809,7 +809,7 @@ void mbedtls_ccm_incomplete_update_overflow(int cipher_id, int mode,
TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len)); TEST_EQUAL(0, mbedtls_ccm_update_ad(&ctx, add->x, add->len));
ASSERT_ALLOC(output, msg->len + 1); TEST_CALLOC(output, msg->len + 1);
// pass incomplete text // pass incomplete text
TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len - 1, output, msg->len + 1, &olen)); TEST_EQUAL(0, mbedtls_ccm_update(&ctx, msg->x, msg->len - 1, output, msg->len + 1, &olen));
// pass 2 extra bytes (1 missing byte from previous incomplete pass, and 1 unexpected byte) // pass 2 extra bytes (1 missing byte from previous incomplete pass, and 1 unexpected byte)
@ -836,7 +836,7 @@ void mbedtls_ccm_instant_finish(int cipher_id, int mode,
// They are not a part of this test // They are not a part of this test
TEST_EQUAL(0, mbedtls_ccm_set_lengths(&ctx, 16, 16, 16)); TEST_EQUAL(0, mbedtls_ccm_set_lengths(&ctx, 16, 16, 16));
ASSERT_ALLOC(output, 16); TEST_CALLOC(output, 16);
TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, mbedtls_ccm_finish(&ctx, output, 16)); TEST_EQUAL(MBEDTLS_ERR_CCM_BAD_INPUT, mbedtls_ccm_finish(&ctx, output, 16));
exit: exit:

12
tests/suites/test_suite_chacha20.function
View file

@ -29,8 +29,8 @@ void chacha20_crypt(data_t *key_str,
TEST_ASSERT(mbedtls_chacha20_crypt(key_str->x, nonce_str->x, counter, src_str->len, src_str->x, TEST_ASSERT(mbedtls_chacha20_crypt(key_str->x, nonce_str->x, counter, src_str->len, src_str->x,
output) == 0); output) == 0);
ASSERT_COMPARE(output, expected_output_str->len, TEST_MEMORY_COMPARE(output, expected_output_str->len,
expected_output_str->x, expected_output_str->len); expected_output_str->x, expected_output_str->len);
/* /*
* Test the streaming API * Test the streaming API
@ -44,8 +44,8 @@ void chacha20_crypt(data_t *key_str,
memset(output, 0x00, sizeof(output)); memset(output, 0x00, sizeof(output));
TEST_ASSERT(mbedtls_chacha20_update(&ctx, src_str->len, src_str->x, output) == 0); TEST_ASSERT(mbedtls_chacha20_update(&ctx, src_str->len, src_str->x, output) == 0);
ASSERT_COMPARE(output, expected_output_str->len, TEST_MEMORY_COMPARE(output, expected_output_str->len,
expected_output_str->x, expected_output_str->len); expected_output_str->x, expected_output_str->len);
/* /*
* Test the streaming API again, piecewise * Test the streaming API again, piecewise
@ -60,8 +60,8 @@ void chacha20_crypt(data_t *key_str,
TEST_ASSERT(mbedtls_chacha20_update(&ctx, src_str->len - 1, TEST_ASSERT(mbedtls_chacha20_update(&ctx, src_str->len - 1,
src_str->x + 1, output + 1) == 0); src_str->x + 1, output + 1) == 0);
ASSERT_COMPARE(output, expected_output_str->len, TEST_MEMORY_COMPARE(output, expected_output_str->len,
expected_output_str->x, expected_output_str->len); expected_output_str->x, expected_output_str->len);
mbedtls_chacha20_free(&ctx); mbedtls_chacha20_free(&ctx);
} }

14
tests/suites/test_suite_cipher.function
View file

@ -583,7 +583,7 @@ void dec_empty_buf(int cipher,
iv_len = 12; iv_len = 12;
} }
ASSERT_ALLOC(iv, iv_len); TEST_CALLOC(iv, iv_len);
memset(iv, 0, iv_len); memset(iv, 0, iv_len);
TEST_ASSERT(sizeof(key) * 8 >= mbedtls_cipher_info_get_key_bitlen(cipher_info)); TEST_ASSERT(sizeof(key) * 8 >= mbedtls_cipher_info_get_key_bitlen(cipher_info));
@ -905,7 +905,7 @@ void auth_crypt_tv(int cipher_id, data_t *key, data_t *iv,
* (we need the tag appended to the ciphertext) * (we need the tag appended to the ciphertext)
*/ */
cipher_plus_tag_len = cipher->len + tag->len; cipher_plus_tag_len = cipher->len + tag->len;
ASSERT_ALLOC(cipher_plus_tag, cipher_plus_tag_len); TEST_CALLOC(cipher_plus_tag, cipher_plus_tag_len);
memcpy(cipher_plus_tag, cipher->x, cipher->len); memcpy(cipher_plus_tag, cipher->x, cipher->len);
memcpy(cipher_plus_tag + cipher->len, tag->x, tag->len); memcpy(cipher_plus_tag + cipher->len, tag->x, tag->len);
@ -923,7 +923,7 @@ void auth_crypt_tv(int cipher_id, data_t *key, data_t *iv,
* Try decrypting to a buffer that's 1B too small * Try decrypting to a buffer that's 1B too small
*/ */
if (decrypt_buf_len != 0) { if (decrypt_buf_len != 0) {
ASSERT_ALLOC(decrypt_buf, decrypt_buf_len - 1); TEST_CALLOC(decrypt_buf, decrypt_buf_len - 1);
outlen = 0; outlen = 0;
ret = mbedtls_cipher_auth_decrypt_ext(&ctx, iv->x, iv->len, ret = mbedtls_cipher_auth_decrypt_ext(&ctx, iv->x, iv->len,
@ -938,7 +938,7 @@ void auth_crypt_tv(int cipher_id, data_t *key, data_t *iv,
/* /*
* Authenticate and decrypt, and check result * Authenticate and decrypt, and check result
*/ */
ASSERT_ALLOC(decrypt_buf, decrypt_buf_len); TEST_CALLOC(decrypt_buf, decrypt_buf_len);
outlen = 0; outlen = 0;
ret = mbedtls_cipher_auth_decrypt_ext(&ctx, iv->x, iv->len, ret = mbedtls_cipher_auth_decrypt_ext(&ctx, iv->x, iv->len,
@ -950,7 +950,7 @@ void auth_crypt_tv(int cipher_id, data_t *key, data_t *iv,
TEST_ASSERT(buffer_is_all_zero(decrypt_buf, decrypt_buf_len)); TEST_ASSERT(buffer_is_all_zero(decrypt_buf, decrypt_buf_len));
} else { } else {
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ASSERT_COMPARE(decrypt_buf, outlen, clear->x, clear->len); TEST_MEMORY_COMPARE(decrypt_buf, outlen, clear->x, clear->len);
} }
mbedtls_free(decrypt_buf); mbedtls_free(decrypt_buf);
@ -981,7 +981,7 @@ void auth_crypt_tv(int cipher_id, data_t *key, data_t *iv,
/* /*
* Try encrypting with an output buffer that's 1B too small * Try encrypting with an output buffer that's 1B too small
*/ */
ASSERT_ALLOC(encrypt_buf, encrypt_buf_len - 1); TEST_CALLOC(encrypt_buf, encrypt_buf_len - 1);
outlen = 0; outlen = 0;
ret = mbedtls_cipher_auth_encrypt_ext(&ctx, iv->x, iv->len, ret = mbedtls_cipher_auth_encrypt_ext(&ctx, iv->x, iv->len,
@ -995,7 +995,7 @@ void auth_crypt_tv(int cipher_id, data_t *key, data_t *iv,
/* /*
* Encrypt and check the result * Encrypt and check the result
*/ */
ASSERT_ALLOC(encrypt_buf, encrypt_buf_len); TEST_CALLOC(encrypt_buf, encrypt_buf_len);
outlen = 0; outlen = 0;
ret = mbedtls_cipher_auth_encrypt_ext(&ctx, iv->x, iv->len, ret = mbedtls_cipher_auth_encrypt_ext(&ctx, iv->x, iv->len,

20
tests/suites/test_suite_common.function
View file

@ -17,10 +17,10 @@ void mbedtls_xor(int len)
{ {
size_t n = (size_t) len; size_t n = (size_t) len;
unsigned char *a = NULL, *b = NULL, *r1 = NULL, *r2 = NULL; unsigned char *a = NULL, *b = NULL, *r1 = NULL, *r2 = NULL;
ASSERT_ALLOC(a, n + 1); TEST_CALLOC(a, n + 1);
ASSERT_ALLOC(b, n + 1); TEST_CALLOC(b, n + 1);
ASSERT_ALLOC(r1, n + 1); TEST_CALLOC(r1, n + 1);
ASSERT_ALLOC(r2, n + 1); TEST_CALLOC(r2, n + 1);
/* Test non-overlapping */ /* Test non-overlapping */
fill_arrays(a, b, r1, r2, n); fill_arrays(a, b, r1, r2, n);
@ -28,7 +28,7 @@ void mbedtls_xor(int len)
r1[i] = a[i] ^ b[i]; r1[i] = a[i] ^ b[i];
} }
mbedtls_xor(r2, a, b, n); mbedtls_xor(r2, a, b, n);
ASSERT_COMPARE(r1, n, r2, n); TEST_MEMORY_COMPARE(r1, n, r2, n);
/* Test r == a */ /* Test r == a */
fill_arrays(a, b, r1, r2, n); fill_arrays(a, b, r1, r2, n);
@ -36,7 +36,7 @@ void mbedtls_xor(int len)
r1[i] = r1[i] ^ b[i]; r1[i] = r1[i] ^ b[i];
} }
mbedtls_xor(r2, r2, b, n); mbedtls_xor(r2, r2, b, n);
ASSERT_COMPARE(r1, n, r2, n); TEST_MEMORY_COMPARE(r1, n, r2, n);
/* Test r == b */ /* Test r == b */
fill_arrays(a, b, r1, r2, n); fill_arrays(a, b, r1, r2, n);
@ -44,7 +44,7 @@ void mbedtls_xor(int len)
r1[i] = a[i] ^ r1[i]; r1[i] = a[i] ^ r1[i];
} }
mbedtls_xor(r2, a, r2, n); mbedtls_xor(r2, a, r2, n);
ASSERT_COMPARE(r1, n, r2, n); TEST_MEMORY_COMPARE(r1, n, r2, n);
/* Test a == b */ /* Test a == b */
fill_arrays(a, b, r1, r2, n); fill_arrays(a, b, r1, r2, n);
@ -52,7 +52,7 @@ void mbedtls_xor(int len)
r1[i] = a[i] ^ a[i]; r1[i] = a[i] ^ a[i];
} }
mbedtls_xor(r2, a, a, n); mbedtls_xor(r2, a, a, n);
ASSERT_COMPARE(r1, n, r2, n); TEST_MEMORY_COMPARE(r1, n, r2, n);
/* Test a == b == r */ /* Test a == b == r */
fill_arrays(a, b, r1, r2, n); fill_arrays(a, b, r1, r2, n);
@ -60,7 +60,7 @@ void mbedtls_xor(int len)
r1[i] = r1[i] ^ r1[i]; r1[i] = r1[i] ^ r1[i];
} }
mbedtls_xor(r2, r2, r2, n); mbedtls_xor(r2, r2, r2, n);
ASSERT_COMPARE(r1, n, r2, n); TEST_MEMORY_COMPARE(r1, n, r2, n);
/* Test non-word-aligned buffers, for all combinations of alignedness */ /* Test non-word-aligned buffers, for all combinations of alignedness */
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
@ -71,7 +71,7 @@ void mbedtls_xor(int len)
r1[j + r_off] = a[j + a_off] ^ b[j + b_off]; r1[j + r_off] = a[j + a_off] ^ b[j + b_off];
} }
mbedtls_xor(r2 + r_off, a + a_off, b + b_off, n); mbedtls_xor(r2 + r_off, a + a_off, b + b_off, n);
ASSERT_COMPARE(r1 + r_off, n, r2 + r_off, n); TEST_MEMORY_COMPARE(r1 + r_off, n, r2 + r_off, n);
} }
exit: exit:
mbedtls_free(a); mbedtls_free(a);

20
tests/suites/test_suite_constant_time.function
View file

@ -29,8 +29,8 @@ void mbedtls_ct_memcmp_null()
void mbedtls_ct_memcmp(int same, int size, int offset) void mbedtls_ct_memcmp(int same, int size, int offset)
{ {
uint8_t *a = NULL, *b = NULL; uint8_t *a = NULL, *b = NULL;
ASSERT_ALLOC(a, size + offset); TEST_CALLOC(a, size + offset);
ASSERT_ALLOC(b, size + offset); TEST_CALLOC(b, size + offset);
TEST_CF_SECRET(a + offset, size); TEST_CF_SECRET(a + offset, size);
TEST_CF_SECRET(b + offset, size); TEST_CF_SECRET(b + offset, size);
@ -70,9 +70,9 @@ exit:
void mbedtls_ct_memcpy_if_eq(int eq, int size, int offset) void mbedtls_ct_memcpy_if_eq(int eq, int size, int offset)
{ {
uint8_t *src = NULL, *result = NULL, *expected = NULL; uint8_t *src = NULL, *result = NULL, *expected = NULL;
ASSERT_ALLOC(src, size + offset); TEST_CALLOC(src, size + offset);
ASSERT_ALLOC(result, size + offset); TEST_CALLOC(result, size + offset);
ASSERT_ALLOC(expected, size + offset); TEST_CALLOC(expected, size + offset);
for (int i = 0; i < size + offset; i++) { for (int i = 0; i < size + offset; i++) {
src[i] = 1; src[i] = 1;
@ -91,7 +91,7 @@ void mbedtls_ct_memcpy_if_eq(int eq, int size, int offset)
TEST_CF_PUBLIC(&one, sizeof(one)); TEST_CF_PUBLIC(&one, sizeof(one));
TEST_CF_PUBLIC(&secret_eq, sizeof(secret_eq)); TEST_CF_PUBLIC(&secret_eq, sizeof(secret_eq));
ASSERT_COMPARE(expected, size, result + offset, size); TEST_MEMORY_COMPARE(expected, size, result + offset, size);
for (int i = 0; i < size + offset; i++) { for (int i = 0; i < size + offset; i++) {
src[i] = 1; src[i] = 1;
@ -109,7 +109,7 @@ void mbedtls_ct_memcpy_if_eq(int eq, int size, int offset)
TEST_CF_PUBLIC(&one, sizeof(one)); TEST_CF_PUBLIC(&one, sizeof(one));
TEST_CF_PUBLIC(&secret_eq, sizeof(secret_eq)); TEST_CF_PUBLIC(&secret_eq, sizeof(secret_eq));
ASSERT_COMPARE(expected, size, result, size); TEST_MEMORY_COMPARE(expected, size, result, size);
exit: exit:
mbedtls_free(src); mbedtls_free(src);
mbedtls_free(result); mbedtls_free(result);
@ -125,8 +125,8 @@ void ssl_cf_memcpy_offset(int offset_min, int offset_max, int len)
size_t src_len = offset_max + len; size_t src_len = offset_max + len;
size_t secret; size_t secret;
ASSERT_ALLOC(dst, len); TEST_CALLOC(dst, len);
ASSERT_ALLOC(src, src_len); TEST_CALLOC(src, src_len);
/* Fill src in a way that we can detect if we copied the right bytes */ /* Fill src in a way that we can detect if we copied the right bytes */
mbedtls_test_rnd_std_rand(NULL, src, src_len); mbedtls_test_rnd_std_rand(NULL, src, src_len);
@ -140,7 +140,7 @@ void ssl_cf_memcpy_offset(int offset_min, int offset_max, int len)
TEST_CF_PUBLIC(&secret, sizeof(secret)); TEST_CF_PUBLIC(&secret, sizeof(secret));
TEST_CF_PUBLIC(dst, len); TEST_CF_PUBLIC(dst, len);
ASSERT_COMPARE(dst, len, src + secret, len); TEST_MEMORY_COMPARE(dst, len, src + secret, len);
} }
exit: exit:

6
tests/suites/test_suite_constant_time_hmac.function
View file

@ -58,7 +58,7 @@ void ssl_cf_hmac(int hash)
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
/* Use allocated out buffer to catch overwrites */ /* Use allocated out buffer to catch overwrites */
ASSERT_ALLOC(out, out_len); TEST_CALLOC(out, out_len);
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
/* Set up dummy key */ /* Set up dummy key */
@ -85,7 +85,7 @@ void ssl_cf_hmac(int hash)
mbedtls_test_set_step(max_in_len * 10000); mbedtls_test_set_step(max_in_len * 10000);
/* Use allocated in buffer to catch overreads */ /* Use allocated in buffer to catch overreads */
ASSERT_ALLOC(data, max_in_len); TEST_CALLOC(data, max_in_len);
min_in_len = max_in_len > 255 ? max_in_len - 255 : 0; min_in_len = max_in_len > 255 ? max_in_len - 255 : 0;
for (in_len = min_in_len; in_len <= max_in_len; in_len++) { for (in_len = min_in_len; in_len <= max_in_len; in_len++) {
@ -133,7 +133,7 @@ void ssl_cf_hmac(int hash)
TEST_EQUAL(0, mbedtls_md_hmac_reset(&ref_ctx)); TEST_EQUAL(0, mbedtls_md_hmac_reset(&ref_ctx));
/* Compare */ /* Compare */
ASSERT_COMPARE(out, out_len, ref_out, out_len); TEST_MEMORY_COMPARE(out, out_len, ref_out, out_len);
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
} }

46
tests/suites/test_suite_ecp.function
View file

@ -538,8 +538,8 @@ void ecp_muladd(int id,
&len, actual_result, sizeof(actual_result))); &len, actual_result, sizeof(actual_result)));
TEST_ASSERT(len <= MBEDTLS_ECP_MAX_PT_LEN); TEST_ASSERT(len <= MBEDTLS_ECP_MAX_PT_LEN);
ASSERT_COMPARE(expected_result->x, expected_result->len, TEST_MEMORY_COMPARE(expected_result->x, expected_result->len,
actual_result, len); actual_result, len);
exit: exit:
mbedtls_ecp_group_free(&grp); mbedtls_ecp_group_free(&grp);
@ -1061,8 +1061,8 @@ void mbedtls_ecp_read_key(int grp_id, data_t *in_key, int expected, int canonica
ret = mbedtls_ecp_write_key(&key, buf, in_key->len); ret = mbedtls_ecp_write_key(&key, buf, in_key->len);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ASSERT_COMPARE(in_key->x, in_key->len, TEST_MEMORY_COMPARE(in_key->x, in_key->len,
buf, in_key->len); buf, in_key->len);
} else { } else {
unsigned char export1[MBEDTLS_ECP_MAX_BYTES]; unsigned char export1[MBEDTLS_ECP_MAX_BYTES];
unsigned char export2[MBEDTLS_ECP_MAX_BYTES]; unsigned char export2[MBEDTLS_ECP_MAX_BYTES];
@ -1076,8 +1076,8 @@ void mbedtls_ecp_read_key(int grp_id, data_t *in_key, int expected, int canonica
ret = mbedtls_ecp_write_key(&key2, export2, in_key->len); ret = mbedtls_ecp_write_key(&key2, export2, in_key->len);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ASSERT_COMPARE(export1, in_key->len, TEST_MEMORY_COMPARE(export1, in_key->len,
export2, in_key->len); export2, in_key->len);
} }
} }
@ -1101,7 +1101,7 @@ void genkey_mx_known_answer(int bits, data_t *seed, data_t *expected)
rnd_info.fallback_f_rng = NULL; rnd_info.fallback_f_rng = NULL;
rnd_info.fallback_p_rng = NULL; rnd_info.fallback_p_rng = NULL;
ASSERT_ALLOC(actual, expected->len); TEST_CALLOC(actual, expected->len);
ret = mbedtls_ecp_gen_privkey_mx(bits, &d, ret = mbedtls_ecp_gen_privkey_mx(bits, &d,
mbedtls_test_rnd_buffer_rand, &rnd_info); mbedtls_test_rnd_buffer_rand, &rnd_info);
@ -1123,8 +1123,8 @@ void genkey_mx_known_answer(int bits, data_t *seed, data_t *expected)
* (can be enforced by checking these bits). * (can be enforced by checking these bits).
* - Other bits must be random (by testing with different RNG outputs, * - Other bits must be random (by testing with different RNG outputs,
* we validate that those bits are indeed influenced by the RNG). */ * we validate that those bits are indeed influenced by the RNG). */
ASSERT_COMPARE(expected->x, expected->len, TEST_MEMORY_COMPARE(expected->x, expected->len,
actual, expected->len); actual, expected->len);
} }
exit: exit:
@ -1379,7 +1379,7 @@ void ecp_mod_p_generic_raw(int curve_id,
TEST_LE_U(mbedtls_mpi_core_bitlen(X, limbs_X), curve_bits); TEST_LE_U(mbedtls_mpi_core_bitlen(X, limbs_X), curve_bits);
mbedtls_mpi_mod_raw_fix_quasi_reduction(X, &m); mbedtls_mpi_mod_raw_fix_quasi_reduction(X, &m);
ASSERT_COMPARE(X, bytes, res, bytes); TEST_MEMORY_COMPARE(X, bytes, res, bytes);
exit: exit:
mbedtls_free(X); mbedtls_free(X);
@ -1420,7 +1420,7 @@ void ecp_mod_setup(char *input_A, int id, int ctype, int iret)
} }
/* Compare output byte-by-byte */ /* Compare output byte-by-byte */
ASSERT_COMPARE(p, bytes, m.p, bytes); TEST_MEMORY_COMPARE(p, bytes, m.p, bytes);
/* Test for user free-ing allocated memory */ /* Test for user free-ing allocated memory */
mbedtls_mpi_mod_modulus_free(&m); mbedtls_mpi_mod_modulus_free(&m);
@ -1456,10 +1456,10 @@ void ecp_mod_mul_inv(char *input_A, int id, int ctype)
/* Test for limb sizes */ /* Test for limb sizes */
TEST_EQUAL(m.limbs, limbs); TEST_EQUAL(m.limbs, limbs);
ASSERT_ALLOC(A_inverse, limbs); TEST_CALLOC(A_inverse, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rA_inverse, &m, A_inverse, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rA_inverse, &m, A_inverse, limbs));
ASSERT_ALLOC(rX_raw, limbs); TEST_CALLOC(rX_raw, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rX, &m, rX_raw, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rX, &m, rX_raw, limbs));
/* Get inverse of A mode m, and multiply it with itself, /* Get inverse of A mode m, and multiply it with itself,
@ -1467,15 +1467,15 @@ void ecp_mod_mul_inv(char *input_A, int id, int ctype)
TEST_EQUAL(0, mbedtls_mpi_mod_inv(&rA_inverse, &rA, &m)); TEST_EQUAL(0, mbedtls_mpi_mod_inv(&rA_inverse, &rA, &m));
TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rA_inverse, &m), 0); TEST_EQUAL(mbedtls_mpi_mod_mul(&rX, &rA, &rA_inverse, &m), 0);
ASSERT_ALLOC(bufx, limbs); TEST_CALLOC(bufx, limbs);
TEST_EQUAL(mbedtls_mpi_mod_write(&rX, &m, (unsigned char *) bufx, TEST_EQUAL(mbedtls_mpi_mod_write(&rX, &m, (unsigned char *) bufx,
limbs * ciL, limbs * ciL,
MBEDTLS_MPI_MOD_EXT_REP_LE), 0); MBEDTLS_MPI_MOD_EXT_REP_LE), 0);
ASSERT_COMPARE(bufx, ciL, one, ciL); TEST_MEMORY_COMPARE(bufx, ciL, one, ciL);
/*Borrow the buffer of A to compare the left lims with 0 */ /*Borrow the buffer of A to compare the left lims with 0 */
memset(A, 0, limbs * ciL); memset(A, 0, limbs * ciL);
ASSERT_COMPARE(&bufx[1], (limbs - 1) * ciL, A, (limbs - 1) * ciL); TEST_MEMORY_COMPARE(&bufx[1], (limbs - 1) * ciL, A, (limbs - 1) * ciL);
exit: exit:
mbedtls_mpi_mod_modulus_free(&m); mbedtls_mpi_mod_modulus_free(&m);
@ -1515,7 +1515,7 @@ void ecp_mod_add_sub(char *input_A, char *input_B, int id, int ctype)
TEST_EQUAL(m.limbs, p_A_limbs); TEST_EQUAL(m.limbs, p_A_limbs);
bytes = p_A_limbs * ciL; bytes = p_A_limbs * ciL;
ASSERT_ALLOC(p_S, p_A_limbs); TEST_CALLOC(p_S, p_A_limbs);
TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rA, &m, p_A, p_A_limbs), 0); TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rA, &m, p_A, p_A_limbs), 0);
TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rB, &m, p_B, p_B_limbs), 0); TEST_EQUAL(mbedtls_mpi_mod_residue_setup(&rB, &m, p_B, p_B_limbs), 0);
@ -1527,7 +1527,7 @@ void ecp_mod_add_sub(char *input_A, char *input_B, int id, int ctype)
TEST_EQUAL(0, mbedtls_mpi_mod_sub(&rS, &rS, &rB, &m)); TEST_EQUAL(0, mbedtls_mpi_mod_sub(&rS, &rS, &rB, &m));
/* Compare difference with rA byte-by-byte */ /* Compare difference with rA byte-by-byte */
ASSERT_COMPARE(rA.p, bytes, rS.p, bytes); TEST_MEMORY_COMPARE(rA.p, bytes, rS.p, bytes);
exit: exit:
mbedtls_mpi_mod_modulus_free(&m); mbedtls_mpi_mod_modulus_free(&m);
@ -1562,11 +1562,11 @@ void ecp_mod_read_write(char *input_A, int id, int ctype)
/* Test for limb sizes */ /* Test for limb sizes */
TEST_EQUAL(m.limbs, limbs); TEST_EQUAL(m.limbs, limbs);
ASSERT_ALLOC(rX_raw, limbs); TEST_CALLOC(rX_raw, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rX, &m, rX_raw, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rX, &m, rX_raw, limbs));
bytes = limbs * ciL; bytes = limbs * ciL;
ASSERT_ALLOC(bufx, limbs); TEST_CALLOC(bufx, limbs);
/* Write source mod residue to a buffer, then read it back to /* Write source mod residue to a buffer, then read it back to
* the destination mod residue, compare the two mod residues. * the destination mod residue, compare the two mod residues.
* Firstly test little endian write and read */ * Firstly test little endian write and read */
@ -1577,7 +1577,7 @@ void ecp_mod_read_write(char *input_A, int id, int ctype)
bytes, MBEDTLS_MPI_MOD_EXT_REP_LE)); bytes, MBEDTLS_MPI_MOD_EXT_REP_LE));
TEST_EQUAL(limbs, rX.limbs); TEST_EQUAL(limbs, rX.limbs);
ASSERT_COMPARE(rA.p, bytes, rX.p, bytes); TEST_MEMORY_COMPARE(rA.p, bytes, rX.p, bytes);
memset(bufx, 0x00, bytes); memset(bufx, 0x00, bytes);
memset(rX_raw, 0x00, bytes); memset(rX_raw, 0x00, bytes);
@ -1591,7 +1591,7 @@ void ecp_mod_read_write(char *input_A, int id, int ctype)
MBEDTLS_MPI_MOD_EXT_REP_BE)); MBEDTLS_MPI_MOD_EXT_REP_BE));
TEST_EQUAL(limbs, rX.limbs); TEST_EQUAL(limbs, rX.limbs);
ASSERT_COMPARE(rA.p, bytes, rX.p, bytes); TEST_MEMORY_COMPARE(rA.p, bytes, rX.p, bytes);
exit: exit:
mbedtls_mpi_mod_modulus_free(&m); mbedtls_mpi_mod_modulus_free(&m);
@ -1616,7 +1616,7 @@ void ecp_mod_random(int id, int ctype)
limbs = m.limbs; limbs = m.limbs;
ASSERT_ALLOC(rX_raw, limbs); TEST_CALLOC(rX_raw, limbs);
TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rX, &m, rX_raw, limbs)); TEST_EQUAL(0, mbedtls_mpi_mod_residue_setup(&rX, &m, rX_raw, limbs));
TEST_EQUAL(0, mbedtls_mpi_mod_random(&rX, 1, &m, TEST_EQUAL(0, mbedtls_mpi_mod_random(&rX, 1, &m,

36
tests/suites/test_suite_gcm.function
View file

@ -33,26 +33,26 @@ static int check_multipart(mbedtls_gcm_context *ctx,
/* Allocate a tight buffer for each update call. This way, if the function /* Allocate a tight buffer for each update call. This way, if the function
* tries to write beyond the advertised required buffer size, this will * tries to write beyond the advertised required buffer size, this will
* count as an overflow for memory sanitizers and static checkers. */ * count as an overflow for memory sanitizers and static checkers. */
ASSERT_ALLOC(output, n1); TEST_CALLOC(output, n1);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(0, mbedtls_gcm_update(ctx, input->x, n1, output, n1, &olen)); TEST_EQUAL(0, mbedtls_gcm_update(ctx, input->x, n1, output, n1, &olen));
TEST_EQUAL(n1, olen); TEST_EQUAL(n1, olen);
ASSERT_COMPARE(output, olen, expected_output->x, n1); TEST_MEMORY_COMPARE(output, olen, expected_output->x, n1);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
ASSERT_ALLOC(output, n2); TEST_CALLOC(output, n2);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(0, mbedtls_gcm_update(ctx, input->x + n1, n2, output, n2, &olen)); TEST_EQUAL(0, mbedtls_gcm_update(ctx, input->x + n1, n2, output, n2, &olen));
TEST_EQUAL(n2, olen); TEST_EQUAL(n2, olen);
ASSERT_COMPARE(output, olen, expected_output->x + n1, n2); TEST_MEMORY_COMPARE(output, olen, expected_output->x + n1, n2);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
ASSERT_ALLOC(output, tag->len); TEST_CALLOC(output, tag->len);
TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen, output, tag->len)); TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen, output, tag->len));
TEST_EQUAL(0, olen); TEST_EQUAL(0, olen);
ASSERT_COMPARE(output, tag->len, tag->x, tag->len); TEST_MEMORY_COMPARE(output, tag->len, tag->x, tag->len);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
@ -87,18 +87,18 @@ static void check_cipher_with_empty_ad(mbedtls_gcm_context *ctx,
/* Allocate a tight buffer for each update call. This way, if the function /* Allocate a tight buffer for each update call. This way, if the function
* tries to write beyond the advertised required buffer size, this will * tries to write beyond the advertised required buffer size, this will
* count as an overflow for memory sanitizers and static checkers. */ * count as an overflow for memory sanitizers and static checkers. */
ASSERT_ALLOC(output, input->len); TEST_CALLOC(output, input->len);
olen = 0xdeadbeef; olen = 0xdeadbeef;
TEST_EQUAL(0, mbedtls_gcm_update(ctx, input->x, input->len, output, input->len, &olen)); TEST_EQUAL(0, mbedtls_gcm_update(ctx, input->x, input->len, output, input->len, &olen));
TEST_EQUAL(input->len, olen); TEST_EQUAL(input->len, olen);
ASSERT_COMPARE(output, olen, expected_output->x, input->len); TEST_MEMORY_COMPARE(output, olen, expected_output->x, input->len);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
ASSERT_ALLOC(output, tag->len); TEST_CALLOC(output, tag->len);
TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen, output, tag->len)); TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen, output, tag->len));
TEST_EQUAL(0, olen); TEST_EQUAL(0, olen);
ASSERT_COMPARE(output, tag->len, tag->x, tag->len); TEST_MEMORY_COMPARE(output, tag->len, tag->x, tag->len);
exit: exit:
mbedtls_free(output); mbedtls_free(output);
@ -124,11 +124,11 @@ static void check_empty_cipher_with_ad(mbedtls_gcm_context *ctx,
TEST_EQUAL(0, olen); TEST_EQUAL(0, olen);
} }
ASSERT_ALLOC(output_tag, tag->len); TEST_CALLOC(output_tag, tag->len);
TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen, TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen,
output_tag, tag->len)); output_tag, tag->len));
TEST_EQUAL(0, olen); TEST_EQUAL(0, olen);
ASSERT_COMPARE(output_tag, tag->len, tag->x, tag->len); TEST_MEMORY_COMPARE(output_tag, tag->len, tag->x, tag->len);
exit: exit:
mbedtls_free(output_tag); mbedtls_free(output_tag);
@ -144,10 +144,10 @@ static void check_no_cipher_no_ad(mbedtls_gcm_context *ctx,
TEST_EQUAL(0, mbedtls_gcm_starts(ctx, mode, TEST_EQUAL(0, mbedtls_gcm_starts(ctx, mode,
iv->x, iv->len)); iv->x, iv->len));
ASSERT_ALLOC(output, tag->len); TEST_CALLOC(output, tag->len);
TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen, output, tag->len)); TEST_EQUAL(0, mbedtls_gcm_finish(ctx, NULL, 0, &olen, output, tag->len));
TEST_EQUAL(0, olen); TEST_EQUAL(0, olen);
ASSERT_COMPARE(output, tag->len, tag->x, tag->len); TEST_MEMORY_COMPARE(output, tag->len, tag->x, tag->len);
exit: exit:
mbedtls_free(output); mbedtls_free(output);
@ -212,8 +212,8 @@ void gcm_encrypt_and_tag(int cipher_id, data_t *key_str,
iv_str->len, add_str->x, add_str->len, src_str->x, iv_str->len, add_str->x, add_str->len, src_str->x,
output, tag_len, tag_output) == 0); output, tag_len, tag_output) == 0);
ASSERT_COMPARE(output, src_str->len, dst->x, dst->len); TEST_MEMORY_COMPARE(output, src_str->len, dst->x, dst->len);
ASSERT_COMPARE(tag_output, tag_len, tag->x, tag->len); TEST_MEMORY_COMPARE(tag_output, tag_len, tag->x, tag->len);
for (n1 = 0; n1 <= src_str->len; n1 += 1) { for (n1 = 0; n1 <= src_str->len; n1 += 1) {
for (n1_add = 0; n1_add <= add_str->len; n1_add += 1) { for (n1_add = 0; n1_add <= add_str->len; n1_add += 1) {
@ -269,7 +269,7 @@ void gcm_decrypt_and_verify(int cipher_id, data_t *key_str,
TEST_ASSERT(ret == MBEDTLS_ERR_GCM_AUTH_FAILED); TEST_ASSERT(ret == MBEDTLS_ERR_GCM_AUTH_FAILED);
} else { } else {
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ASSERT_COMPARE(output, src_str->len, pt_result->x, pt_result->len); TEST_MEMORY_COMPARE(output, src_str->len, pt_result->x, pt_result->len);
for (n1 = 0; n1 <= src_str->len; n1 += 1) { for (n1 = 0; n1 <= src_str->len; n1 += 1) {
for (n1_add = 0; n1_add <= add_str->len; n1_add += 1) { for (n1_add = 0; n1_add <= add_str->len; n1_add += 1) {
@ -448,7 +448,7 @@ void gcm_update_output_buffer_too_small(int cipher_id, int mode,
TEST_EQUAL(mbedtls_gcm_setkey(&ctx, cipher_id, key_str->x, key_str->len * 8), 0); TEST_EQUAL(mbedtls_gcm_setkey(&ctx, cipher_id, key_str->x, key_str->len * 8), 0);
TEST_EQUAL(0, mbedtls_gcm_starts(&ctx, mode, iv->x, iv->len)); TEST_EQUAL(0, mbedtls_gcm_starts(&ctx, mode, iv->x, iv->len));
ASSERT_ALLOC(output, output_len); TEST_CALLOC(output, output_len);
TEST_EQUAL(MBEDTLS_ERR_GCM_BUFFER_TOO_SMALL, TEST_EQUAL(MBEDTLS_ERR_GCM_BUFFER_TOO_SMALL,
mbedtls_gcm_update(&ctx, input->x, input->len, output, output_len, &olen)); mbedtls_gcm_update(&ctx, input->x, input->len, output, output_len, &olen));

18
tests/suites/test_suite_hkdf.function
View file

@ -26,8 +26,8 @@ void test_hkdf(int md_alg, data_t *ikm, data_t *salt, data_t *info,
info->x, info->len, okm, expected_okm->len); info->x, info->len, okm, expected_okm->len);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ASSERT_COMPARE(okm, expected_okm->len, TEST_MEMORY_COMPARE(okm, expected_okm->len,
expected_okm->x, expected_okm->len); expected_okm->x, expected_okm->len);
exit: exit:
MD_PSA_DONE(); MD_PSA_DONE();
@ -50,13 +50,13 @@ void test_hkdf_extract(int md_alg,
TEST_ASSERT(md != NULL); TEST_ASSERT(md != NULL);
output_prk_len = mbedtls_md_get_size(md); output_prk_len = mbedtls_md_get_size(md);
ASSERT_ALLOC(output_prk, output_prk_len); TEST_CALLOC(output_prk, output_prk_len);
ret = mbedtls_hkdf_extract(md, salt->x, salt->len, ret = mbedtls_hkdf_extract(md, salt->x, salt->len,
ikm->x, ikm->len, output_prk); ikm->x, ikm->len, output_prk);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ASSERT_COMPARE(output_prk, output_prk_len, prk->x, prk->len); TEST_MEMORY_COMPARE(output_prk, output_prk_len, prk->x, prk->len);
exit: exit:
mbedtls_free(output_prk); mbedtls_free(output_prk);
@ -79,7 +79,7 @@ void test_hkdf_expand(int md_alg,
const mbedtls_md_info_t *md = mbedtls_md_info_from_type(md_alg); const mbedtls_md_info_t *md = mbedtls_md_info_from_type(md_alg);
TEST_ASSERT(md != NULL); TEST_ASSERT(md != NULL);
ASSERT_ALLOC(output_okm, OKM_LEN); TEST_CALLOC(output_okm, OKM_LEN);
TEST_ASSERT(prk->len == mbedtls_md_get_size(md)); TEST_ASSERT(prk->len == mbedtls_md_get_size(md));
TEST_ASSERT(okm->len < OKM_LEN); TEST_ASSERT(okm->len < OKM_LEN);
@ -88,7 +88,7 @@ void test_hkdf_expand(int md_alg,
info->x, info->len, info->x, info->len,
output_okm, OKM_LEN); output_okm, OKM_LEN);
TEST_ASSERT(ret == 0); TEST_ASSERT(ret == 0);
ASSERT_COMPARE(output_okm, okm->len, okm->x, okm->len); TEST_MEMORY_COMPARE(output_okm, okm->len, okm->x, okm->len);
exit: exit:
mbedtls_free(output_okm); mbedtls_free(output_okm);
@ -110,7 +110,7 @@ void test_hkdf_extract_ret(int hash_len, int ret)
fake_md_info.type = MBEDTLS_MD_NONE; fake_md_info.type = MBEDTLS_MD_NONE;
fake_md_info.size = hash_len; fake_md_info.size = hash_len;
ASSERT_ALLOC(prk, MBEDTLS_MD_MAX_SIZE); TEST_CALLOC(prk, MBEDTLS_MD_MAX_SIZE);
salt_len = 0; salt_len = 0;
ikm_len = 0; ikm_len = 0;
@ -140,11 +140,11 @@ void test_hkdf_expand_ret(int hash_len, int prk_len, int okm_len, int ret)
info_len = 0; info_len = 0;
if (prk_len > 0) { if (prk_len > 0) {
ASSERT_ALLOC(prk, prk_len); TEST_CALLOC(prk, prk_len);
} }
if (okm_len > 0) { if (okm_len > 0) {
ASSERT_ALLOC(okm, okm_len); TEST_CALLOC(okm, okm_len);
} }
output_ret = mbedtls_hkdf_expand(&fake_md_info, prk, prk_len, output_ret = mbedtls_hkdf_expand(&fake_md_info, prk, prk_len,

16
tests/suites/test_suite_lmots.function
View file

@ -122,7 +122,7 @@ void lmots_verify_test(data_t *msg, data_t *sig, data_t *pub_key,
continue; continue;
} }
ASSERT_ALLOC(tmp_sig, size); TEST_CALLOC(tmp_sig, size);
if (tmp_sig != NULL) { if (tmp_sig != NULL) {
memcpy(tmp_sig, sig->x, MIN(size, sig->len)); memcpy(tmp_sig, sig->x, MIN(size, sig->len));
} }
@ -154,7 +154,7 @@ void lmots_import_export_test(data_t *pub_key, int expected_import_rc)
if (expected_import_rc == 0) { if (expected_import_rc == 0) {
exported_pub_key_buf_size = MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8); exported_pub_key_buf_size = MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8);
ASSERT_ALLOC(exported_pub_key, exported_pub_key_buf_size); TEST_CALLOC(exported_pub_key, exported_pub_key_buf_size);
TEST_EQUAL(mbedtls_lmots_export_public_key(&ctx, exported_pub_key, TEST_EQUAL(mbedtls_lmots_export_public_key(&ctx, exported_pub_key,
exported_pub_key_buf_size, exported_pub_key_buf_size,
@ -162,14 +162,14 @@ void lmots_import_export_test(data_t *pub_key, int expected_import_rc)
TEST_EQUAL(exported_pub_key_size, TEST_EQUAL(exported_pub_key_size,
MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8)); MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8));
ASSERT_COMPARE(pub_key->x, pub_key->len, TEST_MEMORY_COMPARE(pub_key->x, pub_key->len,
exported_pub_key, exported_pub_key_size); exported_pub_key, exported_pub_key_size);
mbedtls_free(exported_pub_key); mbedtls_free(exported_pub_key);
exported_pub_key = NULL; exported_pub_key = NULL;
/* Export into too-small buffer should fail */ /* Export into too-small buffer should fail */
exported_pub_key_buf_size = MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8) - 1; exported_pub_key_buf_size = MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8) - 1;
ASSERT_ALLOC(exported_pub_key, exported_pub_key_buf_size); TEST_CALLOC(exported_pub_key, exported_pub_key_buf_size);
TEST_EQUAL(mbedtls_lmots_export_public_key(&ctx, exported_pub_key, TEST_EQUAL(mbedtls_lmots_export_public_key(&ctx, exported_pub_key,
exported_pub_key_buf_size, NULL), exported_pub_key_buf_size, NULL),
MBEDTLS_ERR_LMS_BUFFER_TOO_SMALL); MBEDTLS_ERR_LMS_BUFFER_TOO_SMALL);
@ -178,13 +178,13 @@ void lmots_import_export_test(data_t *pub_key, int expected_import_rc)
/* Export into too-large buffer should succeed */ /* Export into too-large buffer should succeed */
exported_pub_key_buf_size = MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8) + 1; exported_pub_key_buf_size = MBEDTLS_LMOTS_PUBLIC_KEY_LEN(MBEDTLS_LMOTS_SHA256_N32_W8) + 1;
ASSERT_ALLOC(exported_pub_key, exported_pub_key_buf_size); TEST_CALLOC(exported_pub_key, exported_pub_key_buf_size);
TEST_EQUAL(mbedtls_lmots_export_public_key(&ctx, exported_pub_key, TEST_EQUAL(mbedtls_lmots_export_public_key(&ctx, exported_pub_key,
exported_pub_key_buf_size, exported_pub_key_buf_size,
&exported_pub_key_size), &exported_pub_key_size),
0); 0);
ASSERT_COMPARE(pub_key->x, pub_key->len, TEST_MEMORY_COMPARE(pub_key->x, pub_key->len,
exported_pub_key, exported_pub_key_size); exported_pub_key, exported_pub_key_size);
mbedtls_free(exported_pub_key); mbedtls_free(exported_pub_key);
exported_pub_key = NULL; exported_pub_key = NULL;
} }

16
tests/suites/test_suite_lms.function
View file

@ -124,7 +124,7 @@ void lms_verify_test(data_t *msg, data_t *sig, data_t *pub_key,
continue; continue;
} }
ASSERT_ALLOC(tmp_sig, size); TEST_CALLOC(tmp_sig, size);
if (tmp_sig != NULL) { if (tmp_sig != NULL) {
memcpy(tmp_sig, sig->x, MIN(size, sig->len)); memcpy(tmp_sig, sig->x, MIN(size, sig->len));
} }
@ -156,7 +156,7 @@ void lms_import_export_test(data_t *pub_key, int expected_import_rc)
if (expected_import_rc == 0) { if (expected_import_rc == 0) {
exported_pub_key_buf_size = MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10); exported_pub_key_buf_size = MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10);
ASSERT_ALLOC(exported_pub_key, exported_pub_key_buf_size); TEST_CALLOC(exported_pub_key, exported_pub_key_buf_size);
TEST_EQUAL(mbedtls_lms_export_public_key(&ctx, exported_pub_key, TEST_EQUAL(mbedtls_lms_export_public_key(&ctx, exported_pub_key,
exported_pub_key_buf_size, exported_pub_key_buf_size,
@ -164,14 +164,14 @@ void lms_import_export_test(data_t *pub_key, int expected_import_rc)
TEST_EQUAL(exported_pub_key_size, TEST_EQUAL(exported_pub_key_size,
MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10)); MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10));
ASSERT_COMPARE(pub_key->x, pub_key->len, TEST_MEMORY_COMPARE(pub_key->x, pub_key->len,
exported_pub_key, exported_pub_key_size); exported_pub_key, exported_pub_key_size);
mbedtls_free(exported_pub_key); mbedtls_free(exported_pub_key);
exported_pub_key = NULL; exported_pub_key = NULL;
/* Export into too-small buffer should fail */ /* Export into too-small buffer should fail */
exported_pub_key_buf_size = MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10) - 1; exported_pub_key_buf_size = MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10) - 1;
ASSERT_ALLOC(exported_pub_key, exported_pub_key_buf_size); TEST_CALLOC(exported_pub_key, exported_pub_key_buf_size);
TEST_EQUAL(mbedtls_lms_export_public_key(&ctx, exported_pub_key, TEST_EQUAL(mbedtls_lms_export_public_key(&ctx, exported_pub_key,
exported_pub_key_buf_size, NULL), exported_pub_key_buf_size, NULL),
MBEDTLS_ERR_LMS_BUFFER_TOO_SMALL); MBEDTLS_ERR_LMS_BUFFER_TOO_SMALL);
@ -180,13 +180,13 @@ void lms_import_export_test(data_t *pub_key, int expected_import_rc)
/* Export into too-large buffer should succeed */ /* Export into too-large buffer should succeed */
exported_pub_key_buf_size = MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10) + 1; exported_pub_key_buf_size = MBEDTLS_LMS_PUBLIC_KEY_LEN(MBEDTLS_LMS_SHA256_M32_H10) + 1;
ASSERT_ALLOC(exported_pub_key, exported_pub_key_buf_size); TEST_CALLOC(exported_pub_key, exported_pub_key_buf_size);
TEST_EQUAL(mbedtls_lms_export_public_key(&ctx, exported_pub_key, TEST_EQUAL(mbedtls_lms_export_public_key(&ctx, exported_pub_key,
exported_pub_key_buf_size, exported_pub_key_buf_size,
&exported_pub_key_size), &exported_pub_key_size),
0); 0);
ASSERT_COMPARE(pub_key->x, pub_key->len, TEST_MEMORY_COMPARE(pub_key->x, pub_key->len,
exported_pub_key, exported_pub_key_size); exported_pub_key, exported_pub_key_size);
mbedtls_free(exported_pub_key); mbedtls_free(exported_pub_key);
exported_pub_key = NULL; exported_pub_key = NULL;
} }

20
tests/suites/test_suite_md.function
View file

@ -185,7 +185,7 @@ void md_text(int md_type, char *text_src_string, data_t *hash)
TEST_EQUAL(0, mbedtls_md(md_info, src, src_len, output)); TEST_EQUAL(0, mbedtls_md(md_info, src, src_len, output));
ASSERT_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len); TEST_MEMORY_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len);
exit: exit:
MD_PSA_DONE(); MD_PSA_DONE();
@ -206,7 +206,7 @@ void md_hex(int md_type, data_t *src_str, data_t *hash)
TEST_EQUAL(0, mbedtls_md(md_info, src_str->x, src_str->len, output)); TEST_EQUAL(0, mbedtls_md(md_info, src_str->x, src_str->len, output));
ASSERT_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len); TEST_MEMORY_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len);
exit: exit:
MD_PSA_DONE(); MD_PSA_DONE();
@ -248,14 +248,14 @@ void md_text_multi(int md_type, char *text_src_string,
TEST_EQUAL(0, mbedtls_md_update(&ctx, src + halfway, src_len - halfway)); TEST_EQUAL(0, mbedtls_md_update(&ctx, src + halfway, src_len - halfway));
TEST_EQUAL(0, mbedtls_md_finish(&ctx, output)); TEST_EQUAL(0, mbedtls_md_finish(&ctx, output));
ASSERT_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len); TEST_MEMORY_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len);
/* Test clone */ /* Test clone */
memset(output, 0x00, sizeof(output)); memset(output, 0x00, sizeof(output));
TEST_EQUAL(0, mbedtls_md_update(&ctx_copy, src + halfway, src_len - halfway)); TEST_EQUAL(0, mbedtls_md_update(&ctx_copy, src + halfway, src_len - halfway));
TEST_EQUAL(0, mbedtls_md_finish(&ctx_copy, output)); TEST_EQUAL(0, mbedtls_md_finish(&ctx_copy, output));
ASSERT_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len); TEST_MEMORY_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len);
exit: exit:
mbedtls_md_free(&ctx); mbedtls_md_free(&ctx);
@ -295,14 +295,14 @@ void md_hex_multi(int md_type, data_t *src_str, data_t *hash)
TEST_EQUAL(0, mbedtls_md_update(&ctx, src_str->x + halfway, src_str->len - halfway)); TEST_EQUAL(0, mbedtls_md_update(&ctx, src_str->x + halfway, src_str->len - halfway));
TEST_EQUAL(0, mbedtls_md_finish(&ctx, output)); TEST_EQUAL(0, mbedtls_md_finish(&ctx, output));
ASSERT_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len); TEST_MEMORY_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len);
/* Test clone */ /* Test clone */
memset(output, 0x00, sizeof(output)); memset(output, 0x00, sizeof(output));
TEST_EQUAL(0, mbedtls_md_update(&ctx_copy, src_str->x + halfway, src_str->len - halfway)); TEST_EQUAL(0, mbedtls_md_update(&ctx_copy, src_str->x + halfway, src_str->len - halfway));
TEST_EQUAL(0, mbedtls_md_finish(&ctx_copy, output)); TEST_EQUAL(0, mbedtls_md_finish(&ctx_copy, output));
ASSERT_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len); TEST_MEMORY_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len);
exit: exit:
mbedtls_md_free(&ctx); mbedtls_md_free(&ctx);
@ -328,7 +328,7 @@ void mbedtls_md_hmac(int md_type, int trunc_size,
TEST_EQUAL(0, mbedtls_md_hmac(md_info, key_str->x, key_str->len, TEST_EQUAL(0, mbedtls_md_hmac(md_info, key_str->x, key_str->len,
src_str->x, src_str->len, output)); src_str->x, src_str->len, output));
ASSERT_COMPARE(output, trunc_size, hash->x, hash->len); TEST_MEMORY_COMPARE(output, trunc_size, hash->x, hash->len);
exit: exit:
MD_PSA_DONE(); MD_PSA_DONE();
@ -363,7 +363,7 @@ void md_hmac_multi(int md_type, int trunc_size, data_t *key_str,
TEST_EQUAL(0, mbedtls_md_hmac_update(&ctx, src_str->x + halfway, src_str->len - halfway)); TEST_EQUAL(0, mbedtls_md_hmac_update(&ctx, src_str->x + halfway, src_str->len - halfway));
TEST_EQUAL(0, mbedtls_md_hmac_finish(&ctx, output)); TEST_EQUAL(0, mbedtls_md_hmac_finish(&ctx, output));
ASSERT_COMPARE(output, trunc_size, hash->x, hash->len); TEST_MEMORY_COMPARE(output, trunc_size, hash->x, hash->len);
/* Test again, for reset() */ /* Test again, for reset() */
memset(output, 0x00, sizeof(output)); memset(output, 0x00, sizeof(output));
@ -373,7 +373,7 @@ void md_hmac_multi(int md_type, int trunc_size, data_t *key_str,
TEST_EQUAL(0, mbedtls_md_hmac_update(&ctx, src_str->x + halfway, src_str->len - halfway)); TEST_EQUAL(0, mbedtls_md_hmac_update(&ctx, src_str->x + halfway, src_str->len - halfway));
TEST_EQUAL(0, mbedtls_md_hmac_finish(&ctx, output)); TEST_EQUAL(0, mbedtls_md_hmac_finish(&ctx, output));
ASSERT_COMPARE(output, trunc_size, hash->x, hash->len); TEST_MEMORY_COMPARE(output, trunc_size, hash->x, hash->len);
exit: exit:
mbedtls_md_free(&ctx); mbedtls_md_free(&ctx);
@ -395,7 +395,7 @@ void mbedtls_md_file(int md_type, char *filename,
TEST_EQUAL(0, mbedtls_md_file(md_info, filename, output)); TEST_EQUAL(0, mbedtls_md_file(md_info, filename, output));
ASSERT_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len); TEST_MEMORY_COMPARE(output, mbedtls_md_get_size(md_info), hash->x, hash->len);
exit: exit:
MD_PSA_DONE(); MD_PSA_DONE();

176
tests/suites/test_suite_mps.function
View file

@ -60,7 +60,7 @@ void mbedtls_mps_reader_no_pausing_single_step_single_round(int with_acc)
/* Consumption (upper layer) */ /* Consumption (upper layer) */
/* Consume exactly what's available */ /* Consume exactly what's available */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 100, bufA, 100); TEST_MEMORY_COMPARE(tmp, 100, bufA, 100);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup (lower layer) */ /* Wrapup (lower layer) */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, &paused) == 0); TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, &paused) == 0);
@ -108,14 +108,14 @@ void mbedtls_mps_reader_no_pausing_single_step_multiple_rounds(int with_acc)
/* Consumption (upper layer) */ /* Consumption (upper layer) */
/* Consume exactly what's available */ /* Consume exactly what's available */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 100, bufA, 100); TEST_MEMORY_COMPARE(tmp, 100, bufA, 100);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Preparation */ /* Preparation */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, bufB, sizeof(bufB)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, bufB, sizeof(bufB)) == 0);
/* Consumption */ /* Consumption */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 100, bufB, 100); TEST_MEMORY_COMPARE(tmp, 100, bufB, 100);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup (lower layer) */ /* Wrapup (lower layer) */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
@ -162,11 +162,11 @@ void mbedtls_mps_reader_no_pausing_multiple_steps_single_round(int with_acc)
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0);
/* Consumption (upper layer) */ /* Consumption (upper layer) */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, buf, 10); TEST_MEMORY_COMPARE(tmp, 10, buf, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 70, buf + 10, 70); TEST_MEMORY_COMPARE(tmp, 70, buf + 10, 70);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, &tmp_len) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, &tmp_len) == 0);
ASSERT_COMPARE(tmp, tmp_len, buf + 80, 20); TEST_MEMORY_COMPARE(tmp, tmp_len, buf + 80, 20);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup (lower layer) */ /* Wrapup (lower layer) */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
@ -202,18 +202,18 @@ void mbedtls_mps_reader_no_pausing_multiple_steps_multiple_rounds(int with_acc)
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, bufA, sizeof(bufA)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, bufA, sizeof(bufA)) == 0);
/* Consumption (upper layer) */ /* Consumption (upper layer) */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 70, bufA + 10, 70); TEST_MEMORY_COMPARE(tmp, 70, bufA + 10, 70);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, &tmp_len) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, &tmp_len) == 0);
ASSERT_COMPARE(tmp, tmp_len, bufA + 80, 20); TEST_MEMORY_COMPARE(tmp, tmp_len, bufA + 80, 20);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Preparation */ /* Preparation */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, bufB, sizeof(bufB)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, bufB, sizeof(bufB)) == 0);
/* Consumption */ /* Consumption */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 100, bufB, 100); TEST_MEMORY_COMPARE(tmp, 100, bufB, 100);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup */ /* Wrapup */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
@ -243,7 +243,7 @@ void mbedtls_mps_reader_pausing_needed_disabled()
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0);
/* Consumption (upper layer) */ /* Consumption (upper layer) */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 50, buf, 50); TEST_MEMORY_COMPARE(tmp, 50, buf, 50);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
@ -284,10 +284,10 @@ void mbedtls_mps_reader_pausing_needed_buffer_too_small()
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0);
/* Consumption (upper layer) */ /* Consumption (upper layer) */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 50, buf, 50); TEST_MEMORY_COMPARE(tmp, 50, buf, 50);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, buf + 50, 10); TEST_MEMORY_COMPARE(tmp, 10, buf + 50, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
/* Wrapup (lower layer) */ /* Wrapup (lower layer) */
@ -295,7 +295,7 @@ void mbedtls_mps_reader_pausing_needed_buffer_too_small()
MBEDTLS_ERR_MPS_READER_ACCUMULATOR_TOO_SMALL); MBEDTLS_ERR_MPS_READER_ACCUMULATOR_TOO_SMALL);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, &tmp_len) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, &tmp_len) == 0);
ASSERT_COMPARE(tmp, tmp_len, buf + 50, 50); TEST_MEMORY_COMPARE(tmp, tmp_len, buf + 50, 50);
mbedtls_mps_reader_free(&rd); mbedtls_mps_reader_free(&rd);
} }
@ -325,7 +325,7 @@ void mbedtls_mps_reader_reclaim_overflow()
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0);
/* Consumption (upper layer) */ /* Consumption (upper layer) */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 50, buf, 50); TEST_MEMORY_COMPARE(tmp, 50, buf, 50);
/* Excess request */ /* Excess request */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, (mbedtls_mps_size_t) -1, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, (mbedtls_mps_size_t) -1, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
@ -376,10 +376,10 @@ void mbedtls_mps_reader_pausing(int option)
/* Consumption (upper layer) */ /* Consumption (upper layer) */
/* Ask for more than what's available. */ /* Ask for more than what's available. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 80, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 80, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 80, bufA, 80); TEST_MEMORY_COMPARE(tmp, 80, bufA, 80);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
switch (option) { switch (option) {
case 0: /* Single uncommitted fetch at pausing */ case 0: /* Single uncommitted fetch at pausing */
case 1: case 1:
@ -400,50 +400,50 @@ void mbedtls_mps_reader_pausing(int option)
switch (option) { switch (option) {
case 0: /* Single fetch at pausing, re-fetch with commit. */ case 0: /* Single fetch at pausing, re-fetch with commit. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
break; break;
case 1: /* Single fetch at pausing, re-fetch without commit. */ case 1: /* Single fetch at pausing, re-fetch without commit. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
break; break;
case 2: /* Multiple fetches at pausing, repeat without commit. */ case 2: /* Multiple fetches at pausing, repeat without commit. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
break; break;
case 3: /* Multiple fetches at pausing, repeat with commit 1. */ case 3: /* Multiple fetches at pausing, repeat with commit 1. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
break; break;
case 4: /* Multiple fetches at pausing, repeat with commit 2. */ case 4: /* Multiple fetches at pausing, repeat with commit 2. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
break; break;
case 5: /* Multiple fetches at pausing, repeat with commit 3. */ case 5: /* Multiple fetches at pausing, repeat with commit 3. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
break; break;
@ -453,7 +453,7 @@ void mbedtls_mps_reader_pausing(int option)
/* In all cases, fetch the rest of the second buffer. */ /* In all cases, fetch the rest of the second buffer. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 90, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 90, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 90, bufB + 10, 90); TEST_MEMORY_COMPARE(tmp, 90, bufB + 10, 90);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup */ /* Wrapup */
@ -498,7 +498,7 @@ void mbedtls_mps_reader_pausing_multiple_feeds(int option)
/* Consumption (upper layer) */ /* Consumption (upper layer) */
/* Ask for more than what's available. */ /* Ask for more than what's available. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 80, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 80, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 80, bufA, 80); TEST_MEMORY_COMPARE(tmp, 80, bufA, 80);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* 20 left, ask for 70 -> 50 overhead */ /* 20 left, ask for 70 -> 50 overhead */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) ==
@ -538,8 +538,8 @@ void mbedtls_mps_reader_pausing_multiple_feeds(int option)
/* Consumption */ /* Consumption */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 70, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 20, bufA + 80, 20); TEST_MEMORY_COMPARE(tmp, 20, bufA + 80, 20);
ASSERT_COMPARE(tmp + 20, 50, bufB, 50); TEST_MEMORY_COMPARE(tmp + 20, 50, bufB, 50);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 1000, &tmp, &fetch_len) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 1000, &tmp, &fetch_len) == 0);
switch (option) { switch (option) {
case 0: case 0:
@ -591,14 +591,14 @@ void mbedtls_mps_reader_reclaim_data_left(int option)
/* Fetch (but not commit) the entire buffer. */ /* Fetch (but not commit) the entire buffer. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf), &tmp, NULL) TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf), &tmp, NULL)
== 0); == 0);
ASSERT_COMPARE(tmp, 100, buf, 100); TEST_MEMORY_COMPARE(tmp, 100, buf, 100);
break; break;
case 1: case 1:
/* Fetch (but not commit) parts of the buffer. */ /* Fetch (but not commit) parts of the buffer. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf) / 2, TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf) / 2,
&tmp, NULL) == 0); &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, sizeof(buf) / 2, buf, sizeof(buf) / 2); TEST_MEMORY_COMPARE(tmp, sizeof(buf) / 2, buf, sizeof(buf) / 2);
break; break;
case 2: case 2:
@ -606,13 +606,13 @@ void mbedtls_mps_reader_reclaim_data_left(int option)
* fetch but not commit the rest of the buffer. */ * fetch but not commit the rest of the buffer. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf) / 2, TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf) / 2,
&tmp, NULL) == 0); &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, sizeof(buf) / 2, buf, sizeof(buf) / 2); TEST_MEMORY_COMPARE(tmp, sizeof(buf) / 2, buf, sizeof(buf) / 2);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf) / 2, TEST_ASSERT(mbedtls_mps_reader_get(&rd, sizeof(buf) / 2,
&tmp, NULL) == 0); &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, sizeof(buf) / 2, TEST_MEMORY_COMPARE(tmp, sizeof(buf) / 2,
buf + sizeof(buf) / 2, buf + sizeof(buf) / 2,
sizeof(buf) / 2); sizeof(buf) / 2);
break; break;
default: default:
@ -646,16 +646,16 @@ void mbedtls_mps_reader_reclaim_data_left_retry()
TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0); TEST_ASSERT(mbedtls_mps_reader_feed(&rd, buf, sizeof(buf)) == 0);
/* Consumption (upper layer) */ /* Consumption (upper layer) */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 50, buf, 50); TEST_MEMORY_COMPARE(tmp, 50, buf, 50);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 50, buf + 50, 50); TEST_MEMORY_COMPARE(tmp, 50, buf + 50, 50);
/* Preparation */ /* Preparation */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) ==
MBEDTLS_ERR_MPS_READER_DATA_LEFT); MBEDTLS_ERR_MPS_READER_DATA_LEFT);
/* Consumption */ /* Consumption */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 50, buf + 50, 50); TEST_MEMORY_COMPARE(tmp, 50, buf + 50, 50);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup */ /* Wrapup */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
@ -699,10 +699,10 @@ void mbedtls_mps_reader_multiple_pausing(int option)
/* Consumption (upper layer) */ /* Consumption (upper layer) */
/* Ask for more than what's available. */ /* Ask for more than what's available. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 80, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 80, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 80, bufA, 80); TEST_MEMORY_COMPARE(tmp, 80, bufA, 80);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
@ -717,10 +717,10 @@ void mbedtls_mps_reader_multiple_pausing(int option)
/* Consume */ /* Consume */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, &tmp_len) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, &tmp_len) == 0);
ASSERT_COMPARE(tmp, tmp_len, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, tmp_len, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
@ -731,18 +731,18 @@ void mbedtls_mps_reader_multiple_pausing(int option)
/* Consume */ /* Consume */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufB + 10, 10); TEST_MEMORY_COMPARE(tmp, 10, bufB + 10, 10);
ASSERT_COMPARE(tmp + 10, 10, bufC, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufC, 10);
break; break;
case 1: /* Fetch same chunks, commit afterwards, and case 1: /* Fetch same chunks, commit afterwards, and
* then exceed bounds of new buffer; accumulator * then exceed bounds of new buffer; accumulator
* not large enough. */ * not large enough. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 51, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 51, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
@ -756,10 +756,10 @@ void mbedtls_mps_reader_multiple_pausing(int option)
* then exceed bounds of new buffer; accumulator * then exceed bounds of new buffer; accumulator
* large enough. */ * large enough. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
@ -769,19 +769,19 @@ void mbedtls_mps_reader_multiple_pausing(int option)
/* Consume */ /* Consume */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 20, bufA + 80, 20); TEST_MEMORY_COMPARE(tmp, 20, bufA + 80, 20);
ASSERT_COMPARE(tmp + 20, 20, bufB, 20); TEST_MEMORY_COMPARE(tmp + 20, 20, bufB, 20);
ASSERT_COMPARE(tmp + 40, 10, bufC, 10); TEST_MEMORY_COMPARE(tmp + 40, 10, bufC, 10);
break; break;
case 3: /* Fetch same chunks, don't commit afterwards, and case 3: /* Fetch same chunks, don't commit afterwards, and
* then exceed bounds of new buffer; accumulator * then exceed bounds of new buffer; accumulator
* not large enough. */ * not large enough. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 80, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 80, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 20, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 10, bufA + 90, 10); TEST_MEMORY_COMPARE(tmp, 10, bufA + 90, 10);
ASSERT_COMPARE(tmp + 10, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 10, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 21, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 21, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_OUT_OF_DATA); MBEDTLS_ERR_MPS_READER_OUT_OF_DATA);
@ -844,15 +844,15 @@ void mbedtls_mps_reader_random_usage(int num_out_chunks,
mbedtls_mps_reader rd; mbedtls_mps_reader rd;
if (acc_size > 0) { if (acc_size > 0) {
ASSERT_ALLOC(acc, acc_size); TEST_CALLOC(acc, acc_size);
} }
/* This probably needs to be changed because we want /* This probably needs to be changed because we want
* our tests to be deterministic. */ * our tests to be deterministic. */
// srand( time( NULL ) ); // srand( time( NULL ) );
ASSERT_ALLOC(outgoing, num_out_chunks * max_chunk_size); TEST_CALLOC(outgoing, num_out_chunks * max_chunk_size);
ASSERT_ALLOC(incoming, num_out_chunks * max_chunk_size); TEST_CALLOC(incoming, num_out_chunks * max_chunk_size);
mbedtls_mps_reader_init(&rd, acc, acc_size); mbedtls_mps_reader_init(&rd, acc, acc_size);
@ -884,7 +884,7 @@ void mbedtls_mps_reader_random_usage(int num_out_chunks,
} }
tmp_size = (rand() % max_chunk_size) + 1; tmp_size = (rand() % max_chunk_size) + 1;
ASSERT_ALLOC(tmp, tmp_size); TEST_CALLOC(tmp, tmp_size);
TEST_ASSERT(mbedtls_test_rnd_std_rand(NULL, tmp, tmp_size) == 0); TEST_ASSERT(mbedtls_test_rnd_std_rand(NULL, tmp, tmp_size) == 0);
ret = mbedtls_mps_reader_feed(&rd, tmp, tmp_size); ret = mbedtls_mps_reader_feed(&rd, tmp, tmp_size);
@ -1005,16 +1005,16 @@ void mbedtls_reader_inconsistent_usage(int option)
case 0: case 0:
/* Ask for buffered data in a single chunk, no commit */ /* Ask for buffered data in a single chunk, no commit */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 20, bufA + 80, 20); TEST_MEMORY_COMPARE(tmp, 20, bufA + 80, 20);
ASSERT_COMPARE(tmp + 20, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 20, 10, bufB, 10);
success = 1; success = 1;
break; break;
case 1: case 1:
/* Ask for buffered data in a single chunk, with commit */ /* Ask for buffered data in a single chunk, with commit */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 30, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 20, bufA + 80, 20); TEST_MEMORY_COMPARE(tmp, 20, bufA + 80, 20);
ASSERT_COMPARE(tmp + 20, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 20, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
success = 1; success = 1;
break; break;
@ -1035,7 +1035,7 @@ void mbedtls_reader_inconsistent_usage(int option)
/* Asking for buffered data in different /* Asking for buffered data in different
* chunks than before CAN fail. */ * chunks than before CAN fail. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 15, bufA + 80, 15); TEST_MEMORY_COMPARE(tmp, 15, bufA + 80, 15);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) == TEST_ASSERT(mbedtls_mps_reader_get(&rd, 10, &tmp, NULL) ==
MBEDTLS_ERR_MPS_READER_INCONSISTENT_REQUESTS); MBEDTLS_ERR_MPS_READER_INCONSISTENT_REQUESTS);
break; break;
@ -1044,10 +1044,10 @@ void mbedtls_reader_inconsistent_usage(int option)
/* Asking for buffered data different chunks /* Asking for buffered data different chunks
* than before NEED NOT fail - no commits */ * than before NEED NOT fail - no commits */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 15, bufA + 80, 15); TEST_MEMORY_COMPARE(tmp, 15, bufA + 80, 15);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 5, bufA + 95, 5); TEST_MEMORY_COMPARE(tmp, 5, bufA + 95, 5);
ASSERT_COMPARE(tmp + 5, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 5, 10, bufB, 10);
success = 1; success = 1;
break; break;
@ -1055,11 +1055,11 @@ void mbedtls_reader_inconsistent_usage(int option)
/* Asking for buffered data different chunks /* Asking for buffered data different chunks
* than before NEED NOT fail - intermediate commit */ * than before NEED NOT fail - intermediate commit */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 15, bufA + 80, 15); TEST_MEMORY_COMPARE(tmp, 15, bufA + 80, 15);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 5, bufA + 95, 5); TEST_MEMORY_COMPARE(tmp, 5, bufA + 95, 5);
ASSERT_COMPARE(tmp + 5, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 5, 10, bufB, 10);
success = 1; success = 1;
break; break;
@ -1067,10 +1067,10 @@ void mbedtls_reader_inconsistent_usage(int option)
/* Asking for buffered data different chunks /* Asking for buffered data different chunks
* than before NEED NOT fail - end commit */ * than before NEED NOT fail - end commit */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 15, bufA + 80, 15); TEST_MEMORY_COMPARE(tmp, 15, bufA + 80, 15);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 5, bufA + 95, 5); TEST_MEMORY_COMPARE(tmp, 5, bufA + 95, 5);
ASSERT_COMPARE(tmp + 5, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 5, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
success = 1; success = 1;
break; break;
@ -1079,11 +1079,11 @@ void mbedtls_reader_inconsistent_usage(int option)
/* Asking for buffered data different chunks /* Asking for buffered data different chunks
* than before NEED NOT fail - intermediate & end commit */ * than before NEED NOT fail - intermediate & end commit */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 15, bufA + 80, 15); TEST_MEMORY_COMPARE(tmp, 15, bufA + 80, 15);
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 15, &tmp, NULL) == 0);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
ASSERT_COMPARE(tmp, 5, bufA + 95, 5); TEST_MEMORY_COMPARE(tmp, 5, bufA + 95, 5);
ASSERT_COMPARE(tmp + 5, 10, bufB, 10); TEST_MEMORY_COMPARE(tmp + 5, 10, bufB, 10);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
success = 1; success = 1;
break; break;
@ -1096,7 +1096,7 @@ void mbedtls_reader_inconsistent_usage(int option)
if (success == 1) { if (success == 1) {
/* In all succeeding cases, fetch the rest of the second buffer. */ /* In all succeeding cases, fetch the rest of the second buffer. */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 90, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 90, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 90, bufB + 10, 90); TEST_MEMORY_COMPARE(tmp, 90, bufB + 10, 90);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup */ /* Wrapup */
@ -1131,7 +1131,7 @@ void mbedtls_mps_reader_feed_empty()
/* Consumption (upper layer) */ /* Consumption (upper layer) */
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0); TEST_ASSERT(mbedtls_mps_reader_get(&rd, 100, &tmp, NULL) == 0);
ASSERT_COMPARE(tmp, 100, buf, 100); TEST_MEMORY_COMPARE(tmp, 100, buf, 100);
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0); TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup */ /* Wrapup */

6
tests/suites/test_suite_pkcs12.function
View file

@ -44,7 +44,7 @@ void pkcs12_derive_key(int md_type, int key_size_arg,
salt_len = salt_arg->len; salt_len = salt_arg->len;
ASSERT_ALLOC(output_data, key_size); TEST_CALLOC(output_data, key_size);
int ret = mbedtls_pkcs12_derivation(output_data, int ret = mbedtls_pkcs12_derivation(output_data,
key_size, key_size,
@ -59,8 +59,8 @@ void pkcs12_derive_key(int md_type, int key_size_arg,
TEST_EQUAL(ret, expected_status); TEST_EQUAL(ret, expected_status);
if (expected_status == 0) { if (expected_status == 0) {
ASSERT_COMPARE(expected_output->x, expected_output->len, TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
output_data, key_size); output_data, key_size);
} }
exit: exit:

8
tests/suites/test_suite_pkcs1_v21.function
View file

@ -48,7 +48,7 @@ void pkcs1_rsaes_oaep_encrypt(int mod, data_t *input_N, data_t *input_E,
message_str->x, message_str->x,
output) == result); output) == result);
if (result == 0) { if (result == 0) {
ASSERT_COMPARE(output, ctx.len, result_str->x, result_str->len); TEST_MEMORY_COMPARE(output, ctx.len, result_str->x, result_str->len);
} }
exit: exit:
@ -110,7 +110,7 @@ void pkcs1_rsaes_oaep_decrypt(int mod, data_t *input_P, data_t *input_Q,
output, output,
sizeof(output)) == result); sizeof(output)) == result);
if (result == 0) { if (result == 0) {
ASSERT_COMPARE(output, output_len, result_str->x, result_str->len); TEST_MEMORY_COMPARE(output, output_len, result_str->x, result_str->len);
} }
} }
@ -167,7 +167,7 @@ void pkcs1_rsassa_pss_sign(int mod, data_t *input_P, data_t *input_Q,
&ctx, &mbedtls_test_rnd_buffer_rand, &info, &ctx, &mbedtls_test_rnd_buffer_rand, &info,
digest, hash_digest->len, hash_digest->x, output) == result); digest, hash_digest->len, hash_digest->x, output) == result);
if (result == 0) { if (result == 0) {
ASSERT_COMPARE(output, ctx.len, result_str->x, result_str->len); TEST_MEMORY_COMPARE(output, ctx.len, result_str->x, result_str->len);
} }
info.buf = rnd_buf->x; info.buf = rnd_buf->x;
@ -179,7 +179,7 @@ void pkcs1_rsassa_pss_sign(int mod, data_t *input_P, data_t *input_Q,
digest, hash_digest->len, hash_digest->x, digest, hash_digest->len, hash_digest->x,
fixed_salt_length, output) == result); fixed_salt_length, output) == result);
if (result == 0) { if (result == 0) {
ASSERT_COMPARE(output, ctx.len, result_str->x, result_str->len); TEST_MEMORY_COMPARE(output, ctx.len, result_str->x, result_str->len);
} }
exit: exit:

12
tests/suites/test_suite_pkcs7.function
View file

@ -85,8 +85,8 @@ void pkcs7_verify(char *pkcs7_file,
} }
} }
ASSERT_ALLOC(crts, n_crts); TEST_CALLOC(crts, n_crts);
ASSERT_ALLOC(crt_files_arr, n_crts); TEST_CALLOC(crt_files_arr, n_crts);
for (i = 0; i < strlen(crt_files); i++) { for (i = 0; i < strlen(crt_files); i++) {
for (k = i; k < strlen(crt_files); k++) { for (k = i; k < strlen(crt_files); k++) {
@ -94,7 +94,7 @@ void pkcs7_verify(char *pkcs7_file,
break; break;
} }
} }
ASSERT_ALLOC(crt_files_arr[cnt], (k-i)+1); TEST_CALLOC(crt_files_arr[cnt], (k-i)+1);
crt_files_arr[cnt][k-i] = '\0'; crt_files_arr[cnt][k-i] = '\0';
memcpy(crt_files_arr[cnt++], crt_files + i, k-i); memcpy(crt_files_arr[cnt++], crt_files + i, k-i);
i = k; i = k;
@ -102,7 +102,7 @@ void pkcs7_verify(char *pkcs7_file,
mbedtls_pkcs7_init(&pkcs7); mbedtls_pkcs7_init(&pkcs7);
for (i = 0; i < n_crts; i++) { for (i = 0; i < n_crts; i++) {
ASSERT_ALLOC(crts[i], 1); TEST_CALLOC(crts[i], 1);
mbedtls_x509_crt_init(crts[i]); mbedtls_x509_crt_init(crts[i]);
} }
@ -127,7 +127,7 @@ void pkcs7_verify(char *pkcs7_file,
datalen = st.st_size; datalen = st.st_size;
/* Special-case for zero-length input so that data will be non-NULL */ /* Special-case for zero-length input so that data will be non-NULL */
ASSERT_ALLOC(data, datalen == 0 ? 1 : datalen); TEST_CALLOC(data, datalen == 0 ? 1 : datalen);
buflen = fread((void *) data, sizeof(unsigned char), datalen, file); buflen = fread((void *) data, sizeof(unsigned char), datalen, file);
TEST_EQUAL(buflen, datalen); TEST_EQUAL(buflen, datalen);
@ -135,7 +135,7 @@ void pkcs7_verify(char *pkcs7_file,
if (do_hash_alg) { if (do_hash_alg) {
md_info = mbedtls_md_info_from_type((mbedtls_md_type_t) do_hash_alg); md_info = mbedtls_md_info_from_type((mbedtls_md_type_t) do_hash_alg);
ASSERT_ALLOC(hash, mbedtls_md_get_size(md_info)); TEST_CALLOC(hash, mbedtls_md_get_size(md_info));
res = mbedtls_md(md_info, data, datalen, hash); res = mbedtls_md(md_info, data, datalen, hash);
TEST_EQUAL(res, 0); TEST_EQUAL(res, 0);

4
tests/suites/test_suite_pkparse.function
View file

@ -169,13 +169,13 @@ void pk_parse_fix_montgomery(data_t *input_key, data_t *exp_output)
mbedtls_test_rnd_std_rand, NULL), 0); mbedtls_test_rnd_std_rand, NULL), 0);
output_key_len = input_key->len; output_key_len = input_key->len;
ASSERT_ALLOC(output_key, output_key_len); TEST_CALLOC(output_key, output_key_len);
/* output_key_len is updated with the real amount of data written to /* output_key_len is updated with the real amount of data written to
* output_key buffer. */ * output_key buffer. */
output_key_len = mbedtls_pk_write_key_der(&pk, output_key, output_key_len); output_key_len = mbedtls_pk_write_key_der(&pk, output_key, output_key_len);
TEST_ASSERT(output_key_len > 0); TEST_ASSERT(output_key_len > 0);
ASSERT_COMPARE(exp_output->x, exp_output->len, output_key, output_key_len); TEST_MEMORY_COMPARE(exp_output->x, exp_output->len, output_key, output_key_len);
exit: exit:
if (output_key != NULL) { if (output_key != NULL) {

16
tests/suites/test_suite_pkwrite.function
View file

@ -99,7 +99,7 @@ static void pk_write_check_common(char *key_file, int is_public_key, int is_der)
} }
TEST_ASSERT(check_buf_len > 0); TEST_ASSERT(check_buf_len > 0);
ASSERT_ALLOC(buf, check_buf_len); TEST_CALLOC(buf, check_buf_len);
if (is_public_key) { if (is_public_key) {
TEST_EQUAL(mbedtls_pk_parse_public_keyfile(&key, key_file), 0); TEST_EQUAL(mbedtls_pk_parse_public_keyfile(&key, key_file), 0);
@ -113,7 +113,7 @@ static void pk_write_check_common(char *key_file, int is_public_key, int is_der)
TEST_EQUAL(pk_write_any_key(&key, &start_buf, &buf_len, is_public_key, TEST_EQUAL(pk_write_any_key(&key, &start_buf, &buf_len, is_public_key,
is_der), 0); is_der), 0);
ASSERT_COMPARE(start_buf, buf_len, check_buf, check_buf_len); TEST_MEMORY_COMPARE(start_buf, buf_len, check_buf, check_buf_len);
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
/* Verify that pk_write works also for opaque private keys */ /* Verify that pk_write works also for opaque private keys */
@ -128,7 +128,7 @@ static void pk_write_check_common(char *key_file, int is_public_key, int is_der)
TEST_EQUAL(pk_write_any_key(&key, &start_buf, &buf_len, is_public_key, TEST_EQUAL(pk_write_any_key(&key, &start_buf, &buf_len, is_public_key,
is_der), 0); is_der), 0);
ASSERT_COMPARE(start_buf, buf_len, check_buf, check_buf_len); TEST_MEMORY_COMPARE(start_buf, buf_len, check_buf, check_buf_len);
} }
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
@ -185,13 +185,13 @@ void pk_write_public_from_private(char *priv_key_file, char *pub_key_file)
&pub_key_len), 0); &pub_key_len), 0);
derived_key_len = pub_key_len; derived_key_len = pub_key_len;
ASSERT_ALLOC(derived_key_raw, derived_key_len); TEST_CALLOC(derived_key_raw, derived_key_len);
TEST_EQUAL(mbedtls_pk_write_pubkey_der(&priv_key, derived_key_raw, TEST_EQUAL(mbedtls_pk_write_pubkey_der(&priv_key, derived_key_raw,
derived_key_len), pub_key_len); derived_key_len), pub_key_len);
ASSERT_COMPARE(derived_key_raw, derived_key_len, TEST_MEMORY_COMPARE(derived_key_raw, derived_key_len,
pub_key_raw, pub_key_len); pub_key_raw, pub_key_len);
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
mbedtls_platform_zeroize(derived_key_raw, sizeof(derived_key_raw)); mbedtls_platform_zeroize(derived_key_raw, sizeof(derived_key_raw));
@ -203,8 +203,8 @@ void pk_write_public_from_private(char *priv_key_file, char *pub_key_file)
TEST_EQUAL(mbedtls_pk_write_pubkey_der(&priv_key, derived_key_raw, TEST_EQUAL(mbedtls_pk_write_pubkey_der(&priv_key, derived_key_raw,
derived_key_len), pub_key_len); derived_key_len), pub_key_len);
ASSERT_COMPARE(derived_key_raw, derived_key_len, TEST_MEMORY_COMPARE(derived_key_raw, derived_key_len,
pub_key_raw, pub_key_len); pub_key_raw, pub_key_len);
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
exit: exit:

14
tests/suites/test_suite_platform_printf.function
View file

@ -32,9 +32,9 @@ void printf_int(char *format, /* any format expecting one int argument, e.g. "%d
const size_t n = strlen(result); const size_t n = strlen(result);
/* Nominal case: buffer just large enough */ /* Nominal case: buffer just large enough */
ASSERT_ALLOC(output, n + 1); TEST_CALLOC(output, n + 1);
TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, x)); TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, x));
ASSERT_COMPARE(result, n + 1, output, n + 1); TEST_MEMORY_COMPARE(result, n + 1, output, n + 1);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
@ -53,13 +53,13 @@ void printf_long_max(const char *format, /* "%lx" or longer type */
const size_t n = sizeof(value) * 2; const size_t n = sizeof(value) * 2;
/* We assume that long has no padding bits! */ /* We assume that long has no padding bits! */
ASSERT_ALLOC(expected, n + 1); TEST_CALLOC(expected, n + 1);
expected[0] = '7'; expected[0] = '7';
memset(expected + 1, 'f', sizeof(value) * 2 - 1); memset(expected + 1, 'f', sizeof(value) * 2 - 1);
ASSERT_ALLOC(output, n + 1); TEST_CALLOC(output, n + 1);
TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, value)); TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, value));
ASSERT_COMPARE(expected, n + 1, output, n + 1); TEST_MEMORY_COMPARE(expected, n + 1, output, n + 1);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;
@ -77,9 +77,9 @@ void printf_char2(char *format, /* "%c%c" */
const size_t n = strlen(result); const size_t n = strlen(result);
/* Nominal case: buffer just large enough */ /* Nominal case: buffer just large enough */
ASSERT_ALLOC(output, n + 1); TEST_CALLOC(output, n + 1);
TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, arg1, arg2)); TEST_EQUAL(n, mbedtls_snprintf(output, n + 1, format, arg1, arg2));
ASSERT_COMPARE(result, n + 1, output, n + 1); TEST_MEMORY_COMPARE(result, n + 1, output, n + 1);
mbedtls_free(output); mbedtls_free(output);
output = NULL; output = NULL;

16
tests/suites/test_suite_poly1305.function
View file

@ -22,8 +22,8 @@ void mbedtls_poly1305(data_t *key, data_t *expected_mac, data_t *src_str)
TEST_ASSERT(mbedtls_poly1305_mac(key->x, src_str->x, TEST_ASSERT(mbedtls_poly1305_mac(key->x, src_str->x,
src_str->len, mac) == 0); src_str->len, mac) == 0);
ASSERT_COMPARE(mac, expected_mac->len, TEST_MEMORY_COMPARE(mac, expected_mac->len,
expected_mac->x, expected_mac->len); expected_mac->x, expected_mac->len);
/* /*
* Test the streaming API * Test the streaming API
@ -36,8 +36,8 @@ void mbedtls_poly1305(data_t *key, data_t *expected_mac, data_t *src_str)
TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0); TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0);
ASSERT_COMPARE(mac, expected_mac->len, TEST_MEMORY_COMPARE(mac, expected_mac->len,
expected_mac->x, expected_mac->len); expected_mac->x, expected_mac->len);
/* /*
* Test the streaming API again, piecewise * Test the streaming API again, piecewise
@ -53,8 +53,8 @@ void mbedtls_poly1305(data_t *key, data_t *expected_mac, data_t *src_str)
TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0); TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0);
ASSERT_COMPARE(mac, expected_mac->len, TEST_MEMORY_COMPARE(mac, expected_mac->len,
expected_mac->x, expected_mac->len); expected_mac->x, expected_mac->len);
} }
/* /*
@ -69,8 +69,8 @@ void mbedtls_poly1305(data_t *key, data_t *expected_mac, data_t *src_str)
TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0); TEST_ASSERT(mbedtls_poly1305_finish(&ctx, mac) == 0);
ASSERT_COMPARE(mac, expected_mac->len, TEST_MEMORY_COMPARE(mac, expected_mac->len,
expected_mac->x, expected_mac->len); expected_mac->x, expected_mac->len);
} }
mbedtls_poly1305_free(&ctx); mbedtls_poly1305_free(&ctx);

336
tests/suites/test_suite_psa_crypto.function
View file

File diff suppressed because it is too large Load diff

182
tests/suites/test_suite_psa_crypto_driver_wrappers.function
View file

@ -49,8 +49,8 @@ static void ecjpake_do_round(psa_algorithm_t alg, unsigned int primitive,
size_t c_x1_pr_off, c_x2_pr_off, c_x2s_pr_off; size_t c_x1_pr_off, c_x2_pr_off, c_x2s_pr_off;
psa_status_t status; psa_status_t status;
ASSERT_ALLOC(buffer0, buffer_length); TEST_CALLOC(buffer0, buffer_length);
ASSERT_ALLOC(buffer1, buffer_length); TEST_CALLOC(buffer1, buffer_length);
switch (round) { switch (round) {
case 1: case 1:
@ -460,8 +460,8 @@ static int sanity_check_rsa_encryption_result(
TEST_EQUAL(buf[0], 0x00); TEST_EQUAL(buf[0], 0x00);
TEST_EQUAL(buf[1], 0x02); TEST_EQUAL(buf[1], 0x02);
TEST_EQUAL(buf[length - input_data->len - 1], 0x00); TEST_EQUAL(buf[length - input_data->len - 1], 0x00);
ASSERT_COMPARE(buf + length - input_data->len, input_data->len, TEST_MEMORY_COMPARE(buf + length - input_data->len, input_data->len,
input_data->x, input_data->len); input_data->x, input_data->len);
} else if (PSA_ALG_IS_RSA_OAEP(alg)) { } else if (PSA_ALG_IS_RSA_OAEP(alg)) {
TEST_EQUAL(buf[0], 0x00); TEST_EQUAL(buf[0], 0x00);
/* The rest is too hard to check */ /* The rest is too hard to check */
@ -538,7 +538,7 @@ void sign_hash(int key_type_arg,
TEST_ASSERT(signature_size != 0); TEST_ASSERT(signature_size != 0);
TEST_ASSERT(signature_size <= PSA_SIGNATURE_MAX_SIZE); TEST_ASSERT(signature_size <= PSA_SIGNATURE_MAX_SIZE);
ASSERT_ALLOC(signature, signature_size); TEST_CALLOC(signature, signature_size);
actual_status = psa_sign_hash(key, alg, actual_status = psa_sign_hash(key, alg,
data_input->x, data_input->len, data_input->x, data_input->len,
@ -546,8 +546,8 @@ void sign_hash(int key_type_arg,
&signature_length); &signature_length);
TEST_EQUAL(actual_status, expected_status); TEST_EQUAL(actual_status, expected_status);
if (expected_status == PSA_SUCCESS) { if (expected_status == PSA_SUCCESS) {
ASSERT_COMPARE(signature, signature_length, TEST_MEMORY_COMPARE(signature, signature_length,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
} }
TEST_EQUAL(mbedtls_test_driver_signature_sign_hooks.hits, 1); TEST_EQUAL(mbedtls_test_driver_signature_sign_hooks.hits, 1);
@ -665,7 +665,7 @@ void sign_message(int key_type_arg,
TEST_ASSERT(signature_size != 0); TEST_ASSERT(signature_size != 0);
TEST_ASSERT(signature_size <= PSA_SIGNATURE_MAX_SIZE); TEST_ASSERT(signature_size <= PSA_SIGNATURE_MAX_SIZE);
ASSERT_ALLOC(signature, signature_size); TEST_CALLOC(signature, signature_size);
actual_status = psa_sign_message(key, alg, actual_status = psa_sign_message(key, alg,
data_input->x, data_input->len, data_input->x, data_input->len,
@ -673,8 +673,8 @@ void sign_message(int key_type_arg,
&signature_length); &signature_length);
TEST_EQUAL(actual_status, expected_status); TEST_EQUAL(actual_status, expected_status);
if (expected_status == PSA_SUCCESS) { if (expected_status == PSA_SUCCESS) {
ASSERT_COMPARE(signature, signature_length, TEST_MEMORY_COMPARE(signature, signature_length,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
} }
/* In the builtin algorithm the driver is called twice. */ /* In the builtin algorithm the driver is called twice. */
TEST_EQUAL(mbedtls_test_driver_signature_sign_hooks.hits, TEST_EQUAL(mbedtls_test_driver_signature_sign_hooks.hits,
@ -795,8 +795,8 @@ void generate_ec_key(int force_status_arg,
psa_export_key(key, actual_output, sizeof(actual_output), &actual_output_length); psa_export_key(key, actual_output, sizeof(actual_output), &actual_output_length);
if (fake_output->len > 0) { if (fake_output->len > 0) {
ASSERT_COMPARE(actual_output, actual_output_length, TEST_MEMORY_COMPARE(actual_output, actual_output_length,
expected_output, expected_output_length); expected_output, expected_output_length);
} else { } else {
size_t zeroes = 0; size_t zeroes = 0;
for (size_t i = 0; i < sizeof(actual_output); i++) { for (size_t i = 0; i < sizeof(actual_output); i++) {
@ -927,8 +927,8 @@ void export_key(int force_status_arg,
} }
if (actual_status == PSA_SUCCESS) { if (actual_status == PSA_SUCCESS) {
ASSERT_COMPARE(actual_output, actual_output_length, TEST_MEMORY_COMPARE(actual_output, actual_output_length,
expected_output_ptr, expected_output_length); expected_output_ptr, expected_output_length);
} }
exit: exit:
psa_reset_key_attributes(&attributes); psa_reset_key_attributes(&attributes);
@ -997,7 +997,7 @@ void key_agreement(int alg_arg,
mbedtls_test_driver_key_agreement_hooks.hits = 0; mbedtls_test_driver_key_agreement_hooks.hits = 0;
mbedtls_test_driver_key_agreement_hooks.forced_status = force_status; mbedtls_test_driver_key_agreement_hooks.forced_status = force_status;
ASSERT_ALLOC(actual_output, expected_output->len); TEST_CALLOC(actual_output, expected_output->len);
actual_status = psa_raw_key_agreement(alg, our_key, actual_status = psa_raw_key_agreement(alg, our_key,
peer_key_data->x, peer_key_data->len, peer_key_data->x, peer_key_data->len,
actual_output, expected_output->len, actual_output, expected_output->len,
@ -1006,8 +1006,8 @@ void key_agreement(int alg_arg,
TEST_EQUAL(mbedtls_test_driver_key_agreement_hooks.hits, 1); TEST_EQUAL(mbedtls_test_driver_key_agreement_hooks.hits, 1);
if (actual_status == PSA_SUCCESS) { if (actual_status == PSA_SUCCESS) {
ASSERT_COMPARE(actual_output, actual_output_length, TEST_MEMORY_COMPARE(actual_output, actual_output_length,
expected_output_ptr, expected_output_length); expected_output_ptr, expected_output_length);
} }
mbedtls_free(actual_output); mbedtls_free(actual_output);
actual_output = NULL; actual_output = NULL;
@ -1053,8 +1053,8 @@ void cipher_encrypt_validation(int alg_arg,
output1_buffer_size = PSA_CIPHER_ENCRYPT_OUTPUT_SIZE(key_type, alg, input->len); output1_buffer_size = PSA_CIPHER_ENCRYPT_OUTPUT_SIZE(key_type, alg, input->len);
output2_buffer_size = PSA_CIPHER_UPDATE_OUTPUT_SIZE(key_type, alg, input->len) + output2_buffer_size = PSA_CIPHER_UPDATE_OUTPUT_SIZE(key_type, alg, input->len) +
PSA_CIPHER_FINISH_OUTPUT_SIZE(key_type, alg); PSA_CIPHER_FINISH_OUTPUT_SIZE(key_type, alg);
ASSERT_ALLOC(output1, output1_buffer_size); TEST_CALLOC(output1, output1_buffer_size);
ASSERT_ALLOC(output2, output2_buffer_size); TEST_CALLOC(output2, output2_buffer_size);
PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len, PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len,
&key)); &key));
@ -1093,8 +1093,8 @@ void cipher_encrypt_validation(int alg_arg,
PSA_ASSERT(psa_cipher_abort(&operation)); PSA_ASSERT(psa_cipher_abort(&operation));
// driver function should've been called as part of the finish() core routine // driver function should've been called as part of the finish() core routine
TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0); TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0);
ASSERT_COMPARE(output1 + iv_size, output1_length - iv_size, TEST_MEMORY_COMPARE(output1 + iv_size, output1_length - iv_size,
output2, output2_length); output2, output2_length);
exit: exit:
psa_cipher_abort(&operation); psa_cipher_abort(&operation);
@ -1171,7 +1171,7 @@ void cipher_encrypt_multipart(int alg_arg,
output_buffer_size = ((size_t) input->len + output_buffer_size = ((size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type)); PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type));
ASSERT_ALLOC(output, output_buffer_size); TEST_CALLOC(output, output_buffer_size);
if (mock_output_arg) { if (mock_output_arg) {
mbedtls_test_driver_cipher_hooks.forced_output = expected_output->x; mbedtls_test_driver_cipher_hooks.forced_output = expected_output->x;
@ -1221,8 +1221,8 @@ void cipher_encrypt_multipart(int alg_arg,
PSA_ASSERT(psa_cipher_abort(&operation)); PSA_ASSERT(psa_cipher_abort(&operation));
TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0); TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0);
ASSERT_COMPARE(expected_output->x, expected_output->len, TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
output, total_output_length); output, total_output_length);
} }
exit: exit:
@ -1299,7 +1299,7 @@ void cipher_decrypt_multipart(int alg_arg,
output_buffer_size = ((size_t) input->len + output_buffer_size = ((size_t) input->len +
PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type)); PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type));
ASSERT_ALLOC(output, output_buffer_size); TEST_CALLOC(output, output_buffer_size);
if (mock_output_arg) { if (mock_output_arg) {
mbedtls_test_driver_cipher_hooks.forced_output = expected_output->x; mbedtls_test_driver_cipher_hooks.forced_output = expected_output->x;
@ -1350,8 +1350,8 @@ void cipher_decrypt_multipart(int alg_arg,
PSA_ASSERT(psa_cipher_abort(&operation)); PSA_ASSERT(psa_cipher_abort(&operation));
TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0); TEST_EQUAL(mbedtls_test_driver_cipher_hooks.hits, 0);
ASSERT_COMPARE(expected_output->x, expected_output->len, TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
output, total_output_length); output, total_output_length);
} }
exit: exit:
@ -1398,13 +1398,13 @@ void cipher_decrypt(int alg_arg,
/* Allocate input buffer and copy the iv and the plaintext */ /* Allocate input buffer and copy the iv and the plaintext */
input_buffer_size = ((size_t) input_arg->len + (size_t) iv->len); input_buffer_size = ((size_t) input_arg->len + (size_t) iv->len);
if (input_buffer_size > 0) { if (input_buffer_size > 0) {
ASSERT_ALLOC(input, input_buffer_size); TEST_CALLOC(input, input_buffer_size);
memcpy(input, iv->x, iv->len); memcpy(input, iv->x, iv->len);
memcpy(input + iv->len, input_arg->x, input_arg->len); memcpy(input + iv->len, input_arg->x, input_arg->len);
} }
output_buffer_size = PSA_CIPHER_DECRYPT_OUTPUT_SIZE(key_type, alg, input_buffer_size); output_buffer_size = PSA_CIPHER_DECRYPT_OUTPUT_SIZE(key_type, alg, input_buffer_size);
ASSERT_ALLOC(output, output_buffer_size); TEST_CALLOC(output, output_buffer_size);
PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len, PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len,
&key)); &key));
@ -1422,8 +1422,8 @@ void cipher_decrypt(int alg_arg,
TEST_EQUAL(status, expected_status); TEST_EQUAL(status, expected_status);
if (expected_status == PSA_SUCCESS) { if (expected_status == PSA_SUCCESS) {
ASSERT_COMPARE(expected_output->x, expected_output->len, TEST_MEMORY_COMPARE(expected_output->x, expected_output->len,
output, output_length); output, output_length);
} }
exit: exit:
@ -1451,7 +1451,7 @@ void cipher_entry_points(int alg_arg, int key_type_arg,
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
mbedtls_test_driver_cipher_hooks = mbedtls_test_driver_cipher_hooks_init(); mbedtls_test_driver_cipher_hooks = mbedtls_test_driver_cipher_hooks_init();
ASSERT_ALLOC(output, input->len + 16); TEST_CALLOC(output, input->len + 16);
output_buffer_size = input->len + 16; output_buffer_size = input->len + 16;
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
@ -1691,7 +1691,7 @@ void aead_encrypt(int key_type_arg, data_t *key_data,
PSA_AEAD_ENCRYPT_OUTPUT_SIZE(key_type, alg, input_data->len)); PSA_AEAD_ENCRYPT_OUTPUT_SIZE(key_type, alg, input_data->len));
TEST_ASSERT(output_size <= TEST_ASSERT(output_size <=
PSA_AEAD_ENCRYPT_OUTPUT_MAX_SIZE(input_data->len)); PSA_AEAD_ENCRYPT_OUTPUT_MAX_SIZE(input_data->len));
ASSERT_ALLOC(output_data, output_size); TEST_CALLOC(output_data, output_size);
mbedtls_test_driver_aead_hooks.forced_status = forced_status; mbedtls_test_driver_aead_hooks.forced_status = forced_status;
status = psa_aead_encrypt(key, alg, status = psa_aead_encrypt(key, alg,
@ -1707,8 +1707,8 @@ void aead_encrypt(int key_type_arg, data_t *key_data,
PSA_SUCCESS : forced_status); PSA_SUCCESS : forced_status);
if (status == PSA_SUCCESS) { if (status == PSA_SUCCESS) {
ASSERT_COMPARE(expected_result->x, expected_result->len, TEST_MEMORY_COMPARE(expected_result->x, expected_result->len,
output_data, output_length); output_data, output_length);
} }
exit: exit:
@ -1753,7 +1753,7 @@ void aead_decrypt(int key_type_arg, data_t *key_data,
output_size = input_data->len - PSA_AEAD_TAG_LENGTH(key_type, key_bits, output_size = input_data->len - PSA_AEAD_TAG_LENGTH(key_type, key_bits,
alg); alg);
ASSERT_ALLOC(output_data, output_size); TEST_CALLOC(output_data, output_size);
mbedtls_test_driver_aead_hooks.forced_status = forced_status; mbedtls_test_driver_aead_hooks.forced_status = forced_status;
status = psa_aead_decrypt(key, alg, status = psa_aead_decrypt(key, alg,
@ -1770,8 +1770,8 @@ void aead_decrypt(int key_type_arg, data_t *key_data,
PSA_SUCCESS : forced_status); PSA_SUCCESS : forced_status);
if (status == PSA_SUCCESS) { if (status == PSA_SUCCESS) {
ASSERT_COMPARE(expected_data->x, expected_data->len, TEST_MEMORY_COMPARE(expected_data->x, expected_data->len,
output_data, output_length); output_data, output_length);
} }
exit: exit:
@ -1816,7 +1816,7 @@ void mac_sign(int key_type_arg,
PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len, PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len,
&key)); &key));
ASSERT_ALLOC(actual_mac, mac_buffer_size); TEST_CALLOC(actual_mac, mac_buffer_size);
mbedtls_test_driver_mac_hooks.forced_status = forced_status; mbedtls_test_driver_mac_hooks.forced_status = forced_status;
/* /*
@ -1839,8 +1839,8 @@ void mac_sign(int key_type_arg,
TEST_EQUAL(mbedtls_test_driver_mac_hooks.hits, 1); TEST_EQUAL(mbedtls_test_driver_mac_hooks.hits, 1);
if (forced_status == PSA_SUCCESS) { if (forced_status == PSA_SUCCESS) {
ASSERT_COMPARE(expected_mac->x, expected_mac->len, TEST_MEMORY_COMPARE(expected_mac->x, expected_mac->len,
actual_mac, mac_length); actual_mac, mac_length);
} }
mbedtls_free(actual_mac); mbedtls_free(actual_mac);
@ -1891,7 +1891,7 @@ void mac_sign_multipart(int key_type_arg,
PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len, PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len,
&key)); &key));
ASSERT_ALLOC(actual_mac, mac_buffer_size); TEST_CALLOC(actual_mac, mac_buffer_size);
mbedtls_test_driver_mac_hooks.forced_status = forced_status; mbedtls_test_driver_mac_hooks.forced_status = forced_status;
/* /*
@ -1957,8 +1957,8 @@ void mac_sign_multipart(int key_type_arg,
} }
if (forced_status == PSA_SUCCESS) { if (forced_status == PSA_SUCCESS) {
ASSERT_COMPARE(expected_mac->x, expected_mac->len, TEST_MEMORY_COMPARE(expected_mac->x, expected_mac->len,
actual_mac, mac_length); actual_mac, mac_length);
} }
mbedtls_free(actual_mac); mbedtls_free(actual_mac);
@ -2152,15 +2152,15 @@ void builtin_key_export(int builtin_key_id_arg,
psa_status_t actual_status; psa_status_t actual_status;
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output_buffer, expected_output->len); TEST_CALLOC(output_buffer, expected_output->len);
actual_status = psa_export_key(key, output_buffer, expected_output->len, &output_size); actual_status = psa_export_key(key, output_buffer, expected_output->len, &output_size);
if (expected_status == PSA_SUCCESS) { if (expected_status == PSA_SUCCESS) {
PSA_ASSERT(actual_status); PSA_ASSERT(actual_status);
TEST_EQUAL(output_size, expected_output->len); TEST_EQUAL(output_size, expected_output->len);
ASSERT_COMPARE(output_buffer, output_size, TEST_MEMORY_COMPARE(output_buffer, output_size,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
PSA_ASSERT(psa_get_key_attributes(key, &attributes)); PSA_ASSERT(psa_get_key_attributes(key, &attributes));
TEST_EQUAL(psa_get_key_bits(&attributes), builtin_key_bits); TEST_EQUAL(psa_get_key_bits(&attributes), builtin_key_bits);
@ -2203,15 +2203,15 @@ void builtin_pubkey_export(int builtin_key_id_arg,
psa_status_t actual_status; psa_status_t actual_status;
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output_buffer, expected_output->len); TEST_CALLOC(output_buffer, expected_output->len);
actual_status = psa_export_public_key(key, output_buffer, expected_output->len, &output_size); actual_status = psa_export_public_key(key, output_buffer, expected_output->len, &output_size);
if (expected_status == PSA_SUCCESS) { if (expected_status == PSA_SUCCESS) {
PSA_ASSERT(actual_status); PSA_ASSERT(actual_status);
TEST_EQUAL(output_size, expected_output->len); TEST_EQUAL(output_size, expected_output->len);
ASSERT_COMPARE(output_buffer, output_size, TEST_MEMORY_COMPARE(output_buffer, output_size,
expected_output->x, expected_output->len); expected_output->x, expected_output->len);
PSA_ASSERT(psa_get_key_attributes(key, &attributes)); PSA_ASSERT(psa_get_key_attributes(key, &attributes));
TEST_EQUAL(psa_get_key_bits(&attributes), builtin_key_bits); TEST_EQUAL(psa_get_key_bits(&attributes), builtin_key_bits);
@ -2244,7 +2244,7 @@ void hash_compute(int alg_arg,
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output, PSA_HASH_LENGTH(alg)); TEST_CALLOC(output, PSA_HASH_LENGTH(alg));
/* Do this after psa_crypto_init() which may call hash drivers */ /* Do this after psa_crypto_init() which may call hash drivers */
mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init(); mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init();
@ -2257,7 +2257,7 @@ void hash_compute(int alg_arg,
TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, forced_status); TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, forced_status);
if (expected_status == PSA_SUCCESS) { if (expected_status == PSA_SUCCESS) {
ASSERT_COMPARE(output, output_length, hash->x, hash->len); TEST_MEMORY_COMPARE(output, output_length, hash->x, hash->len);
} }
exit: exit:
@ -2282,7 +2282,7 @@ void hash_multipart_setup(int alg_arg,
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output, PSA_HASH_LENGTH(alg)); TEST_CALLOC(output, PSA_HASH_LENGTH(alg));
/* Do this after psa_crypto_init() which may call hash drivers */ /* Do this after psa_crypto_init() which may call hash drivers */
mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init(); mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init();
@ -2305,7 +2305,7 @@ void hash_multipart_setup(int alg_arg,
forced_status == PSA_ERROR_NOT_SUPPORTED ? 1 : 4); forced_status == PSA_ERROR_NOT_SUPPORTED ? 1 : 4);
TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, forced_status); TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, forced_status);
ASSERT_COMPARE(output, output_length, hash->x, hash->len); TEST_MEMORY_COMPARE(output, output_length, hash->x, hash->len);
} }
exit: exit:
@ -2329,7 +2329,7 @@ void hash_multipart_update(int alg_arg,
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output, PSA_HASH_LENGTH(alg)); TEST_CALLOC(output, PSA_HASH_LENGTH(alg));
/* Do this after psa_crypto_init() which may call hash drivers */ /* Do this after psa_crypto_init() which may call hash drivers */
mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init(); mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init();
@ -2362,7 +2362,7 @@ void hash_multipart_update(int alg_arg,
TEST_EQUAL(mbedtls_test_driver_hash_hooks.hits, 2); TEST_EQUAL(mbedtls_test_driver_hash_hooks.hits, 2);
TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, PSA_SUCCESS); TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, PSA_SUCCESS);
ASSERT_COMPARE(output, output_length, hash->x, hash->len); TEST_MEMORY_COMPARE(output, output_length, hash->x, hash->len);
} }
exit: exit:
@ -2385,7 +2385,7 @@ void hash_multipart_finish(int alg_arg,
size_t output_length; size_t output_length;
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output, PSA_HASH_LENGTH(alg)); TEST_CALLOC(output, PSA_HASH_LENGTH(alg));
/* Do this after psa_crypto_init() which may call hash drivers */ /* Do this after psa_crypto_init() which may call hash drivers */
mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init(); mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init();
@ -2416,7 +2416,7 @@ void hash_multipart_finish(int alg_arg,
TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, forced_status); TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, forced_status);
if (forced_status == PSA_SUCCESS) { if (forced_status == PSA_SUCCESS) {
ASSERT_COMPARE(output, output_length, hash->x, hash->len); TEST_MEMORY_COMPARE(output, output_length, hash->x, hash->len);
} }
exit: exit:
@ -2440,7 +2440,7 @@ void hash_clone(int alg_arg,
size_t output_length; size_t output_length;
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output, PSA_HASH_LENGTH(alg)); TEST_CALLOC(output, PSA_HASH_LENGTH(alg));
/* Do this after psa_crypto_init() which may call hash drivers */ /* Do this after psa_crypto_init() which may call hash drivers */
mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init(); mbedtls_test_driver_hash_hooks = mbedtls_test_driver_hash_hooks_init();
@ -2476,7 +2476,7 @@ void hash_clone(int alg_arg,
TEST_EQUAL(mbedtls_test_driver_hash_hooks.hits, 3); TEST_EQUAL(mbedtls_test_driver_hash_hooks.hits, 3);
TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, PSA_SUCCESS); TEST_EQUAL(mbedtls_test_driver_hash_hooks.driver_status, PSA_SUCCESS);
ASSERT_COMPARE(output, output_length, hash->x, hash->len); TEST_MEMORY_COMPARE(output, output_length, hash->x, hash->len);
} }
exit: exit:
@ -2539,11 +2539,11 @@ void asymmetric_encrypt_decrypt(int alg_arg,
mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length = mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length =
fake_output_encrypt->len; fake_output_encrypt->len;
output_size = fake_output_encrypt->len; output_size = fake_output_encrypt->len;
ASSERT_ALLOC(output, output_size); TEST_CALLOC(output, output_size);
} else { } else {
output_size = PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE(key_type, key_bits, alg); output_size = PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE(key_type, key_bits, alg);
TEST_ASSERT(output_size <= PSA_ASYMMETRIC_ENCRYPT_OUTPUT_MAX_SIZE); TEST_ASSERT(output_size <= PSA_ASYMMETRIC_ENCRYPT_OUTPUT_MAX_SIZE);
ASSERT_ALLOC(output, output_size); TEST_CALLOC(output, output_size);
} }
/* We test encryption by checking that encrypt-then-decrypt gives back /* We test encryption by checking that encrypt-then-decrypt gives back
@ -2560,8 +2560,8 @@ void asymmetric_encrypt_decrypt(int alg_arg,
if (expected_status_encrypt == PSA_SUCCESS) { if (expected_status_encrypt == PSA_SUCCESS) {
if (fake_output_encrypt->len > 0) { if (fake_output_encrypt->len > 0) {
ASSERT_COMPARE(fake_output_encrypt->x, fake_output_encrypt->len, TEST_MEMORY_COMPARE(fake_output_encrypt->x, fake_output_encrypt->len,
output, output_length); output, output_length);
} else { } else {
mbedtls_test_driver_asymmetric_encryption_hooks.forced_status = mbedtls_test_driver_asymmetric_encryption_hooks.forced_status =
forced_status_decrypt; forced_status_decrypt;
@ -2571,13 +2571,13 @@ void asymmetric_encrypt_decrypt(int alg_arg,
mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length = mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length =
fake_output_decrypt->len; fake_output_decrypt->len;
output2_size = fake_output_decrypt->len; output2_size = fake_output_decrypt->len;
ASSERT_ALLOC(output2, output2_size); TEST_CALLOC(output2, output2_size);
} else { } else {
output2_size = input_data->len; output2_size = input_data->len;
TEST_ASSERT(output2_size <= TEST_ASSERT(output2_size <=
PSA_ASYMMETRIC_DECRYPT_OUTPUT_SIZE(key_type, key_bits, alg)); PSA_ASYMMETRIC_DECRYPT_OUTPUT_SIZE(key_type, key_bits, alg));
TEST_ASSERT(output2_size <= PSA_ASYMMETRIC_DECRYPT_OUTPUT_MAX_SIZE); TEST_ASSERT(output2_size <= PSA_ASYMMETRIC_DECRYPT_OUTPUT_MAX_SIZE);
ASSERT_ALLOC(output2, output2_size); TEST_CALLOC(output2, output2_size);
} }
TEST_EQUAL(psa_asymmetric_decrypt(key, alg, TEST_EQUAL(psa_asymmetric_decrypt(key, alg,
@ -2587,11 +2587,11 @@ void asymmetric_encrypt_decrypt(int alg_arg,
&output2_length), expected_status_decrypt); &output2_length), expected_status_decrypt);
if (expected_status_decrypt == PSA_SUCCESS) { if (expected_status_decrypt == PSA_SUCCESS) {
if (fake_output_decrypt->len > 0) { if (fake_output_decrypt->len > 0) {
ASSERT_COMPARE(fake_output_decrypt->x, fake_output_decrypt->len, TEST_MEMORY_COMPARE(fake_output_decrypt->x, fake_output_decrypt->len,
output2, output2_length); output2, output2_length);
} else { } else {
ASSERT_COMPARE(input_data->x, input_data->len, TEST_MEMORY_COMPARE(input_data->x, input_data->len,
output2, output2_length); output2, output2_length);
} }
} }
} }
@ -2651,10 +2651,10 @@ void asymmetric_decrypt(int alg_arg,
mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length = mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length =
fake_output_decrypt->len; fake_output_decrypt->len;
output_size = fake_output_decrypt->len; output_size = fake_output_decrypt->len;
ASSERT_ALLOC(output, output_size); TEST_CALLOC(output, output_size);
} else { } else {
output_size = expected_output_data->len; output_size = expected_output_data->len;
ASSERT_ALLOC(output, expected_output_data->len); TEST_CALLOC(output, expected_output_data->len);
} }
TEST_EQUAL(psa_asymmetric_decrypt(key, alg, TEST_EQUAL(psa_asymmetric_decrypt(key, alg,
@ -2664,8 +2664,8 @@ void asymmetric_decrypt(int alg_arg,
&output_length), expected_status_decrypt); &output_length), expected_status_decrypt);
if (expected_status_decrypt == PSA_SUCCESS) { if (expected_status_decrypt == PSA_SUCCESS) {
TEST_EQUAL(output_length, expected_output_data->len); TEST_EQUAL(output_length, expected_output_data->len);
ASSERT_COMPARE(expected_output_data->x, expected_output_data->len, TEST_MEMORY_COMPARE(expected_output_data->x, expected_output_data->len,
output, output_length); output, output_length);
} }
exit: exit:
/* /*
@ -2724,10 +2724,10 @@ void asymmetric_encrypt(int alg_arg,
mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length = mbedtls_test_driver_asymmetric_encryption_hooks.forced_output_length =
fake_output_encrypt->len; fake_output_encrypt->len;
output_size = fake_output_encrypt->len; output_size = fake_output_encrypt->len;
ASSERT_ALLOC(output, output_size); TEST_CALLOC(output, output_size);
} else { } else {
output_size = PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE(key_type, key_bits, alg); output_size = PSA_ASYMMETRIC_ENCRYPT_OUTPUT_SIZE(key_type, key_bits, alg);
ASSERT_ALLOC(output, output_size); TEST_CALLOC(output, output_size);
} }
TEST_EQUAL(psa_asymmetric_encrypt(key, alg, TEST_EQUAL(psa_asymmetric_encrypt(key, alg,
@ -2738,8 +2738,8 @@ void asymmetric_encrypt(int alg_arg,
if (expected_status_encrypt == PSA_SUCCESS) { if (expected_status_encrypt == PSA_SUCCESS) {
if (fake_output_encrypt->len > 0) { if (fake_output_encrypt->len > 0) {
TEST_EQUAL(fake_output_encrypt->len, output_length); TEST_EQUAL(fake_output_encrypt->len, output_length);
ASSERT_COMPARE(fake_output_encrypt->x, fake_output_encrypt->len, TEST_MEMORY_COMPARE(fake_output_encrypt->x, fake_output_encrypt->len,
output, output_length); output, output_length);
} else { } else {
/* Perform sanity checks on the output */ /* Perform sanity checks on the output */
#if PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY #if PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
@ -2824,7 +2824,7 @@ void aead_encrypt_setup(int key_type_arg, data_t *key_data,
PSA_AEAD_ENCRYPT_OUTPUT_SIZE(key_type, alg, input_data->len)); PSA_AEAD_ENCRYPT_OUTPUT_SIZE(key_type, alg, input_data->len));
TEST_ASSERT(output_size <= TEST_ASSERT(output_size <=
PSA_AEAD_ENCRYPT_OUTPUT_MAX_SIZE(input_data->len)); PSA_AEAD_ENCRYPT_OUTPUT_MAX_SIZE(input_data->len));
ASSERT_ALLOC(output_data, output_size); TEST_CALLOC(output_data, output_size);
status = psa_aead_encrypt_setup(&operation, key, alg); status = psa_aead_encrypt_setup(&operation, key, alg);
@ -2873,11 +2873,11 @@ void aead_encrypt_setup(int key_type_arg, data_t *key_data,
forced_status == PSA_SUCCESS ? 1 : 0); forced_status == PSA_SUCCESS ? 1 : 0);
/* Compare output_data and expected_ciphertext */ /* Compare output_data and expected_ciphertext */
ASSERT_COMPARE(expected_ciphertext->x, expected_ciphertext->len, TEST_MEMORY_COMPARE(expected_ciphertext->x, expected_ciphertext->len,
output_data, output_length + finish_output_length); output_data, output_length + finish_output_length);
/* Compare tag and expected_tag */ /* Compare tag and expected_tag */
ASSERT_COMPARE(expected_tag->x, expected_tag->len, tag_buffer, tag_length); TEST_MEMORY_COMPARE(expected_tag->x, expected_tag->len, tag_buffer, tag_length);
} }
exit: exit:
@ -2926,7 +2926,7 @@ void aead_decrypt_setup(int key_type_arg, data_t *key_data,
output_size = input_ciphertext->len; output_size = input_ciphertext->len;
ASSERT_ALLOC(output_data, output_size); TEST_CALLOC(output_data, output_size);
mbedtls_test_driver_aead_hooks.forced_status = forced_status; mbedtls_test_driver_aead_hooks.forced_status = forced_status;
@ -2979,8 +2979,8 @@ void aead_decrypt_setup(int key_type_arg, data_t *key_data,
TEST_EQUAL(mbedtls_test_driver_aead_hooks.hits_abort, TEST_EQUAL(mbedtls_test_driver_aead_hooks.hits_abort,
forced_status == PSA_SUCCESS ? 1 : 0); forced_status == PSA_SUCCESS ? 1 : 0);
ASSERT_COMPARE(expected_result->x, expected_result->len, TEST_MEMORY_COMPARE(expected_result->x, expected_result->len,
output_data, output_length + verify_output_length); output_data, output_length + verify_output_length);
} }
exit: exit:
@ -3016,14 +3016,14 @@ void pake_operations(data_t *pw_data, int forced_status_setup_arg, int forced_st
PSA_PAKE_STEP_KEY_SHARE); PSA_PAKE_STEP_KEY_SHARE);
int in_driver = (forced_status_setup_arg == PSA_SUCCESS); int in_driver = (forced_status_setup_arg == PSA_SUCCESS);
ASSERT_ALLOC(input_buffer, TEST_CALLOC(input_buffer,
PSA_PAKE_INPUT_SIZE(PSA_ALG_JPAKE, primitive, PSA_PAKE_INPUT_SIZE(PSA_ALG_JPAKE, primitive,
PSA_PAKE_STEP_KEY_SHARE)); PSA_PAKE_STEP_KEY_SHARE));
memset(input_buffer, 0xAA, size_key_share); memset(input_buffer, 0xAA, size_key_share);
ASSERT_ALLOC(output_buffer, TEST_CALLOC(output_buffer,
PSA_PAKE_INPUT_SIZE(PSA_ALG_JPAKE, primitive, PSA_PAKE_INPUT_SIZE(PSA_ALG_JPAKE, primitive,
PSA_PAKE_STEP_KEY_SHARE)); PSA_PAKE_STEP_KEY_SHARE));
memset(output_buffer, 0x55, output_size); memset(output_buffer, 0x55, output_size);
PSA_INIT(); PSA_INIT();

6
tests/suites/test_suite_psa_crypto_entropy.function
View file

@ -114,8 +114,8 @@ void external_rng_failure_sign(int key_type, data_t *key_data, int alg,
size_t signature_size = PSA_SIGNATURE_MAX_SIZE; size_t signature_size = PSA_SIGNATURE_MAX_SIZE;
size_t signature_length; size_t signature_length;
ASSERT_ALLOC(input, input_size); TEST_CALLOC(input, input_size);
ASSERT_ALLOC(signature, signature_size); TEST_CALLOC(signature, signature_size);
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len, PSA_ASSERT(psa_import_key(&attributes, key_data->x, key_data->len,
@ -163,7 +163,7 @@ void validate_entropy_seed_injection(int seed_length_a,
} else { } else {
seed_size = seed_length_b; seed_size = seed_length_b;
} }
ASSERT_ALLOC(seed, seed_size); TEST_CALLOC(seed, seed_size);
/* fill seed with some data */ /* fill seed with some data */
for (i = 0; i < seed_size; ++i) { for (i = 0; i < seed_size; ++i) {
seed[i] = i; seed[i] = i;

12
tests/suites/test_suite_psa_crypto_hash.function
View file

@ -25,8 +25,8 @@ void hash_finish(int alg_arg, data_t *input, data_t *expected_hash)
PSA_ASSERT(psa_hash_finish(&operation, PSA_ASSERT(psa_hash_finish(&operation,
actual_hash, sizeof(actual_hash), actual_hash, sizeof(actual_hash),
&actual_hash_length)); &actual_hash_length));
ASSERT_COMPARE(expected_hash->x, expected_hash->len, TEST_MEMORY_COMPARE(expected_hash->x, expected_hash->len,
actual_hash, actual_hash_length); actual_hash, actual_hash_length);
exit: exit:
psa_hash_abort(&operation); psa_hash_abort(&operation);
@ -83,14 +83,14 @@ void hash_multi_part(int alg_arg, data_t *input, data_t *expected_hash)
PSA_ASSERT(psa_hash_finish(&operation, PSA_ASSERT(psa_hash_finish(&operation,
actual_hash, sizeof(actual_hash), actual_hash, sizeof(actual_hash),
&actual_hash_length)); &actual_hash_length));
ASSERT_COMPARE(expected_hash->x, expected_hash->len, TEST_MEMORY_COMPARE(expected_hash->x, expected_hash->len,
actual_hash, actual_hash_length); actual_hash, actual_hash_length);
PSA_ASSERT(psa_hash_finish(&operation2, PSA_ASSERT(psa_hash_finish(&operation2,
actual_hash, sizeof(actual_hash), actual_hash, sizeof(actual_hash),
&actual_hash_length)); &actual_hash_length));
ASSERT_COMPARE(expected_hash->x, expected_hash->len, TEST_MEMORY_COMPARE(expected_hash->x, expected_hash->len,
actual_hash, actual_hash_length); actual_hash, actual_hash_length);
} while (len++ != input->len); } while (len++ != input->len);
exit: exit:

2
tests/suites/test_suite_psa_crypto_init.function
View file

@ -267,7 +267,7 @@ void entropy_from_nv_seed(int seed_size_arg,
uint8_t *seed = NULL; uint8_t *seed = NULL;
size_t seed_size = seed_size_arg; size_t seed_size = seed_size_arg;
ASSERT_ALLOC(seed, seed_size); TEST_CALLOC(seed, seed_size);
TEST_ASSERT(mbedtls_nv_seed_write(seed, seed_size) >= 0); TEST_ASSERT(mbedtls_nv_seed_write(seed, seed_size) >= 0);
custom_entropy_sources_mask = ENTROPY_SOURCE_NV_SEED; custom_entropy_sources_mask = ENTROPY_SOURCE_NV_SEED;

16
tests/suites/test_suite_psa_crypto_pake.function
View file

@ -137,8 +137,8 @@ static void ecjpake_do_round(psa_algorithm_t alg, unsigned int primitive,
size_t c_x1_pr_off, c_x2_pr_off, c_x2s_pr_off; size_t c_x1_pr_off, c_x2_pr_off, c_x2s_pr_off;
psa_status_t status; psa_status_t status;
ASSERT_ALLOC(buffer0, buffer_length); TEST_CALLOC(buffer0, buffer_length);
ASSERT_ALLOC(buffer1, buffer_length); TEST_CALLOC(buffer1, buffer_length);
switch (round) { switch (round) {
case PAKE_ROUND_ONE: case PAKE_ROUND_ONE:
@ -617,7 +617,7 @@ void ecjpake_setup(int alg_arg, int key_type_pw_arg, int key_usage_pw_arg,
size_t buf_size = PSA_PAKE_OUTPUT_SIZE(alg, primitive_arg, size_t buf_size = PSA_PAKE_OUTPUT_SIZE(alg, primitive_arg,
PSA_PAKE_STEP_KEY_SHARE); PSA_PAKE_STEP_KEY_SHARE);
ASSERT_ALLOC(output_buffer, buf_size); TEST_CALLOC(output_buffer, buf_size);
psa_set_key_usage_flags(&attributes, key_usage_pw); psa_set_key_usage_flags(&attributes, key_usage_pw);
psa_set_key_algorithm(&attributes, alg); psa_set_key_algorithm(&attributes, alg);
@ -1031,7 +1031,7 @@ void pake_input_getters_password()
&buffer_len_ret), &buffer_len_ret),
PSA_SUCCESS); PSA_SUCCESS);
ASSERT_COMPARE(password_ret, buffer_len_ret, password, strlen(password)); TEST_MEMORY_COMPARE(password_ret, buffer_len_ret, password, strlen(password));
exit: exit:
PSA_ASSERT(psa_destroy_key(key)); PSA_ASSERT(psa_destroy_key(key));
PSA_ASSERT(psa_pake_abort(&operation)); PSA_ASSERT(psa_pake_abort(&operation));
@ -1064,8 +1064,8 @@ void pake_input_getters_cipher_suite()
TEST_EQUAL(psa_crypto_driver_pake_get_cipher_suite(&operation.data.inputs, &cipher_suite_ret), TEST_EQUAL(psa_crypto_driver_pake_get_cipher_suite(&operation.data.inputs, &cipher_suite_ret),
PSA_SUCCESS); PSA_SUCCESS);
ASSERT_COMPARE(&cipher_suite_ret, sizeof(cipher_suite_ret), TEST_MEMORY_COMPARE(&cipher_suite_ret, sizeof(cipher_suite_ret),
&cipher_suite, sizeof(cipher_suite)); &cipher_suite, sizeof(cipher_suite));
exit: exit:
PSA_ASSERT(psa_pake_abort(&operation)); PSA_ASSERT(psa_pake_abort(&operation));
@ -1128,7 +1128,7 @@ void pake_input_getters_user()
&buffer_len_ret), &buffer_len_ret),
PSA_SUCCESS); PSA_SUCCESS);
ASSERT_COMPARE(user_ret, buffer_len_ret, user, user_len); TEST_MEMORY_COMPARE(user_ret, buffer_len_ret, user, user_len);
} }
exit: exit:
PSA_ASSERT(psa_pake_abort(&operation)); PSA_ASSERT(psa_pake_abort(&operation));
@ -1191,7 +1191,7 @@ void pake_input_getters_peer()
&buffer_len_ret), &buffer_len_ret),
PSA_SUCCESS); PSA_SUCCESS);
ASSERT_COMPARE(peer_ret, buffer_len_ret, peer, peer_len); TEST_MEMORY_COMPARE(peer_ret, buffer_len_ret, peer, peer_len);
} }
exit: exit:
PSA_ASSERT(psa_pake_abort(&operation)); PSA_ASSERT(psa_pake_abort(&operation));

16
tests/suites/test_suite_psa_crypto_persistent_key.function
View file

@ -61,13 +61,13 @@ void format_storage_data_check(data_t *key_data,
psa_set_key_algorithm(&attributes, key_alg); psa_set_key_algorithm(&attributes, key_alg);
psa_set_key_enrollment_algorithm(&attributes, key_alg2); psa_set_key_enrollment_algorithm(&attributes, key_alg2);
ASSERT_ALLOC(file_data, file_data_length); TEST_CALLOC(file_data, file_data_length);
psa_format_key_data_for_storage(key_data->x, key_data->len, psa_format_key_data_for_storage(key_data->x, key_data->len,
&attributes.core, &attributes.core,
file_data); file_data);
ASSERT_COMPARE(expected_file_data->x, expected_file_data->len, TEST_MEMORY_COMPARE(expected_file_data->x, expected_file_data->len,
file_data, file_data_length); file_data, file_data_length);
exit: exit:
mbedtls_free(file_data); mbedtls_free(file_data);
@ -111,8 +111,8 @@ void parse_storage_data_check(data_t *file_data,
(uint32_t) expected_key_alg); (uint32_t) expected_key_alg);
TEST_EQUAL(psa_get_key_enrollment_algorithm(&attributes), TEST_EQUAL(psa_get_key_enrollment_algorithm(&attributes),
(uint32_t) expected_key_alg2); (uint32_t) expected_key_alg2);
ASSERT_COMPARE(expected_key_data->x, expected_key_data->len, TEST_MEMORY_COMPARE(expected_key_data->x, expected_key_data->len,
key_data, key_data_length); key_data, key_data_length);
exit: exit:
mbedtls_free(key_data); mbedtls_free(key_data);
@ -127,7 +127,7 @@ void save_large_persistent_key(int data_length_arg, int expected_status)
size_t data_length = data_length_arg; size_t data_length = data_length_arg;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
ASSERT_ALLOC(data, data_length); TEST_CALLOC(data, data_length);
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
@ -267,7 +267,7 @@ void import_export_persistent_key(data_t *data, int type_arg,
size_t exported_length; size_t exported_length;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
ASSERT_ALLOC(exported, export_size); TEST_CALLOC(exported, export_size);
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
@ -307,7 +307,7 @@ void import_export_persistent_key(data_t *data, int type_arg,
PSA_ASSERT(psa_export_key(key_id, exported, export_size, PSA_ASSERT(psa_export_key(key_id, exported, export_size,
&exported_length)); &exported_length));
ASSERT_COMPARE(data->x, data->len, exported, exported_length); TEST_MEMORY_COMPARE(data->x, data->len, exported, exported_length);
/* Destroy the key */ /* Destroy the key */
PSA_ASSERT(psa_destroy_key(key_id)); PSA_ASSERT(psa_destroy_key(key_id));

8
tests/suites/test_suite_psa_crypto_se_driver_hal.function
View file

@ -605,9 +605,9 @@ static int check_persistent_data(psa_key_location_t location,
int ok = 0; int ok = 0;
PSA_ASSERT(psa_its_get_info(uid, &info)); PSA_ASSERT(psa_its_get_info(uid, &info));
ASSERT_ALLOC(loaded, info.size); TEST_CALLOC(loaded, info.size);
PSA_ASSERT(psa_its_get(uid, 0, info.size, loaded, NULL)); PSA_ASSERT(psa_its_get(uid, 0, info.size, loaded, NULL));
ASSERT_COMPARE(expected_data, size, loaded, info.size); TEST_MEMORY_COMPARE(expected_data, size, loaded, info.size);
ok = 1; ok = 1;
exit: exit:
@ -965,8 +965,8 @@ void key_creation_import_export(int lifetime_arg, int min_slot, int restart)
PSA_ASSERT(psa_export_key(returned_id, PSA_ASSERT(psa_export_key(returned_id,
exported, sizeof(exported), exported, sizeof(exported),
&exported_length)); &exported_length));
ASSERT_COMPARE(key_material, sizeof(key_material), TEST_MEMORY_COMPARE(key_material, sizeof(key_material),
exported, exported_length); exported, exported_length);
PSA_ASSERT(psa_destroy_key(returned_id)); PSA_ASSERT(psa_destroy_key(returned_id));
if (!check_persistent_data(location, if (!check_persistent_data(location,

44
tests/suites/test_suite_psa_crypto_slot_management.function
View file

@ -303,12 +303,12 @@ void persistent_slot_lifecycle(int lifetime_arg, int owner_id_arg, int id_arg,
psa_get_key_type(&read_attributes)); psa_get_key_type(&read_attributes));
TEST_EQUAL(psa_get_key_bits(&attributes), TEST_EQUAL(psa_get_key_bits(&attributes),
psa_get_key_bits(&read_attributes)); psa_get_key_bits(&read_attributes));
ASSERT_ALLOC(reexported, key_data->len); TEST_CALLOC(reexported, key_data->len);
if (usage_flags & PSA_KEY_USAGE_EXPORT) { if (usage_flags & PSA_KEY_USAGE_EXPORT) {
PSA_ASSERT(psa_export_key(id, reexported, key_data->len, PSA_ASSERT(psa_export_key(id, reexported, key_data->len,
&reexported_length)); &reexported_length));
ASSERT_COMPARE(key_data->x, key_data->len, TEST_MEMORY_COMPARE(key_data->x, key_data->len,
reexported, reexported_length); reexported, reexported_length);
} else { } else {
TEST_EQUAL(psa_export_key(id, reexported, TEST_EQUAL(psa_export_key(id, reexported,
key_data->len, &reexported_length), key_data->len, &reexported_length),
@ -402,8 +402,8 @@ void create_existent(int lifetime_arg, int owner_id_arg, int id_arg,
PSA_ASSERT(psa_export_key(id, PSA_ASSERT(psa_export_key(id,
reexported, sizeof(reexported), reexported, sizeof(reexported),
&reexported_length)); &reexported_length));
ASSERT_COMPARE(material1, sizeof(material1), TEST_MEMORY_COMPARE(material1, sizeof(material1),
reexported, reexported_length); reexported, reexported_length);
PSA_ASSERT(psa_close_key(id)); PSA_ASSERT(psa_close_key(id));
@ -575,11 +575,11 @@ void copy_across_lifetimes(int source_lifetime_arg, int source_owner_id_arg,
psa_get_key_enrollment_algorithm(&target_attributes)); psa_get_key_enrollment_algorithm(&target_attributes));
if (expected_usage & PSA_KEY_USAGE_EXPORT) { if (expected_usage & PSA_KEY_USAGE_EXPORT) {
size_t length; size_t length;
ASSERT_ALLOC(export_buffer, material->len); TEST_CALLOC(export_buffer, material->len);
PSA_ASSERT(psa_export_key(returned_target_id, export_buffer, PSA_ASSERT(psa_export_key(returned_target_id, export_buffer,
material->len, &length)); material->len, &length));
ASSERT_COMPARE(material->x, material->len, TEST_MEMORY_COMPARE(material->x, material->len,
export_buffer, length); export_buffer, length);
} else { } else {
size_t length; size_t length;
/* Check that the key is actually non-exportable. */ /* Check that the key is actually non-exportable. */
@ -689,11 +689,11 @@ void copy_to_occupied(int source_lifetime_arg, int source_id_arg,
psa_get_key_algorithm(&attributes2)); psa_get_key_algorithm(&attributes2));
if (target_usage & PSA_KEY_USAGE_EXPORT) { if (target_usage & PSA_KEY_USAGE_EXPORT) {
size_t length; size_t length;
ASSERT_ALLOC(export_buffer, target_material->len); TEST_CALLOC(export_buffer, target_material->len);
PSA_ASSERT(psa_export_key(returned_target_id, export_buffer, PSA_ASSERT(psa_export_key(returned_target_id, export_buffer,
target_material->len, &length)); target_material->len, &length));
ASSERT_COMPARE(target_material->x, target_material->len, TEST_MEMORY_COMPARE(target_material->x, target_material->len,
export_buffer, length); export_buffer, length);
} }
PSA_ASSERT(psa_destroy_key(returned_source_id)); PSA_ASSERT(psa_destroy_key(returned_source_id));
@ -813,7 +813,7 @@ void many_transient_keys(int max_keys_arg)
uint8_t exported[sizeof(size_t)]; uint8_t exported[sizeof(size_t)];
size_t exported_length; size_t exported_length;
ASSERT_ALLOC(keys, max_keys); TEST_CALLOC(keys, max_keys);
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_EXPORT); psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_EXPORT);
@ -840,8 +840,8 @@ void many_transient_keys(int max_keys_arg)
PSA_ASSERT(psa_export_key(keys[i], PSA_ASSERT(psa_export_key(keys[i],
exported, sizeof(exported), exported, sizeof(exported),
&exported_length)); &exported_length));
ASSERT_COMPARE(exported, exported_length, TEST_MEMORY_COMPARE(exported, exported_length,
(uint8_t *) &i, sizeof(i)); (uint8_t *) &i, sizeof(i));
} }
PSA_ASSERT(psa_close_key(keys[i - 1])); PSA_ASSERT(psa_close_key(keys[i - 1]));
@ -917,8 +917,8 @@ void key_slot_eviction_to_import_new_key(int lifetime_arg)
PSA_ASSERT(psa_export_key(key, PSA_ASSERT(psa_export_key(key,
exported, sizeof(exported), exported, sizeof(exported),
&exported_length)); &exported_length));
ASSERT_COMPARE(exported, exported_length, TEST_MEMORY_COMPARE(exported, exported_length,
(uint8_t *) &i, sizeof(i)); (uint8_t *) &i, sizeof(i));
PSA_ASSERT(psa_destroy_key(key)); PSA_ASSERT(psa_destroy_key(key));
} }
@ -942,7 +942,7 @@ void non_reusable_key_slots_integrity_in_case_of_key_slot_starvation()
TEST_ASSERT(MBEDTLS_PSA_KEY_SLOT_COUNT >= 1); TEST_ASSERT(MBEDTLS_PSA_KEY_SLOT_COUNT >= 1);
ASSERT_ALLOC(keys, MBEDTLS_PSA_KEY_SLOT_COUNT); TEST_CALLOC(keys, MBEDTLS_PSA_KEY_SLOT_COUNT);
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
psa_set_key_usage_flags(&attributes, psa_set_key_usage_flags(&attributes,
@ -988,7 +988,7 @@ void non_reusable_key_slots_integrity_in_case_of_key_slot_starvation()
exported, sizeof(exported), exported, sizeof(exported),
&exported_length)); &exported_length));
i = MBEDTLS_PSA_KEY_SLOT_COUNT - 1; i = MBEDTLS_PSA_KEY_SLOT_COUNT - 1;
ASSERT_COMPARE(exported, exported_length, (uint8_t *) &i, sizeof(i)); TEST_MEMORY_COMPARE(exported, exported_length, (uint8_t *) &i, sizeof(i));
PSA_ASSERT(psa_destroy_key(keys[MBEDTLS_PSA_KEY_SLOT_COUNT - 1])); PSA_ASSERT(psa_destroy_key(keys[MBEDTLS_PSA_KEY_SLOT_COUNT - 1]));
/* /*
@ -1016,8 +1016,8 @@ void non_reusable_key_slots_integrity_in_case_of_key_slot_starvation()
PSA_ASSERT(psa_export_key(keys[i], PSA_ASSERT(psa_export_key(keys[i],
exported, sizeof(exported), exported, sizeof(exported),
&exported_length)); &exported_length));
ASSERT_COMPARE(exported, exported_length, TEST_MEMORY_COMPARE(exported, exported_length,
(uint8_t *) &i, sizeof(i)); (uint8_t *) &i, sizeof(i));
PSA_ASSERT(psa_destroy_key(keys[i])); PSA_ASSERT(psa_destroy_key(keys[i]));
} }
@ -1028,8 +1028,8 @@ void non_reusable_key_slots_integrity_in_case_of_key_slot_starvation()
PSA_ASSERT(psa_export_key(persistent_key, exported, sizeof(exported), PSA_ASSERT(psa_export_key(persistent_key, exported, sizeof(exported),
&exported_length)); &exported_length));
ASSERT_COMPARE(exported, exported_length, TEST_MEMORY_COMPARE(exported, exported_length,
(uint8_t *) &persistent_key, sizeof(persistent_key)); (uint8_t *) &persistent_key, sizeof(persistent_key));
exit: exit:
/* /*
* Key attributes may have been returned by psa_get_key_attributes() * Key attributes may have been returned by psa_get_key_attributes()

12
tests/suites/test_suite_psa_crypto_storage_format.function
View file

@ -36,11 +36,11 @@ static int test_written_key(const psa_key_attributes_t *attributes,
/* Check that the key is represented as expected. */ /* Check that the key is represented as expected. */
PSA_ASSERT(psa_its_get_info(uid, &storage_info)); PSA_ASSERT(psa_its_get_info(uid, &storage_info));
TEST_EQUAL(storage_info.size, expected_representation->len); TEST_EQUAL(storage_info.size, expected_representation->len);
ASSERT_ALLOC(actual_representation, storage_info.size); TEST_CALLOC(actual_representation, storage_info.size);
PSA_ASSERT(psa_its_get(uid, 0, storage_info.size, PSA_ASSERT(psa_its_get(uid, 0, storage_info.size,
actual_representation, &length)); actual_representation, &length));
ASSERT_COMPARE(expected_representation->x, expected_representation->len, TEST_MEMORY_COMPARE(expected_representation->x, expected_representation->len,
actual_representation, length); actual_representation, length);
ok = 1; ok = 1;
@ -259,12 +259,12 @@ static int test_read_key(const psa_key_attributes_t *expected_attributes,
TEST_EQUAL(psa_get_key_enrollment_algorithm(expected_attributes), TEST_EQUAL(psa_get_key_enrollment_algorithm(expected_attributes),
psa_get_key_enrollment_algorithm(&actual_attributes)); psa_get_key_enrollment_algorithm(&actual_attributes));
if (can_export(expected_attributes)) { if (can_export(expected_attributes)) {
ASSERT_ALLOC(exported_material, expected_material->len); TEST_CALLOC(exported_material, expected_material->len);
PSA_ASSERT(psa_export_key(key_id, PSA_ASSERT(psa_export_key(key_id,
exported_material, expected_material->len, exported_material, expected_material->len,
&length)); &length));
ASSERT_COMPARE(expected_material->x, expected_material->len, TEST_MEMORY_COMPARE(expected_material->x, expected_material->len,
exported_material, length); exported_material, length);
} }
if ((flags & TEST_FLAG_EXERCISE) && can_exercise(&actual_attributes)) { if ((flags & TEST_FLAG_EXERCISE) && can_exercise(&actual_attributes)) {

20
tests/suites/test_suite_psa_its.function
View file

@ -92,7 +92,7 @@ void set_get_remove(int uid_arg, int flags_arg, data_t *data)
unsigned char *buffer = NULL; unsigned char *buffer = NULL;
size_t ret_len = 0; size_t ret_len = 0;
ASSERT_ALLOC(buffer, data->len); TEST_CALLOC(buffer, data->len);
PSA_ASSERT(psa_its_set_wrap(uid, data->len, data->x, flags)); PSA_ASSERT(psa_its_set_wrap(uid, data->len, data->x, flags));
@ -100,7 +100,7 @@ void set_get_remove(int uid_arg, int flags_arg, data_t *data)
TEST_ASSERT(info.size == data->len); TEST_ASSERT(info.size == data->len);
TEST_ASSERT(info.flags == flags); TEST_ASSERT(info.flags == flags);
PSA_ASSERT(psa_its_get(uid, 0, data->len, buffer, &ret_len)); PSA_ASSERT(psa_its_get(uid, 0, data->len, buffer, &ret_len));
ASSERT_COMPARE(data->x, data->len, buffer, ret_len); TEST_MEMORY_COMPARE(data->x, data->len, buffer, ret_len);
PSA_ASSERT(psa_its_remove(uid)); PSA_ASSERT(psa_its_remove(uid));
@ -122,14 +122,14 @@ void set_overwrite(int uid_arg,
unsigned char *buffer = NULL; unsigned char *buffer = NULL;
size_t ret_len = 0; size_t ret_len = 0;
ASSERT_ALLOC(buffer, MAX(data1->len, data2->len)); TEST_CALLOC(buffer, MAX(data1->len, data2->len));
PSA_ASSERT(psa_its_set_wrap(uid, data1->len, data1->x, flags1)); PSA_ASSERT(psa_its_set_wrap(uid, data1->len, data1->x, flags1));
PSA_ASSERT(psa_its_get_info(uid, &info)); PSA_ASSERT(psa_its_get_info(uid, &info));
TEST_ASSERT(info.size == data1->len); TEST_ASSERT(info.size == data1->len);
TEST_ASSERT(info.flags == flags1); TEST_ASSERT(info.flags == flags1);
PSA_ASSERT(psa_its_get(uid, 0, data1->len, buffer, &ret_len)); PSA_ASSERT(psa_its_get(uid, 0, data1->len, buffer, &ret_len));
ASSERT_COMPARE(data1->x, data1->len, buffer, ret_len); TEST_MEMORY_COMPARE(data1->x, data1->len, buffer, ret_len);
PSA_ASSERT(psa_its_set_wrap(uid, data2->len, data2->x, flags2)); PSA_ASSERT(psa_its_set_wrap(uid, data2->len, data2->x, flags2));
PSA_ASSERT(psa_its_get_info(uid, &info)); PSA_ASSERT(psa_its_get_info(uid, &info));
@ -137,7 +137,7 @@ void set_overwrite(int uid_arg,
TEST_ASSERT(info.flags == flags2); TEST_ASSERT(info.flags == flags2);
ret_len = 0; ret_len = 0;
PSA_ASSERT(psa_its_get(uid, 0, data2->len, buffer, &ret_len)); PSA_ASSERT(psa_its_get(uid, 0, data2->len, buffer, &ret_len));
ASSERT_COMPARE(data2->x, data2->len, buffer, ret_len); TEST_MEMORY_COMPARE(data2->x, data2->len, buffer, ret_len);
PSA_ASSERT(psa_its_remove(uid)); PSA_ASSERT(psa_its_remove(uid));
@ -167,8 +167,8 @@ void set_multiple(int first_id, int count)
mbedtls_snprintf(stored, sizeof(stored), mbedtls_snprintf(stored, sizeof(stored),
"Content of file 0x%08lx", (unsigned long) uid); "Content of file 0x%08lx", (unsigned long) uid);
PSA_ASSERT(psa_its_get(uid, 0, sizeof(stored), retrieved, &ret_len)); PSA_ASSERT(psa_its_get(uid, 0, sizeof(stored), retrieved, &ret_len));
ASSERT_COMPARE(retrieved, ret_len, TEST_MEMORY_COMPARE(retrieved, ret_len,
stored, sizeof(stored)); stored, sizeof(stored));
PSA_ASSERT(psa_its_remove(uid)); PSA_ASSERT(psa_its_remove(uid));
TEST_ASSERT(psa_its_get(uid, 0, 0, NULL, NULL) == TEST_ASSERT(psa_its_get(uid, 0, 0, NULL, NULL) ==
PSA_ERROR_DOES_NOT_EXIST); PSA_ERROR_DOES_NOT_EXIST);
@ -214,7 +214,7 @@ void get_at(int uid_arg, data_t *data,
size_t i; size_t i;
size_t ret_len = 0; size_t ret_len = 0;
ASSERT_ALLOC(buffer, length + 16); TEST_CALLOC(buffer, length + 16);
trailer = buffer + length; trailer = buffer + length;
memset(trailer, '-', 16); memset(trailer, '-', 16);
@ -223,8 +223,8 @@ void get_at(int uid_arg, data_t *data,
status = psa_its_get(uid, offset, length_arg, buffer, &ret_len); status = psa_its_get(uid, offset, length_arg, buffer, &ret_len);
TEST_ASSERT(status == (psa_status_t) expected_status); TEST_ASSERT(status == (psa_status_t) expected_status);
if (status == PSA_SUCCESS) { if (status == PSA_SUCCESS) {
ASSERT_COMPARE(data->x + offset, (size_t) length_arg, TEST_MEMORY_COMPARE(data->x + offset, (size_t) length_arg,
buffer, ret_len); buffer, ret_len);
} }
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
TEST_ASSERT(trailer[i] == '-'); TEST_ASSERT(trailer[i] == '-');

2
tests/suites/test_suite_random.function
View file

@ -169,7 +169,7 @@ void mbedtls_psa_get_random_length(int n)
unsigned char *output = NULL; unsigned char *output = NULL;
PSA_ASSERT(psa_crypto_init()); PSA_ASSERT(psa_crypto_init());
ASSERT_ALLOC(output, n); TEST_CALLOC(output, n);
TEST_EQUAL(0, mbedtls_psa_get_random(MBEDTLS_PSA_RANDOM_STATE, TEST_EQUAL(0, mbedtls_psa_get_random(MBEDTLS_PSA_RANDOM_STATE,
output, n)); output, n));

14
tests/suites/test_suite_shax.function
View file

@ -155,11 +155,11 @@ void mbedtls_sha3(int family, data_t *in, data_t *hash)
{ {
unsigned char *output = NULL; unsigned char *output = NULL;
ASSERT_ALLOC(output, hash->len); TEST_CALLOC(output, hash->len);
TEST_ASSERT(mbedtls_sha3(family, in->x, in->len, output, hash->len) == 0); TEST_ASSERT(mbedtls_sha3(family, in->x, in->len, output, hash->len) == 0);
ASSERT_COMPARE(output, hash->len, hash->x, hash->len); TEST_MEMORY_COMPARE(output, hash->len, hash->x, hash->len);
exit: exit:
mbedtls_free(output); mbedtls_free(output);
@ -193,7 +193,7 @@ void mbedtls_sha3_multi(int family, data_t *in, data_t *hash)
mbedtls_sha3_context ctx; mbedtls_sha3_context ctx;
const unsigned int block_size = 256; const unsigned int block_size = 256;
ASSERT_ALLOC(output, hash->len); TEST_CALLOC(output, hash->len);
mbedtls_sha3_init(&ctx); mbedtls_sha3_init(&ctx);
mbedtls_sha3_starts(&ctx, family); mbedtls_sha3_starts(&ctx, family);
@ -204,7 +204,7 @@ void mbedtls_sha3_multi(int family, data_t *in, data_t *hash)
TEST_ASSERT(mbedtls_sha3_finish(&ctx, output, hash->len) == 0); TEST_ASSERT(mbedtls_sha3_finish(&ctx, output, hash->len) == 0);
ASSERT_COMPARE(output, hash->len, hash->x, hash->len); TEST_MEMORY_COMPARE(output, hash->len, hash->x, hash->len);
exit: exit:
mbedtls_free(output); mbedtls_free(output);
@ -253,7 +253,7 @@ void sha3_streaming(int type, data_t *input)
mbedtls_sha3_finish(&ctx, hash, hash_length); mbedtls_sha3_finish(&ctx, hash, hash_length);
mbedtls_sha3_free(&ctx); mbedtls_sha3_free(&ctx);
ASSERT_COMPARE(hash, hash_length, reference_hash, hash_length); TEST_MEMORY_COMPARE(hash, hash_length, reference_hash, hash_length);
} }
exit: exit:
@ -289,13 +289,13 @@ void sha3_reuse(data_t *input1, data_t *hash1,
TEST_ASSERT(mbedtls_sha3_starts(&ctx, type1) == 0); TEST_ASSERT(mbedtls_sha3_starts(&ctx, type1) == 0);
TEST_ASSERT(mbedtls_sha3_update(&ctx, input1->x, input1->len) == 0); TEST_ASSERT(mbedtls_sha3_update(&ctx, input1->x, input1->len) == 0);
TEST_ASSERT(mbedtls_sha3_finish(&ctx, output, sizeof(output)) == 0); TEST_ASSERT(mbedtls_sha3_finish(&ctx, output, sizeof(output)) == 0);
ASSERT_COMPARE(output, hash1->len, hash1->x, hash1->len); TEST_MEMORY_COMPARE(output, hash1->len, hash1->x, hash1->len);
/* Round 2 */ /* Round 2 */
TEST_ASSERT(mbedtls_sha3_starts(&ctx, type2) == 0); TEST_ASSERT(mbedtls_sha3_starts(&ctx, type2) == 0);
TEST_ASSERT(mbedtls_sha3_update(&ctx, input2->x, input2->len) == 0); TEST_ASSERT(mbedtls_sha3_update(&ctx, input2->x, input2->len) == 0);
TEST_ASSERT(mbedtls_sha3_finish(&ctx, output, sizeof(output)) == 0); TEST_ASSERT(mbedtls_sha3_finish(&ctx, output, sizeof(output)) == 0);
ASSERT_COMPARE(output, hash2->len, hash2->x, hash2->len); TEST_MEMORY_COMPARE(output, hash2->len, hash2->x, hash2->len);
exit: exit:
mbedtls_sha3_free(&ctx); mbedtls_sha3_free(&ctx);

100
tests/suites/test_suite_ssl.function
View file

@ -152,7 +152,7 @@ void test_callback_buffer(int size, int put1, int put1_ret,
if (input_len == 0) { if (input_len == 0) {
input_len = 1; input_len = 1;
} }
ASSERT_ALLOC(input, input_len); TEST_CALLOC(input, input_len);
output_len = 0; output_len = 0;
for (j = 0; j < ROUNDS; j++) { for (j = 0; j < ROUNDS; j++) {
@ -166,7 +166,7 @@ void test_callback_buffer(int size, int put1, int put1_ret,
if (output_len == 0) { if (output_len == 0) {
output_len = 1; output_len = 1;
} }
ASSERT_ALLOC(output, output_len); TEST_CALLOC(output, output_len);
/* Fill up the buffer with structured data so that unwanted changes /* Fill up the buffer with structured data so that unwanted changes
* can be detected */ * can be detected */
@ -1543,8 +1543,8 @@ void ssl_decrypt_non_etm_cbc(int cipher_type, int hash_id, int trunc_hmac,
+ plaintext_len + plaintext_len
+ t0.maclen + t0.maclen
+ padlen + 1; + padlen + 1;
ASSERT_ALLOC(buf, buflen); TEST_CALLOC(buf, buflen);
ASSERT_ALLOC(buf_save, buflen); TEST_CALLOC(buf_save, buflen);
/* Prepare a dummy record header */ /* Prepare a dummy record header */
memset(rec.ctr, 0, sizeof(rec.ctr)); memset(rec.ctr, 0, sizeof(rec.ctr));
@ -1728,8 +1728,8 @@ void ssl_tls13_hkdf_expand_label(int hash_alg,
ctx->x, ctx->len, ctx->x, ctx->len,
dst, desired_length) == 0); dst, desired_length) == 0);
ASSERT_COMPARE(dst, (size_t) desired_length, TEST_MEMORY_COMPARE(dst, (size_t) desired_length,
expected->x, (size_t) expected->len); expected->x, (size_t) expected->len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -1768,22 +1768,22 @@ void ssl_tls13_traffic_key_generation(int hash_alg,
desired_key_len, desired_iv_len, desired_key_len, desired_iv_len,
&keys) == 0); &keys) == 0);
ASSERT_COMPARE(keys.client_write_key, TEST_MEMORY_COMPARE(keys.client_write_key,
keys.key_len, keys.key_len,
expected_client_write_key->x, expected_client_write_key->x,
(size_t) desired_key_len); (size_t) desired_key_len);
ASSERT_COMPARE(keys.server_write_key, TEST_MEMORY_COMPARE(keys.server_write_key,
keys.key_len, keys.key_len,
expected_server_write_key->x, expected_server_write_key->x,
(size_t) desired_key_len); (size_t) desired_key_len);
ASSERT_COMPARE(keys.client_write_iv, TEST_MEMORY_COMPARE(keys.client_write_iv,
keys.iv_len, keys.iv_len,
expected_client_write_iv->x, expected_client_write_iv->x,
(size_t) desired_iv_len); (size_t) desired_iv_len);
ASSERT_COMPARE(keys.server_write_iv, TEST_MEMORY_COMPARE(keys.server_write_iv,
keys.iv_len, keys.iv_len,
expected_server_write_iv->x, expected_server_write_iv->x,
(size_t) desired_iv_len); (size_t) desired_iv_len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -1827,8 +1827,8 @@ void ssl_tls13_derive_secret(int hash_alg,
already_hashed, already_hashed,
dst, desired_length) == 0); dst, desired_length) == 0);
ASSERT_COMPARE(dst, desired_length, TEST_MEMORY_COMPARE(dst, desired_length,
expected->x, desired_length); expected->x, desired_length);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -1859,10 +1859,10 @@ void ssl_tls13_derive_early_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len, alg, secret->x, transcript->x, transcript->len,
&secrets) == 0); &secrets) == 0);
ASSERT_COMPARE(secrets.client_early_traffic_secret, hash_len, TEST_MEMORY_COMPARE(secrets.client_early_traffic_secret, hash_len,
traffic_expected->x, traffic_expected->len); traffic_expected->x, traffic_expected->len);
ASSERT_COMPARE(secrets.early_exporter_master_secret, hash_len, TEST_MEMORY_COMPARE(secrets.early_exporter_master_secret, hash_len,
exporter_expected->x, exporter_expected->len); exporter_expected->x, exporter_expected->len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -1893,10 +1893,10 @@ void ssl_tls13_derive_handshake_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len, alg, secret->x, transcript->x, transcript->len,
&secrets) == 0); &secrets) == 0);
ASSERT_COMPARE(secrets.client_handshake_traffic_secret, hash_len, TEST_MEMORY_COMPARE(secrets.client_handshake_traffic_secret, hash_len,
client_expected->x, client_expected->len); client_expected->x, client_expected->len);
ASSERT_COMPARE(secrets.server_handshake_traffic_secret, hash_len, TEST_MEMORY_COMPARE(secrets.server_handshake_traffic_secret, hash_len,
server_expected->x, server_expected->len); server_expected->x, server_expected->len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -1929,12 +1929,12 @@ void ssl_tls13_derive_application_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len, alg, secret->x, transcript->x, transcript->len,
&secrets) == 0); &secrets) == 0);
ASSERT_COMPARE(secrets.client_application_traffic_secret_N, hash_len, TEST_MEMORY_COMPARE(secrets.client_application_traffic_secret_N, hash_len,
client_expected->x, client_expected->len); client_expected->x, client_expected->len);
ASSERT_COMPARE(secrets.server_application_traffic_secret_N, hash_len, TEST_MEMORY_COMPARE(secrets.server_application_traffic_secret_N, hash_len,
server_expected->x, server_expected->len); server_expected->x, server_expected->len);
ASSERT_COMPARE(secrets.exporter_master_secret, hash_len, TEST_MEMORY_COMPARE(secrets.exporter_master_secret, hash_len,
exporter_expected->x, exporter_expected->len); exporter_expected->x, exporter_expected->len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -1963,8 +1963,8 @@ void ssl_tls13_derive_resumption_secrets(int hash_alg,
alg, secret->x, transcript->x, transcript->len, alg, secret->x, transcript->x, transcript->len,
&secrets) == 0); &secrets) == 0);
ASSERT_COMPARE(secrets.resumption_master_secret, hash_len, TEST_MEMORY_COMPARE(secrets.resumption_master_secret, hash_len,
resumption_expected->x, resumption_expected->len); resumption_expected->x, resumption_expected->len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -1997,8 +1997,8 @@ void ssl_tls13_create_psk_binder(int hash_alg,
transcript->x, transcript->x,
binder) == 0); binder) == 0);
ASSERT_COMPARE(binder, hash_len, TEST_MEMORY_COMPARE(binder, hash_len,
binder_expected->x, binder_expected->len); binder_expected->x, binder_expected->len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -2064,7 +2064,7 @@ void ssl_tls13_record_protection(int ciphersuite,
/* Make sure we have enough space in the buffer even if /* Make sure we have enough space in the buffer even if
* we use more padding than the KAT. */ * we use more padding than the KAT. */
buf_len = ciphertext->len + MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY; buf_len = ciphertext->len + MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY;
ASSERT_ALLOC(buf, buf_len); TEST_CALLOC(buf, buf_len);
rec.type = MBEDTLS_SSL_MSG_APPLICATION_DATA; rec.type = MBEDTLS_SSL_MSG_APPLICATION_DATA;
/* TLS 1.3 uses the version identifier from TLS 1.2 on the wire. */ /* TLS 1.3 uses the version identifier from TLS 1.2 on the wire. */
@ -2090,13 +2090,13 @@ void ssl_tls13_record_protection(int ciphersuite,
NULL, NULL) == 0); NULL, NULL) == 0);
if (padding_used == MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY) { if (padding_used == MBEDTLS_SSL_CID_TLS1_3_PADDING_GRANULARITY) {
ASSERT_COMPARE(rec.buf + rec.data_offset, rec.data_len, TEST_MEMORY_COMPARE(rec.buf + rec.data_offset, rec.data_len,
ciphertext->x, ciphertext->len); ciphertext->x, ciphertext->len);
} }
TEST_ASSERT(mbedtls_ssl_decrypt_buf(NULL, &transform_recv, &rec) == 0); TEST_ASSERT(mbedtls_ssl_decrypt_buf(NULL, &transform_recv, &rec) == 0);
ASSERT_COMPARE(rec.buf + rec.data_offset, rec.data_len, TEST_MEMORY_COMPARE(rec.buf + rec.data_offset, rec.data_len,
plaintext->x, plaintext->len); plaintext->x, plaintext->len);
exit: exit:
mbedtls_free(buf); mbedtls_free(buf);
@ -2122,8 +2122,8 @@ void ssl_tls13_key_evolution(int hash_alg,
input->len ? input->x : NULL, input->len, input->len ? input->x : NULL, input->len,
secret_new) == 0); secret_new) == 0);
ASSERT_COMPARE(secret_new, (size_t) expected->len, TEST_MEMORY_COMPARE(secret_new, (size_t) expected->len,
expected->x, (size_t) expected->len); expected->x, (size_t) expected->len);
exit: exit:
PSA_DONE(); PSA_DONE();
@ -3326,7 +3326,7 @@ void cid_sanity()
== 0); == 0);
TEST_EQUAL(cid_enabled, MBEDTLS_SSL_CID_ENABLED); TEST_EQUAL(cid_enabled, MBEDTLS_SSL_CID_ENABLED);
ASSERT_COMPARE(own_cid, own_cid_len, test_cid, own_cid_len); TEST_MEMORY_COMPARE(own_cid, own_cid_len, test_cid, own_cid_len);
/* Test disabling works. */ /* Test disabling works. */
TEST_ASSERT(mbedtls_ssl_set_cid(&ssl, MBEDTLS_SSL_CID_DISABLED, NULL, TEST_ASSERT(mbedtls_ssl_set_cid(&ssl, MBEDTLS_SSL_CID_DISABLED, NULL,

6
tests/suites/test_suite_x509parse.function
View file

@ -447,7 +447,7 @@ void x509_crt_parse_cn_inet_pton(const char *cn, data_t *exp, int ref_ret)
TEST_EQUAL(addrlen, (size_t) ref_ret); TEST_EQUAL(addrlen, (size_t) ref_ret);
if (addrlen) { if (addrlen) {
ASSERT_COMPARE(exp->x, exp->len, addr, addrlen); TEST_MEMORY_COMPARE(exp->x, exp->len, addr, addrlen);
} }
} }
/* END_CASE */ /* END_CASE */
@ -944,7 +944,7 @@ void mbedtls_x509_dn_get_next(char *name_str,
c = buf + sizeof(buf); c = buf + sizeof(buf);
// Additional size required for trailing space // Additional size required for trailing space
out_size = strlen(expected_oids) + 2; out_size = strlen(expected_oids) + 2;
ASSERT_ALLOC(out, out_size); TEST_CALLOC(out, out_size);
TEST_EQUAL(mbedtls_x509_string_to_names(&names, name_str), 0); TEST_EQUAL(mbedtls_x509_string_to_names(&names, name_str), 0);
@ -979,7 +979,7 @@ void mbedtls_x509_dn_get_next(char *name_str,
out = NULL; out = NULL;
out_size = strlen(exp_dn_gets) + 1; out_size = strlen(exp_dn_gets) + 1;
ASSERT_ALLOC(out, out_size); TEST_CALLOC(out, out_size);
TEST_LE_S(0, mbedtls_x509_dn_gets((char *) out, out_size, &parsed)); TEST_LE_S(0, mbedtls_x509_dn_gets((char *) out, out_size, &parsed));
TEST_EQUAL(strcmp((char *) out, exp_dn_gets), 0); TEST_EQUAL(strcmp((char *) out, exp_dn_gets), 0);