mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-25 13:43:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

In PSA generated tests, don't ignore not-implemented in some negative tests

Browse Source 
Some negative tests involving unsupported mechanisms are executed, because
they're testing what happens if the mechanism is unsupported. Refine the
ignore list for `test_suite_psa_crypto_generate_key.generated` and
`test_suite_psa_crypto_op_fail.generated` accordingly.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2024-09-17 17:15:29 +02:00
parent d8da2fcc7a
commit 72396da267
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/scripts/analyze_outcomes.py
View File

@ -19,12 +19,21 @@ class CoverageTask(outcome_analysis.CoverageTask):
outcome_analysis.FULL_COVERAGE_BY_DEFAULT = False outcome_analysis.FULL_COVERAGE_BY_DEFAULT = False
@staticmethod @staticmethod
def _has_word_re(words: typing.Iterable[str]) -> typing.Pattern: def _has_word_re(words: typing.Iterable[str],
exclude: typing.Optional[str] = None) -> typing.Pattern:
"""Construct a regex that matches if any of the words appears. """Construct a regex that matches if any of the words appears.
The occurrence must start and end at a word boundary. The occurrence must start and end at a word boundary.
If exclude is specified, strings containing a match for that
regular expression will not match the returned pattern.
""" """
return re.compile(r'.*\b(?:' + r'|'.join(words) + r')\b.*') exclude_clause = r''
if exclude:
exclude_clause = r'(?!.*' + exclude + ')'
return re.compile(exclude_clause +
r'.*\b(?:' + r'|'.join(words) + r')\b.*',
re.S)
# generate_psa_tests.py generates test cases involving cryptographic # generate_psa_tests.py generates test cases involving cryptographic
# mechanisms (key types, families, algorithms) that are declared but # mechanisms (key types, families, algorithms) that are declared but
@ -63,13 +72,25 @@ class CoverageTask(outcome_analysis.CoverageTask):
IGNORED_TESTS = { IGNORED_TESTS = {
'test_suite_psa_crypto_generate_key.generated': [ 'test_suite_psa_crypto_generate_key.generated': [
PSA_MECHANISM_NOT_IMPLEMENTED_SEARCH_RE, # Ignore mechanisms that are not implemented, except
# for public keys for which we always test that
# psa_generate_key() returns PSA_ERROR_INVALID_ARGUMENT
# regardless of whether the specific key type is supported.
_has_word_re((mech
for mech in _PSA_MECHANISMS_NOT_IMPLEMENTED
if not mech.startswith('ECC_PUB')),
exclude=r'ECC_PUB'),
], ],
'test_suite_psa_crypto_not_supported.generated': [ 'test_suite_psa_crypto_not_supported.generated': [
PSA_MECHANISM_NOT_IMPLEMENTED_SEARCH_RE, PSA_MECHANISM_NOT_IMPLEMENTED_SEARCH_RE,
], ],
'test_suite_psa_crypto_op_fail.generated': [ 'test_suite_psa_crypto_op_fail.generated': [
PSA_MECHANISM_NOT_IMPLEMENTED_SEARCH_RE, # Ignore mechanisms that are not implemented, except
# for test cases that assume the mechanism is not supported.
_has_word_re(_PSA_MECHANISMS_NOT_IMPLEMENTED,
exclude=(r'.*: !(?:' +
r'|'.join(_PSA_MECHANISMS_NOT_IMPLEMENTED) +
r')\b')),
], ],
'test_suite_psa_crypto_storage_format.current': [ 'test_suite_psa_crypto_storage_format.current': [
PSA_MECHANISM_NOT_IMPLEMENTED_SEARCH_RE, PSA_MECHANISM_NOT_IMPLEMENTED_SEARCH_RE,