From 4a48becdbadb86ced74710c7df99ee9f5fdd89b6 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Wed, 13 Mar 2024 15:42:31 +0000 Subject: [PATCH 1/4] Invert and rename config option Replace MBEDTLS_PSA_COPY_CALLER_BUFFERS with inverse: !MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS. This ensures that buffer protection is enabled by default without any change to the Mbed TLS config file. Signed-off-by: David Horstmann --- include/mbedtls/mbedtls_config.h | 18 ++++++++++------- library/psa_crypto.c | 34 ++++++++++++++++---------------- tests/scripts/all.sh | 8 ++++---- tests/src/helpers.c | 4 ++-- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index 3f2937a64..37af2641f 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -1469,20 +1469,24 @@ //#define MBEDTLS_PSA_INJECT_ENTROPY /** - * \def MBEDTLS_PSA_COPY_CALLER_BUFFERS + * \def MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS * - * Make local copies of buffers supplied by the callers of PSA functions. + * Assume all buffers passed to PSA functions are owned exclusively by the + * PSA function and are not stored in shared memory. * - * This should be enabled whenever caller-supplied buffers are owned by - * an untrusted party, for example where arguments to PSA calls are passed + * This option may be enabled if all buffers passed to any PSA function reside + * in memory that is accessible only to the PSA function during its execution. + * + * This option MUST be disabled whenever buffer arguments are in memory shared + * with an untrusted party, for example where arguments to PSA calls are passed * across a trust boundary. * - * \note Enabling this option increases memory usage and code size. + * \note Enabling this option reduces memory usage and code size. * - * \note Disabling this option causes overlap of input and output buffers + * \note Enabling this option causes overlap of input and output buffers * not to be supported by PSA functions. */ -#define MBEDTLS_PSA_COPY_CALLER_BUFFERS +//#define MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS /** * \def MBEDTLS_RSA_NO_CRT diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 5ba94c420..e18756067 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -105,7 +105,7 @@ static psa_global_data_t global_data; if (global_data.initialized == 0) \ return PSA_ERROR_BAD_STATE; -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) /* Declare a local copy of an input buffer and a variable that will be used * to store a pointer to the start of the buffer. @@ -201,7 +201,7 @@ static psa_global_data_t global_data; status = local_output_status; \ } \ } while (0) -#else /* MBEDTLS_PSA_COPY_CALLER_BUFFERS */ +#else /* !MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS */ #define LOCAL_INPUT_DECLARE(input, input_copy_name) \ const uint8_t *input_copy_name = NULL; #define LOCAL_INPUT_ALLOC(input, length, input_copy) \ @@ -214,7 +214,7 @@ static psa_global_data_t global_data; output_copy = output; #define LOCAL_OUTPUT_FREE(output, output_copy) \ output_copy = NULL; -#endif /* MBEDTLS_PSA_COPY_CALLER_BUFFERS */ +#endif /* !MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS */ int psa_can_do_hash(psa_algorithm_t hash_alg) @@ -1447,7 +1447,7 @@ psa_status_t psa_export_key(mbedtls_svc_key_id_t key, slot->key.data, slot->key.bytes, data, data_size, data_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif unlock_status = psa_unregister_read_under_mutex(slot); @@ -2315,7 +2315,7 @@ psa_status_t psa_hash_finish(psa_hash_operation_t *operation, LOCAL_OUTPUT_ALLOC(hash_external, hash_size, hash); status = psa_hash_finish_internal(operation, hash, hash_size, hash_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_OUTPUT_FREE(hash_external, hash); @@ -2378,7 +2378,7 @@ psa_status_t psa_hash_compute(psa_algorithm_t alg, status = psa_driver_wrapper_hash_compute(alg, input, input_length, hash, hash_size, hash_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(input_external, input); @@ -2615,7 +2615,7 @@ psa_status_t psa_mac_update(psa_mac_operation_t *operation, psa_mac_abort(operation); } -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(input_external, input); @@ -2794,7 +2794,7 @@ psa_status_t psa_mac_compute(mbedtls_svc_key_id_t key, input, input_length, mac, mac_size, mac_length, 1); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(input_external, input); @@ -3033,7 +3033,7 @@ psa_status_t psa_sign_message(mbedtls_svc_key_id_t key, status = psa_sign_internal(key, 1, alg, input, input_length, signature, signature_size, signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(input_external, input); @@ -3091,7 +3091,7 @@ psa_status_t psa_verify_message(mbedtls_svc_key_id_t key, status = psa_verify_internal(key, 1, alg, input, input_length, signature, signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(input_external, input); @@ -3165,7 +3165,7 @@ psa_status_t psa_sign_hash(mbedtls_svc_key_id_t key, status = psa_sign_internal(key, 0, alg, hash, hash_length, signature, signature_size, signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(hash_external, hash); @@ -3237,7 +3237,7 @@ psa_status_t psa_verify_hash(mbedtls_svc_key_id_t key, status = psa_verify_internal(key, 0, alg, hash, hash_length, signature, signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(hash_external, hash); @@ -3618,7 +3618,7 @@ psa_status_t psa_verify_hash_start( slot->key.bytes, alg, hash, hash_length, signature, signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif @@ -5036,7 +5036,7 @@ psa_status_t psa_aead_set_nonce(psa_aead_operation_t *operation, status = psa_aead_set_nonce_internal(operation, nonce, nonce_length); /* Exit label is only needed for buffer copying, prevent unused warnings. */ -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif @@ -7337,7 +7337,7 @@ psa_status_t psa_key_derivation_input_bytes( status = psa_key_derivation_input_internal(operation, step, PSA_KEY_TYPE_NONE, data, data_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_INPUT_FREE(data_external, data); @@ -7527,7 +7527,7 @@ psa_status_t psa_key_derivation_key_agreement(psa_key_derivation_operation_t *op slot, peer_key, peer_key_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif if (status != PSA_SUCCESS) { @@ -7699,7 +7699,7 @@ psa_status_t psa_generate_random(uint8_t *output_external, status = psa_generate_random_internal(output, output_size); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) exit: #endif LOCAL_OUTPUT_FREE(output_external, output); diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 66bba9cc4..667f85006 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1260,14 +1260,14 @@ component_test_psa_crypto_key_id_encodes_owner () { make test } -component_test_no_psa_copy_caller_buffers () { - msg "build: full config - MBEDTLS_PSA_COPY_CALLER_BUFFERS, cmake, gcc, ASan" +component_test_psa_assume_exclusive_buffers () { + msg "build: full config + MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS, cmake, gcc, ASan" scripts/config.py full - scripts/config.py unset MBEDTLS_PSA_COPY_CALLER_BUFFERS + scripts/config.py set MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan . make - msg "test: full config - MBEDTLS_PSA_COPY_CALLER_BUFFERS, cmake, gcc, ASan" + msg "test: full config + MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS, cmake, gcc, ASan" make test } diff --git a/tests/src/helpers.c b/tests/src/helpers.c index be9155c66..065d17d3e 100644 --- a/tests/src/helpers.c +++ b/tests/src/helpers.c @@ -318,7 +318,7 @@ int mbedtls_test_platform_setup(void) int ret = 0; #if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \ - && defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) \ + && !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) \ && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) mbedtls_poison_test_hooks_setup(); #endif @@ -348,7 +348,7 @@ int mbedtls_test_platform_setup(void) void mbedtls_test_platform_teardown(void) { #if defined(MBEDTLS_TEST_HOOKS) && defined(MBEDTLS_PSA_CRYPTO_C) \ - && defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) \ + && !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) \ && defined(MBEDTLS_TEST_MEMORY_CAN_POISON) mbedtls_poison_test_hooks_teardown(); #endif From 0a8abdea8b285b904a6eb3801e192cb1180c0dcb Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Wed, 13 Mar 2024 15:57:46 +0000 Subject: [PATCH 2/4] Update wrapper generation script and regenerate Update the guards generated by the wrapper generation script to use !MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS and regenerate the PSA test wrappers. Signed-off-by: David Horstmann --- tests/scripts/generate_psa_wrappers.py | 4 +- tests/src/psa_test_wrappers.c | 360 ++++++++++++------------- 2 files changed, 182 insertions(+), 182 deletions(-) diff --git a/tests/scripts/generate_psa_wrappers.py b/tests/scripts/generate_psa_wrappers.py index 1a05c7513..07d1450ff 100755 --- a/tests/scripts/generate_psa_wrappers.py +++ b/tests/scripts/generate_psa_wrappers.py @@ -132,10 +132,10 @@ class PSAWrapperGenerator(c_wrapper_generator.Base): """ if not buffer_parameters: return - out.write('#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS)\n') + out.write('#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_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') + out.write('#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */\n') @staticmethod def _parameter_should_be_copied(function_name: str, diff --git a/tests/src/psa_test_wrappers.c b/tests/src/psa_test_wrappers.c index b03043129..809f1cd6f 100644 --- a/tests/src/psa_test_wrappers.c +++ b/tests/src/psa_test_wrappers.c @@ -70,19 +70,19 @@ psa_status_t mbedtls_test_wrap_psa_aead_decrypt( size_t arg9_plaintext_size, size_t *arg10_plaintext_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_nonce, arg3_nonce_length); MBEDTLS_TEST_MEMORY_POISON(arg4_additional_data, arg5_additional_data_length); MBEDTLS_TEST_MEMORY_POISON(arg6_ciphertext, arg7_ciphertext_length); MBEDTLS_TEST_MEMORY_POISON(arg8_plaintext, arg9_plaintext_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_decrypt)(arg0_key, arg1_alg, arg2_nonce, arg3_nonce_length, arg4_additional_data, arg5_additional_data_length, arg6_ciphertext, arg7_ciphertext_length, arg8_plaintext, arg9_plaintext_size, arg10_plaintext_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_nonce, arg3_nonce_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_additional_data, arg5_additional_data_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg6_ciphertext, arg7_ciphertext_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg8_plaintext, arg9_plaintext_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -110,19 +110,19 @@ psa_status_t mbedtls_test_wrap_psa_aead_encrypt( size_t arg9_ciphertext_size, size_t *arg10_ciphertext_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_nonce, arg3_nonce_length); MBEDTLS_TEST_MEMORY_POISON(arg4_additional_data, arg5_additional_data_length); MBEDTLS_TEST_MEMORY_POISON(arg6_plaintext, arg7_plaintext_length); MBEDTLS_TEST_MEMORY_POISON(arg8_ciphertext, arg9_ciphertext_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_encrypt)(arg0_key, arg1_alg, arg2_nonce, arg3_nonce_length, arg4_additional_data, arg5_additional_data_length, arg6_plaintext, arg7_plaintext_length, arg8_ciphertext, arg9_ciphertext_size, arg10_ciphertext_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_nonce, arg3_nonce_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_additional_data, arg5_additional_data_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg6_plaintext, arg7_plaintext_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg8_ciphertext, arg9_ciphertext_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -146,15 +146,15 @@ psa_status_t mbedtls_test_wrap_psa_aead_finish( size_t arg5_tag_size, size_t *arg6_tag_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_ciphertext, arg2_ciphertext_size); MBEDTLS_TEST_MEMORY_POISON(arg4_tag, arg5_tag_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_finish)(arg0_operation, arg1_ciphertext, arg2_ciphertext_size, arg3_ciphertext_length, arg4_tag, arg5_tag_size, arg6_tag_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_ciphertext, arg2_ciphertext_size); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_tag, arg5_tag_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -165,13 +165,13 @@ psa_status_t mbedtls_test_wrap_psa_aead_generate_nonce( size_t arg2_nonce_size, size_t *arg3_nonce_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_nonce, arg2_nonce_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_generate_nonce)(arg0_operation, arg1_nonce, arg2_nonce_size, arg3_nonce_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_nonce, arg2_nonce_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -191,13 +191,13 @@ psa_status_t mbedtls_test_wrap_psa_aead_set_nonce( const uint8_t *arg1_nonce, size_t arg2_nonce_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_nonce, arg2_nonce_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_set_nonce)(arg0_operation, arg1_nonce, arg2_nonce_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_nonce, arg2_nonce_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -210,15 +210,15 @@ psa_status_t mbedtls_test_wrap_psa_aead_update( size_t arg4_output_size, size_t *arg5_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_POISON(arg3_output, arg4_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_update)(arg0_operation, arg1_input, arg2_input_length, arg3_output, arg4_output_size, arg5_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg3_output, arg4_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -228,13 +228,13 @@ psa_status_t mbedtls_test_wrap_psa_aead_update_ad( const uint8_t *arg1_input, size_t arg2_input_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_update_ad)(arg0_operation, arg1_input, arg2_input_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -247,15 +247,15 @@ psa_status_t mbedtls_test_wrap_psa_aead_verify( const uint8_t *arg4_tag, size_t arg5_tag_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_plaintext, arg2_plaintext_size); MBEDTLS_TEST_MEMORY_POISON(arg4_tag, arg5_tag_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_aead_verify)(arg0_operation, arg1_plaintext, arg2_plaintext_size, arg3_plaintext_length, arg4_tag, arg5_tag_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_plaintext, arg2_plaintext_size); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_tag, arg5_tag_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -271,17 +271,17 @@ psa_status_t mbedtls_test_wrap_psa_asymmetric_decrypt( size_t arg7_output_size, size_t *arg8_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_salt, arg5_salt_length); MBEDTLS_TEST_MEMORY_POISON(arg6_output, arg7_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_asymmetric_decrypt)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_salt, arg5_salt_length, arg6_output, arg7_output_size, arg8_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_salt, arg5_salt_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg6_output, arg7_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -297,17 +297,17 @@ psa_status_t mbedtls_test_wrap_psa_asymmetric_encrypt( size_t arg7_output_size, size_t *arg8_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_salt, arg5_salt_length); MBEDTLS_TEST_MEMORY_POISON(arg6_output, arg7_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_asymmetric_encrypt)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_salt, arg5_salt_length, arg6_output, arg7_output_size, arg8_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_salt, arg5_salt_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg6_output, arg7_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -329,15 +329,15 @@ psa_status_t mbedtls_test_wrap_psa_cipher_decrypt( size_t arg5_output_size, size_t *arg6_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_output, arg5_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_cipher_decrypt)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_output, arg5_output_size, arg6_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_output, arg5_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -361,15 +361,15 @@ psa_status_t mbedtls_test_wrap_psa_cipher_encrypt( size_t arg5_output_size, size_t *arg6_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_output, arg5_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_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); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_output, arg5_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -390,13 +390,13 @@ psa_status_t mbedtls_test_wrap_psa_cipher_finish( size_t arg2_output_size, size_t *arg3_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_output, arg2_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_cipher_finish)(arg0_operation, arg1_output, arg2_output_size, arg3_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_output, arg2_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -407,13 +407,13 @@ psa_status_t mbedtls_test_wrap_psa_cipher_generate_iv( size_t arg2_iv_size, size_t *arg3_iv_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_iv, arg2_iv_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_cipher_generate_iv)(arg0_operation, arg1_iv, arg2_iv_size, arg3_iv_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_iv, arg2_iv_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -423,13 +423,13 @@ psa_status_t mbedtls_test_wrap_psa_cipher_set_iv( const uint8_t *arg1_iv, size_t arg2_iv_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_iv, arg2_iv_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_cipher_set_iv)(arg0_operation, arg1_iv, arg2_iv_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_iv, arg2_iv_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -442,15 +442,15 @@ psa_status_t mbedtls_test_wrap_psa_cipher_update( size_t arg4_output_size, size_t *arg5_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_POISON(arg3_output, arg4_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_cipher_update)(arg0_operation, arg1_input, arg2_input_length, arg3_output, arg4_output_size, arg5_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg3_output, arg4_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -555,13 +555,13 @@ psa_status_t mbedtls_test_wrap_psa_export_key( size_t arg2_data_size, size_t *arg3_data_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_data, arg2_data_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_export_key)(arg0_key, arg1_data, arg2_data_size, arg3_data_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_data, arg2_data_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -572,13 +572,13 @@ psa_status_t mbedtls_test_wrap_psa_export_public_key( size_t arg2_data_size, size_t *arg3_data_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_data, arg2_data_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_export_public_key)(arg0_key, arg1_data, arg2_data_size, arg3_data_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_data, arg2_data_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -607,13 +607,13 @@ psa_status_t mbedtls_test_wrap_psa_generate_random( uint8_t *arg0_output, size_t arg1_output_size) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg0_output, arg1_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_generate_random)(arg0_output, arg1_output_size); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg0_output, arg1_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -651,15 +651,15 @@ psa_status_t mbedtls_test_wrap_psa_hash_compare( const uint8_t *arg3_hash, size_t arg4_hash_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_POISON(arg3_hash, arg4_hash_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_hash_compare)(arg0_alg, arg1_input, arg2_input_length, arg3_hash, arg4_hash_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg3_hash, arg4_hash_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -672,15 +672,15 @@ psa_status_t mbedtls_test_wrap_psa_hash_compute( size_t arg4_hash_size, size_t *arg5_hash_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_POISON(arg3_hash, arg4_hash_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_hash_compute)(arg0_alg, arg1_input, arg2_input_length, arg3_hash, arg4_hash_size, arg5_hash_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg3_hash, arg4_hash_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -691,13 +691,13 @@ psa_status_t mbedtls_test_wrap_psa_hash_finish( size_t arg2_hash_size, size_t *arg3_hash_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_hash, arg2_hash_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_hash_finish)(arg0_operation, arg1_hash, arg2_hash_size, arg3_hash_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_hash, arg2_hash_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -716,13 +716,13 @@ psa_status_t mbedtls_test_wrap_psa_hash_update( const uint8_t *arg1_input, size_t arg2_input_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_hash_update)(arg0_operation, arg1_input, arg2_input_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -732,13 +732,13 @@ psa_status_t mbedtls_test_wrap_psa_hash_verify( const uint8_t *arg1_hash, size_t arg2_hash_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_hash, arg2_hash_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_hash_verify)(arg0_operation, arg1_hash, arg2_hash_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_hash, arg2_hash_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -749,13 +749,13 @@ psa_status_t mbedtls_test_wrap_psa_import_key( size_t arg2_data_length, mbedtls_svc_key_id_t *arg3_key) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_data, arg2_data_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_import_key)(arg0_attributes, arg1_data, arg2_data_length, arg3_key); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_data, arg2_data_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -783,13 +783,13 @@ psa_status_t mbedtls_test_wrap_psa_key_derivation_input_bytes( const uint8_t *arg2_data, size_t arg3_data_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_data, arg3_data_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_key_derivation_input_bytes)(arg0_operation, arg1_step, arg2_data, arg3_data_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_data, arg3_data_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -821,13 +821,13 @@ psa_status_t mbedtls_test_wrap_psa_key_derivation_key_agreement( const uint8_t *arg3_peer_key, size_t arg4_peer_key_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg3_peer_key, arg4_peer_key_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_key_derivation_key_agreement)(arg0_operation, arg1_step, arg2_private_key, arg3_peer_key, arg4_peer_key_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg3_peer_key, arg4_peer_key_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -837,13 +837,13 @@ psa_status_t mbedtls_test_wrap_psa_key_derivation_output_bytes( uint8_t *arg1_output, size_t arg2_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_output, arg2_output_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_key_derivation_output_bytes)(arg0_operation, arg1_output, arg2_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_output, arg2_output_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -905,15 +905,15 @@ psa_status_t mbedtls_test_wrap_psa_mac_compute( size_t arg5_mac_size, size_t *arg6_mac_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_mac, arg5_mac_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_mac_compute)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_mac, arg5_mac_size, arg6_mac_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_mac, arg5_mac_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -924,13 +924,13 @@ psa_status_t mbedtls_test_wrap_psa_mac_sign_finish( size_t arg2_mac_size, size_t *arg3_mac_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_mac, arg2_mac_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_mac_sign_finish)(arg0_operation, arg1_mac, arg2_mac_size, arg3_mac_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_mac, arg2_mac_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -950,13 +950,13 @@ psa_status_t mbedtls_test_wrap_psa_mac_update( const uint8_t *arg1_input, size_t arg2_input_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_input, arg2_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_mac_update)(arg0_operation, arg1_input, arg2_input_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_input, arg2_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -969,15 +969,15 @@ psa_status_t mbedtls_test_wrap_psa_mac_verify( const uint8_t *arg4_mac, size_t arg5_mac_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_mac, arg5_mac_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_mac_verify)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_mac, arg5_mac_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_mac, arg5_mac_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -987,13 +987,13 @@ psa_status_t mbedtls_test_wrap_psa_mac_verify_finish( const uint8_t *arg1_mac, size_t arg2_mac_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_mac, arg2_mac_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_mac_verify_finish)(arg0_operation, arg1_mac, arg2_mac_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_mac, arg2_mac_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1031,13 +1031,13 @@ psa_status_t mbedtls_test_wrap_psa_pake_input( const uint8_t *arg2_input, size_t arg3_input_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_pake_input)(arg0_operation, arg1_step, arg2_input, arg3_input_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1049,13 +1049,13 @@ psa_status_t mbedtls_test_wrap_psa_pake_output( size_t arg3_output_size, size_t *arg4_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_output, arg3_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_pake_output)(arg0_operation, arg1_step, arg2_output, arg3_output_size, arg4_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_output, arg3_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1074,13 +1074,13 @@ psa_status_t mbedtls_test_wrap_psa_pake_set_peer( const uint8_t *arg1_peer_id, size_t arg2_peer_id_len) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_peer_id, arg2_peer_id_len); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_pake_set_peer)(arg0_operation, arg1_peer_id, arg2_peer_id_len); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_peer_id, arg2_peer_id_len); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1099,13 +1099,13 @@ psa_status_t mbedtls_test_wrap_psa_pake_set_user( const uint8_t *arg1_user_id, size_t arg2_user_id_len) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_user_id, arg2_user_id_len); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_pake_set_user)(arg0_operation, arg1_user_id, arg2_user_id_len); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_user_id, arg2_user_id_len); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1136,15 +1136,15 @@ psa_status_t mbedtls_test_wrap_psa_raw_key_agreement( size_t arg5_output_size, size_t *arg6_output_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_peer_key, arg3_peer_key_length); MBEDTLS_TEST_MEMORY_POISON(arg4_output, arg5_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_raw_key_agreement)(arg0_alg, arg1_private_key, arg2_peer_key, arg3_peer_key_length, arg4_output, arg5_output_size, arg6_output_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_peer_key, arg3_peer_key_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_output, arg5_output_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1158,15 +1158,15 @@ psa_status_t mbedtls_test_wrap_psa_sign_hash( size_t arg5_signature_size, size_t *arg6_signature_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_hash, arg3_hash_length); MBEDTLS_TEST_MEMORY_POISON(arg4_signature, arg5_signature_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_sign_hash)(arg0_key, arg1_alg, arg2_hash, arg3_hash_length, arg4_signature, arg5_signature_size, arg6_signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_hash, arg3_hash_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_signature, arg5_signature_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1185,13 +1185,13 @@ psa_status_t mbedtls_test_wrap_psa_sign_hash_complete( size_t arg2_signature_size, size_t *arg3_signature_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg1_signature, arg2_signature_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_sign_hash_complete)(arg0_operation, arg1_signature, arg2_signature_size, arg3_signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg1_signature, arg2_signature_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1203,13 +1203,13 @@ psa_status_t mbedtls_test_wrap_psa_sign_hash_start( const uint8_t *arg3_hash, size_t arg4_hash_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg3_hash, arg4_hash_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_sign_hash_start)(arg0_operation, arg1_key, arg2_alg, arg3_hash, arg4_hash_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg3_hash, arg4_hash_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1223,15 +1223,15 @@ psa_status_t mbedtls_test_wrap_psa_sign_message( size_t arg5_signature_size, size_t *arg6_signature_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_signature, arg5_signature_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_sign_message)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_signature, arg5_signature_size, arg6_signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_signature, arg5_signature_size); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1244,15 +1244,15 @@ psa_status_t mbedtls_test_wrap_psa_verify_hash( const uint8_t *arg4_signature, size_t arg5_signature_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_hash, arg3_hash_length); MBEDTLS_TEST_MEMORY_POISON(arg4_signature, arg5_signature_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_verify_hash)(arg0_key, arg1_alg, arg2_hash, arg3_hash_length, arg4_signature, arg5_signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_hash, arg3_hash_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_signature, arg5_signature_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1282,15 +1282,15 @@ psa_status_t mbedtls_test_wrap_psa_verify_hash_start( const uint8_t *arg5_signature, size_t arg6_signature_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg3_hash, arg4_hash_length); MBEDTLS_TEST_MEMORY_POISON(arg5_signature, arg6_signature_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_verify_hash_start)(arg0_operation, arg1_key, arg2_alg, arg3_hash, arg4_hash_length, arg5_signature, arg6_signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg3_hash, arg4_hash_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg5_signature, arg6_signature_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } @@ -1303,15 +1303,15 @@ psa_status_t mbedtls_test_wrap_psa_verify_message( const uint8_t *arg4_signature, size_t arg5_signature_length) { -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_POISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_POISON(arg4_signature, arg5_signature_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ psa_status_t status = (psa_verify_message)(arg0_key, arg1_alg, arg2_input, arg3_input_length, arg4_signature, arg5_signature_length); -#if defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) +#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) MBEDTLS_TEST_MEMORY_UNPOISON(arg2_input, arg3_input_length); MBEDTLS_TEST_MEMORY_UNPOISON(arg4_signature, arg5_signature_length); -#endif /* defined(MBEDTLS_PSA_COPY_CALLER_BUFFERS) */ +#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */ return status; } From 5a71e76e65d25e7a29100b15caffb647e9dd6b64 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 14 Mar 2024 09:24:38 +0000 Subject: [PATCH 3/4] Remove MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS from full This option removes a feature (buffer protection) so should not be in the full config. Signed-off-by: David Horstmann --- scripts/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/config.py b/scripts/config.py index ab0e5ea6e..303505263 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -210,6 +210,7 @@ EXCLUDE_FROM_FULL = frozenset([ 'MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN', # build dependency (clang+memsan) 'MBEDTLS_TEST_CONSTANT_FLOW_VALGRIND', # build dependency (valgrind headers) 'MBEDTLS_X509_REMOVE_INFO', # removes a feature + 'MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS', # removes a feature ]) def is_seamless_alt(name): From 6f8c95ba1dcbf752c478e5dd44e2ad5887ed76a4 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 14 Mar 2024 14:52:45 +0000 Subject: [PATCH 4/4] Preserve alphabetical sorting of config options In the list that is excluded from the full config. Signed-off-by: David Horstmann --- scripts/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.py b/scripts/config.py index 303505263..c53f9e7fe 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -198,6 +198,7 @@ EXCLUDE_FROM_FULL = frozenset([ 'MBEDTLS_NO_UDBL_DIVISION', # influences anything that uses bignum 'MBEDTLS_PSA_P256M_DRIVER_ENABLED', # influences SECP256R1 KeyGen/ECDH/ECDSA 'MBEDTLS_PLATFORM_NO_STD_FUNCTIONS', # removes a feature + 'MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS', # removes a feature 'MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG', # behavior change + build dependency 'MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER', # incompatible with USE_PSA_CRYPTO 'MBEDTLS_PSA_CRYPTO_SPM', # platform dependency (PSA SPM) @@ -210,7 +211,6 @@ EXCLUDE_FROM_FULL = frozenset([ 'MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN', # build dependency (clang+memsan) 'MBEDTLS_TEST_CONSTANT_FLOW_VALGRIND', # build dependency (valgrind headers) 'MBEDTLS_X509_REMOVE_INFO', # removes a feature - 'MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS', # removes a feature ]) def is_seamless_alt(name):