From 80de1475a1eb935822a9377ef8f73583ac6aee26 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Wed, 28 Feb 2024 15:16:44 +0000 Subject: [PATCH] Fix incorrect conflict resolution A return statement was missing in the wrapper generation script. Signed-off-by: David Horstmann --- tests/scripts/generate_psa_wrappers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/generate_psa_wrappers.py b/tests/scripts/generate_psa_wrappers.py index 0aaa7104e4..db7a559518 100755 --- a/tests/scripts/generate_psa_wrappers.py +++ b/tests/scripts/generate_psa_wrappers.py @@ -171,7 +171,7 @@ class PSAWrapperGenerator(c_wrapper_generator.Base): 'psa_hash_verify', 'psa_hash_compute', 'psa_hash_compare'): - + return True if function_name == 'psa_generate_random': return True return False