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

PSA wrappers: don't poison buffers when buffer copying is disabled

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2024-01-04 20:33:29 +01:00
parent a1871f318b
commit 88385c2f74
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/scripts/generate_psa_wrappers.py
View File

@ -121,6 +121,20 @@ class PSAWrapperGenerator(c_wrapper_generator.Base):
param.buffer_name, param.size_name param.buffer_name, param.size_name
)) ))
def _write_poison_buffer_parameters(self, out: typing_util.Writable,
buffer_parameters: List[BufferParameter],
poison: bool) -> None:
"""Write poisoning or unpoisoning code for the buffer parameters.
Write poisoning code if poison is true, unpoisoning code otherwise.
"""
if not buffer_parameters:
return
out.write('#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)\n')
for param in buffer_parameters:
self._write_poison_buffer_parameter(out, param, poison)
out.write('#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */\n')
@staticmethod @staticmethod
def _parameter_should_be_copied(function_name: str, def _parameter_should_be_copied(function_name: str,
_buffer_name: Optional[str]) -> bool: _buffer_name: Optional[str]) -> bool:
@ -140,11 +154,9 @@ class PSAWrapperGenerator(c_wrapper_generator.Base):
argument_names) argument_names)
if self._parameter_should_be_copied(function.name, if self._parameter_should_be_copied(function.name,
function.arguments[param.index].name)) function.arguments[param.index].name))
for param in buffer_parameters: self._write_poison_buffer_parameters(out, buffer_parameters, True)
self._write_poison_buffer_parameter(out, param, True)
super()._write_function_call(out, function, argument_names) super()._write_function_call(out, function, argument_names)
for param in buffer_parameters: self._write_poison_buffer_parameters(out, buffer_parameters, False)
self._write_poison_buffer_parameter(out, param, False)
def _write_prologue(self, out: typing_util.Writable, header: bool) -> None: def _write_prologue(self, out: typing_util.Writable, header: bool) -> None:
super()._write_prologue(out, header) super()._write_prologue(out, header)

4
tests/src/psa_test_wrappers.c
View File

@ -266,11 +266,15 @@ psa_status_t mbedtls_test_wrap_psa_cipher_encrypt(
size_t arg5_output_size, size_t arg5_output_size,
size_t *arg6_output_length) size_t *arg6_output_length)
{ {
#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length);
MBEDTLS_TEST_MEMORY_POISON(arg4_output, arg5_output_size); MBEDTLS_TEST_MEMORY_POISON(arg4_output, arg5_output_size);
#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */
psa_status_t status = (psa_cipher_encrypt)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_output, arg5_output_size, arg6_output_length); psa_status_t status = (psa_cipher_encrypt)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_output, arg5_output_size, arg6_output_length);
#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)
MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length);
MBEDTLS_TEST_MEMORY_UNPOISON(arg4_output, arg5_output_size); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_output, arg5_output_size);
#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */
return status; return status;
} }