Modify check generated files script to work with TF PSA Crypto too

scripts/generate_driver_wrappers.py

@@ -178,10 +178,10 @@ def main() -> int:
 
     project_root = os.path.abspath(args.project_root)
 
-    library_dir = build_tree.crypto_core_directory(project_root)
+    crypto_core_directory = build_tree.crypto_core_directory(project_root)
 
     output_directory = args.output_directory if args.output_directory is not None else \
-        os.path.join(project_root, library_dir)
+        os.path.join(project_root, crypto_core_directory)
 
     template_directory = args.template_dir if args.template_dir is not None else \
         os.path.join(project_root,

scripts/generate_ssl_debug_helpers.py

@@ -367,7 +367,7 @@ def generate_ssl_debug_helpers(output_directory, mbedtls_root):
         Generate functions of debug helps
     """
     mbedtls_root = os.path.abspath(
-        mbedtls_root or build_tree.guess_project_root())
+        mbedtls_root or build_tree.guess_mbedtls_root())
     with open(os.path.join(mbedtls_root, 'include/mbedtls/ssl.h')) as f:
         source_code = remove_c_comments(f.read())
 

scripts/mbedtls_dev/build_tree.py

@@ -22,17 +22,29 @@ def looks_like_mbedtls_root(path: str) -> bool:
 def looks_like_root(path: str) -> bool:
     return looks_like_tf_psa_crypto_root(path) or looks_like_mbedtls_root(path)
 
-def crypto_core_directory(root: Optional[str] = None) -> str:
+def crypto_core_directory(root: Optional[str] = None, relative: Optional[bool] = False) -> str:
+    """
+    Return the path of the directory containing the PSA crypto core
+    for either TF-PSA-Crypto or Mbed TLS.
+
+    Returns either the full path or relative path depending on the
+    "relative" boolean argument.
+    """
     if root is None:
         root = guess_project_root()
     if looks_like_tf_psa_crypto_root(root):
-        return "core"
+        if relative:
+            return "core"
+        return os.path.join(root, "core")
     elif looks_like_mbedtls_root(root):
-        return "library"
+        if relative:
+            return "library"
+        return os.path.join(root, "library")
     else:
         raise Exception('Neither Mbed TLS nor TF-PSA-Crypto source tree found')
 
-def project_crypto_name(root: Optional[str] = None) -> str:
+def crypto_library_filename(root: Optional[str] = None) -> str:
+    """Return the crypto library filename for either TF-PSA-Crypto or Mbed TLS."""
     if root is None:
         root = guess_project_root()
     if looks_like_tf_psa_crypto_root(root):
@@ -43,8 +55,7 @@ def project_crypto_name(root: Optional[str] = None) -> str:
         raise Exception('Neither Mbed TLS nor TF-PSA-Crypto source tree found')
 
 def check_repo_path():
-    """
-    Check that the current working directory is the project root, and throw
+    """Check that the current working directory is the project root, and throw
     an exception if not.
     """
     if not all(os.path.isdir(d) for d in ["include", "library", "tests"]):
@@ -64,7 +75,6 @@ def chdir_to_root() -> None:
             return
     raise Exception('Mbed TLS source tree not found')
 
-
 def guess_project_root():
     """Guess project source code directory.
 
@@ -82,3 +92,29 @@ def guess_project_root():
             if looks_like_root(d):
                 return d
     raise Exception('Neither Mbed TLS nor TF-PSA-Crypto source tree found')
+
+def guess_mbedtls_root(root: Optional[str] = None) -> str:
+    """Guess Mbed TLS source code directory.
+
+    Return the first possible Mbed TLS root directory.
+    Raise an exception if we are not in Mbed TLS.
+    """
+    if root is None:
+        root = guess_project_root()
+    if looks_like_mbedtls_root(root):
+        return root
+    else:
+        raise Exception('Mbed TLS source tree not found')
+
+def guess_tf_psa_crypto_root(root: Optional[str] = None) -> str:
+    """Guess TF-PSA-Crypto source code directory.
+
+    Return the first possible TF-PSA-Crypto root directory.
+    Raise an exception if we are not in TF-PSA-Crypto.
+    """
+    if root is None:
+        root = guess_project_root()
+    if looks_like_tf_psa_crypto_root(root):
+        return root
+    else:
+        raise Exception('TF-PSA-Crypto source tree not found')

tests/scripts/audit-validity-dates.py

@@ -265,7 +265,7 @@ def walk_all(self,
     @staticmethod
     def find_test_dir():
         """Get the relative path for the Mbed TLS test directory."""
-        return os.path.relpath(build_tree.guess_project_root() + '/tests')
+        return os.path.relpath(build_tree.guess_mbedtls_root() + '/tests')
 
 
 class TestDataAuditor(Auditor):

tests/scripts/test_psa_compliance.py

@@ -50,9 +50,8 @@ def main(library_build_dir: str):
 
     in_tf_psa_crypto_repo = build_tree.looks_like_tf_psa_crypto_root(root_dir)
 
-    crypto_name = build_tree.project_crypto_name()
-
-    library_subdir = build_tree.crypto_core_directory()
+    crypto_name = build_tree.crypto_library_filename(root_dir)
+    library_subdir = build_tree.crypto_core_directory(root_dir, relative=True)
 
     crypto_lib_filename = (library_build_dir + '/' +
                            library_subdir + '/' +