From 010c1f1ae0fb110c58cce5642d3c8b766ffacf64 Mon Sep 17 00:00:00 2001 From: Elena Uziunaite Date: Wed, 25 Sep 2024 14:51:35 +0100 Subject: [PATCH] Adapt changes to work with both 3.6 and 4.0 Signed-off-by: Elena Uziunaite --- scripts/generate_config_tests.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/generate_config_tests.py b/scripts/generate_config_tests.py index f3a529054..5eded853c 100755 --- a/scripts/generate_config_tests.py +++ b/scripts/generate_config_tests.py @@ -14,6 +14,7 @@ import config from mbedtls_framework import config_common from mbedtls_framework import test_case from mbedtls_framework import test_data_generation +from mbedtls_framework import build_tree def single_setting_case(setting: config_common.Setting, when_on: bool, @@ -87,7 +88,14 @@ def dependencies_of_setting(cfg: config_common.Config, if name.startswith('MBEDTLS_CIPHER_PADDING_'): return 'MBEDTLS_CIPHER_C:MBEDTLS_CIPHER_MODE_CBC' if name.startswith('MBEDTLS_PK_PARSE_EC_'): - return 'MBEDTLS_PK_C:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY' + + #temporary solution to determine correct dependency macros between 3.6 and 4.0 + #see issue #51 in mbedtls-framework + if build_tree.is_mbedtls_3_6(): + return 'MBEDTLS_PK_C:MBEDTLS_PK_HAVE_ECC_KEYS' + else: + return 'MBEDTLS_PK_C:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY' + # For TLS settings, insist on having them once off and once on in # a configuration where both client support and server support are # enabled. The settings are also meaningful when only one side is