lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-05 19:35:48 +03:00
Code 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-11 15:02:26 +00:00
parent 187fcce476
commit e320b899f5
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/suites/test_suite_gcm.function
View File

@@ -631,10 +631,6 @@ void gcm_encrypt_input_output_buffer_overlap(int cipher_id, data_t *key_str,
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();
} }
@@ -696,10 +690,6 @@ void gcm_decrypt_input_output_buffer_overlap(int cipher_id, data_t *key_str,
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();