From 0249164939b6bed24772d0e8214be4c3b239b845 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 11 Sep 2024 09:40:56 +0200 Subject: [PATCH] Improve Mbed TLS 3.6 working tree detection Signed-off-by: Ronald Cron --- scripts/mbedtls_framework/build_tree.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/mbedtls_framework/build_tree.py b/scripts/mbedtls_framework/build_tree.py index 8a72a06b4..75f9b6b0b 100644 --- a/scripts/mbedtls_framework/build_tree.py +++ b/scripts/mbedtls_framework/build_tree.py @@ -130,12 +130,15 @@ def guess_tf_psa_crypto_root(root: Optional[str] = None) -> str: else: raise Exception('TF-PSA-Crypto source tree not found') -def is_mbedtls_3_6_branch(root: Optional[str] = None) -> bool: - """Whether root is the root directory of the Mbed TLS 3.6 branch """ - if root is None: - root = os.getcwd() +def is_mbedtls_3_6() -> bool: + """Whether the working tree is an Mbed TLS 3.6 one or not + + Return false in we are in TF-PSA-Crypto or in Mbed TLS but with a version + different from 3.6.x. + Raise an exception if we are neither in Mbed TLS nor in TF-PSA-Crypto. + """ + root = guess_project_root() if not looks_like_mbedtls_root(root): return False with open(os.path.join(root, 'include', 'mbedtls', 'build_info.h'), 'r') as f: - pattern = re.compile("#define MBEDTLS_VERSION_NUMBER.*0x0306") - return pattern.search(f.read()) is not None + return re.search(r"#define MBEDTLS_VERSION_NUMBER.*0x0306", f.read()) is not None