Skip to content

Commit 2f54bcd

Browse files
Merge pull request Mbed-TLS#29 from davidhorstmann-arm/add-remaining-crypto-modules
Add remaining crypto modules to PSA repo
2 parents 3accf84 + 857f71c commit 2f54bcd

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

scripts/psa_crypto.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def copy_of_mbedtls_headers(mbedtls_root_path, psa_crypto_root_path):
3838
destination_path = os.path.join(builtin_path, "include", "mbedtls")
3939

4040
include_files = filter(lambda file_: not re.match(
41-
"x509.*|mps.*|ssl.*|base64\.*|nist_kw\.*|pem\.*|padlock\.*|pkcs.*|"\
41+
"x509.*|mps.*|ssl.*|padlock\.*|pkcs7.*|"\
4242
"\.gitignore|debug\.h|net_sockets\.h"\
4343
"", file_),
4444
os.listdir(source_path))
@@ -53,7 +53,7 @@ def copy_of_mbedtls_headers(mbedtls_root_path, psa_crypto_root_path):
5353
def copy_from_library(mbedtls_root_path, psa_crypto_root_path):
5454
builtin_path = os.path.join(psa_crypto_root_path, "drivers", "builtin")
5555
library_files = filter(lambda file_: not re.match(
56-
".*\.o|x509.*|mps.*|ssl.*|base64\.*|nist_kw\.*|pem\.*|padlock\.*|pkcs.*|"\
56+
".*\.o|x509.*|mps.*|ssl.*|padlock\.*|pkcs7.*|"\
5757
"\.gitignore|Makefile|CMakeLists\.txt|"\
5858
"debug\.c|error\.c|net_sockets\.c"\
5959
"psa_crypto_core_common\.h", file_),
@@ -125,7 +125,13 @@ def copy_from_tests(mbedtls_root_path, psa_crypto_root_path):
125125

126126
tests_suites_files = filter(lambda file_: re.match(
127127
"test_suite_psa_crypto.*|helpers\.function|"\
128-
"host_test\.function|main_test\.function", file_),
128+
"host_test\.function|main_test\.function|"\
129+
"test_suite_base64.*|"\
130+
"test_suite_pem.*|"\
131+
"test_suite_pkcs5.*|"\
132+
"test_suite_pkcs12.*|"\
133+
"test_suite_nist_kw.*", \
134+
file_),
129135
os.listdir(os.path.join(source_path, "suites")))
130136
for file_ in tests_suites_files:
131137
shutil.copy2(os.path.join(source_path, "suites", file_),

0 commit comments

Comments
 (0)