1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00

Update paths pointing to tests/data_files

These now point to framework/data_files instead.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann
2024-06-11 17:44:00 +01:00
parent b744dd3a2d
commit dcf18dd876
30 changed files with 3193 additions and 3192 deletions

View File

@ -8,7 +8,7 @@
This script is used to audit the validity date of crt/crl/csr used for testing.
It prints the information about X.509 objects excluding the objects that
are valid throughout the desired validity period. The data are collected
from tests/data_files/ and tests/suites/*.data files by default.
from framework/data_files/ and tests/suites/*.data files by default.
"""
import os
@ -269,12 +269,13 @@ class Auditor:
class TestDataAuditor(Auditor):
"""Class for auditing files in `tests/data_files/`"""
"""Class for auditing files in `framework/data_files/`"""
def collect_default_files(self):
"""Collect all files in `tests/data_files/`"""
"""Collect all files in `framework/data_files/`"""
test_dir = self.find_test_dir()
test_data_glob = os.path.join(test_dir, 'data_files/**')
test_data_glob = os.path.join(test_dir, os.path.pardir, 'framework',
'data_files/**')
data_files = [f for f in glob.glob(test_data_glob, recursive=True)
if os.path.isfile(f)]
return data_files

View File

@ -107,12 +107,12 @@ BINARY_FILE_PATH_RE_LIST = [
r'docs/.*\.pdf\Z',
r'docs/.*\.png\Z',
r'programs/fuzz/corpuses/[^.]+\Z',
r'tests/data_files/[^.]+\Z',
r'tests/data_files/.*\.(crt|csr|db|der|key|pubkey)\Z',
r'tests/data_files/.*\.req\.[^/]+\Z',
r'tests/data_files/.*malformed[^/]+\Z',
r'tests/data_files/format_pkcs12\.fmt\Z',
r'tests/data_files/.*\.bin\Z',
r'framework/data_files/[^.]+\Z',
r'framework/data_files/.*\.(crt|csr|db|der|key|pubkey)\Z',
r'framework/data_files/.*\.req\.[^/]+\Z',
r'framework/data_files/.*malformed[^/]+\Z',
r'framework/data_files/format_pkcs12\.fmt\Z',
r'framework/data_files/.*\.bin\Z',
]
BINARY_FILE_PATH_RE = re.compile('|'.join(BINARY_FILE_PATH_RE_LIST))

View File

@ -20,17 +20,17 @@ from collections import namedtuple
Certificate = namedtuple("Certificate", ['cafile', 'certfile', 'keyfile'])
# define the certificate parameters for signature algorithms
CERTIFICATES = {
'ecdsa_secp256r1_sha256': Certificate('data_files/test-ca2.crt',
'data_files/ecdsa_secp256r1.crt',
'data_files/ecdsa_secp256r1.key'),
'ecdsa_secp384r1_sha384': Certificate('data_files/test-ca2.crt',
'data_files/ecdsa_secp384r1.crt',
'data_files/ecdsa_secp384r1.key'),
'ecdsa_secp521r1_sha512': Certificate('data_files/test-ca2.crt',
'data_files/ecdsa_secp521r1.crt',
'data_files/ecdsa_secp521r1.key'),
'rsa_pss_rsae_sha256': Certificate('data_files/test-ca_cat12.crt',
'data_files/server2-sha256.crt', 'data_files/server2.key'
'ecdsa_secp256r1_sha256': Certificate('../framework/data_files/test-ca2.crt',
'../framework/data_files/ecdsa_secp256r1.crt',
'../framework/data_files/ecdsa_secp256r1.key'),
'ecdsa_secp384r1_sha384': Certificate('../framework/data_files/test-ca2.crt',
'../framework/data_files/ecdsa_secp384r1.crt',
'../framework/data_files/ecdsa_secp384r1.key'),
'ecdsa_secp521r1_sha512': Certificate('../framework/data_files/test-ca2.crt',
'../framework/data_files/ecdsa_secp521r1.crt',
'../framework/data_files/ecdsa_secp521r1.key'),
'rsa_pss_rsae_sha256': Certificate('../framework/data_files/test-ca_cat12.crt',
'../framework/data_files/server2-sha256.crt', '../framework/data_files/server2.key'
)
}