mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-16 08:42:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace compound-initializers with memset

Browse Source 
This should eliminate some pedantic compiler warnings.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2023-11-02 20:47:04 +00:00
parent 8f77dc7f68
commit 676cfdd0ea
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/suites/test_suite_psa_crypto.function
View File

@ -10442,9 +10442,11 @@ void psa_crypto_alloc_and_copy(int input_null, int input_len,
{ {
uint8_t *input_buffer = NULL; uint8_t *input_buffer = NULL;
uint8_t *output_buffer = NULL; uint8_t *output_buffer = NULL;
psa_crypto_buffer_copy_t buffer_copies = { 0 };
psa_status_t ret; psa_status_t ret;
psa_crypto_buffer_copy_t buffer_copies;
memset(&buffer_copies, 0, sizeof(buffer_copies));
if (!input_null) { if (!input_null) {
TEST_CALLOC(input_buffer, input_len); TEST_CALLOC(input_buffer, input_len);
fill_buffer_pattern(input_buffer, input_len); fill_buffer_pattern(input_buffer, input_len);
@ -10478,11 +10480,12 @@ void psa_crypto_alloc_and_copy_zero_length(int input_zero_length,
uint8_t input_buffer[] = { 0x12 }; uint8_t input_buffer[] = { 0x12 };
uint8_t output_buffer[] = { 0x34 }; uint8_t output_buffer[] = { 0x34 };
psa_crypto_buffer_copy_t buffer_copies;
size_t input_len = input_zero_length ? 0 : 1; size_t input_len = input_zero_length ? 0 : 1;
size_t output_len = output_zero_length ? 0 : 1; size_t output_len = output_zero_length ? 0 : 1;
psa_crypto_buffer_copy_t buffer_copies;
memset(&buffer_copies, 0, sizeof(buffer_copies));
psa_status_t ret = psa_crypto_alloc_and_copy(input_buffer, input_len, psa_status_t ret = psa_crypto_alloc_and_copy(input_buffer, input_len,
output_buffer, output_len, output_buffer, output_len,
&buffer_copies); &buffer_copies);
@ -10510,14 +10513,15 @@ exit:
void psa_crypto_alloc_and_copy_overlapping(int input_len, int output_len, void psa_crypto_alloc_and_copy_overlapping(int input_len, int output_len,
int ptr_diff, int exp_ret) int ptr_diff, int exp_ret)
{ {
psa_crypto_buffer_copy_t buffer_copies = { 0 };
uint8_t *full_buffer = NULL; uint8_t *full_buffer = NULL;
uint8_t *input = NULL; uint8_t *input = NULL;
uint8_t *output = NULL; uint8_t *output = NULL;
psa_status_t ret; psa_status_t ret;
psa_crypto_buffer_copy_t buffer_copies;
memset(&buffer_copies, 0, sizeof(buffer_copies));
TEST_EQUAL(setup_overlapping_buffers(input_len, output_len, ptr_diff, TEST_EQUAL(setup_overlapping_buffers(input_len, output_len, ptr_diff,
&full_buffer, &input, &output), 0); &full_buffer, &input, &output), 0);
@ -10554,8 +10558,6 @@ void psa_crypto_copy_and_free(int input_null, int input_len,
int orig_output_null, int orig_output_null,
int exp_ret) int exp_ret)
{ {
psa_crypto_buffer_copy_t buffer_copies = { 0 };
uint8_t *input = NULL; uint8_t *input = NULL;
uint8_t *output = NULL; uint8_t *output = NULL;
uint8_t *output_for_comparison = NULL; uint8_t *output_for_comparison = NULL;
@ -10563,6 +10565,9 @@ void psa_crypto_copy_and_free(int input_null, int input_len,
size_t calloc_len; size_t calloc_len;
psa_status_t ret; psa_status_t ret;
psa_crypto_buffer_copy_t buffer_copies;
memset(&buffer_copies, 0, sizeof(buffer_copies));
if (!input_null) { if (!input_null) {
/* If zero-length, ensure we actually allocate something /* If zero-length, ensure we actually allocate something
* rather than getting NULL. */ * rather than getting NULL. */
@ -10622,9 +10627,11 @@ void psa_crypto_buffer_copy_round_trip()
uint8_t input[100]; uint8_t input[100];
uint8_t output[100]; uint8_t output[100];
uint8_t output_for_comparison[100]; uint8_t output_for_comparison[100];
psa_crypto_buffer_copy_t buffer_copies = { 0 };
psa_status_t ret; psa_status_t ret;
psa_crypto_buffer_copy_t buffer_copies;
memset(&buffer_copies, 0, sizeof(buffer_copies));
fill_buffer_pattern(input, sizeof(input)); fill_buffer_pattern(input, sizeof(input));
ret = psa_crypto_alloc_and_copy(input, sizeof(input), ret = psa_crypto_alloc_and_copy(input, sizeof(input),