cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-29 08:24:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix TEST_CALLOC issues with GCM buffer overlap tests

Browse Source 
This commit fixes issues with TEST_CALLOC in GCM buffer overlap tests
cases.

Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
This commit is contained in:
Harry Ramsey 2024-11-07 16:41:40 +00:00
parent e2c7a090fa
commit 8ad56b822b
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tf-psa-crypto/tests/suites/test_suite_gcm.function
View File

@ -627,14 +627,10 @@ void gcm_encrypt_input_output_buffer_overlap(int cipher_id, data_t *key_str,
* Therefore we must ensure we round up to the nearest 128-bits/16-bytes. * Therefore we must ensure we round up to the nearest 128-bits/16-bytes.
*/ */
buffer_len = src_str->len; buffer_len = src_str->len;
if (buffer_len % 16 != 0) { if (buffer_len % 16 != 0 || buffer_len == 0) {
buffer_len += (16 - (buffer_len % 16)); buffer_len += (16 - (buffer_len % 16));
} }
TEST_CALLOC(buffer, buffer_len); TEST_CALLOC(buffer, buffer_len);
if (buffer == NULL) {
TEST_FAIL("Could not allocate memory for input output buffer overlap");
goto exit;
}
memcpy(buffer, src_str->x, src_str->len); memcpy(buffer, src_str->x, src_str->len);
memset(tag_output, 0x00, 16); memset(tag_output, 0x00, 16);
@ -662,9 +658,7 @@ void gcm_encrypt_input_output_buffer_overlap(int cipher_id, data_t *key_str,
} }
exit: exit:
if (buffer != NULL) { mbedtls_free(buffer);
free(buffer);
}
mbedtls_gcm_free(&ctx); mbedtls_gcm_free(&ctx);
BLOCK_CIPHER_PSA_DONE(); BLOCK_CIPHER_PSA_DONE();
} }
@ -692,14 +686,10 @@ void gcm_decrypt_input_output_buffer_overlap(int cipher_id, data_t *key_str,
* Therefore we must ensure we round up to the nearest 128-bits/16-bytes. * Therefore we must ensure we round up to the nearest 128-bits/16-bytes.
*/ */
buffer_len = src_str->len; buffer_len = src_str->len;
if (buffer_len % 16 != 0) { if (buffer_len % 16 != 0 || buffer_len == 0) {
buffer_len += (16 - (buffer_len % 16)); buffer_len += (16 - (buffer_len % 16));
} }
TEST_CALLOC(buffer, buffer_len); TEST_CALLOC(buffer, buffer_len);
if (buffer == NULL) {
TEST_FAIL("Could not allocate memory for input output buffer overlap");
goto exit;
}
memcpy(buffer, src_str->x, src_str->len); memcpy(buffer, src_str->x, src_str->len);
TEST_ASSERT(mbedtls_gcm_setkey(&ctx, cipher_id, key_str->x, key_str->len * 8) == init_result); TEST_ASSERT(mbedtls_gcm_setkey(&ctx, cipher_id, key_str->x, key_str->len * 8) == init_result);
@ -736,9 +726,7 @@ void gcm_decrypt_input_output_buffer_overlap(int cipher_id, data_t *key_str,
} }
exit: exit:
if (buffer != NULL) { mbedtls_free(buffer);
free(buffer);
}
mbedtls_gcm_free(&ctx); mbedtls_gcm_free(&ctx);
BLOCK_CIPHER_PSA_DONE(); BLOCK_CIPHER_PSA_DONE();