yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generate_psa_tests.py: add key generation result to test case argument list, add comments

Browse source 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel 2021-11-02 10:50:44 +01:00
parent ba20fc98b8
commit 7bc26b8c2a
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/mbedtls_dev/test_case.py
View file

@ -42,7 +42,6 @@ class TestCase:
self.dependencies = [] #type: List[str] self.dependencies = [] #type: List[str]
self.function = None #type: Optional[str] self.function = None #type: Optional[str]
self.arguments = [] #type: List[str] self.arguments = [] #type: List[str]
self.result = '' #type: str
def add_comment(self, *lines: str) -> None: def add_comment(self, *lines: str) -> None:
self.comments += lines self.comments += lines
@ -59,9 +58,6 @@ class TestCase:
def set_arguments(self, arguments: List[str]) -> None: def set_arguments(self, arguments: List[str]) -> None:
self.arguments = arguments self.arguments = arguments
def set_result(self, result: str) -> None:
self.result = result
def check_completeness(self) -> None: def check_completeness(self) -> None:
if self.description is None: if self.description is None:
raise MissingDescription raise MissingDescription
@ -86,10 +82,6 @@ class TestCase:
if self.dependencies: if self.dependencies:
out.write('depends_on:' + ':'.join(self.dependencies) + '\n') out.write('depends_on:' + ':'.join(self.dependencies) + '\n')
out.write(self.function + ':' + ':'.join(self.arguments)) out.write(self.function + ':' + ':'.join(self.arguments))
if self.result:
out.write(':' + self.result + '\n')
else:
out.write('\n')
def write_data_file(filename: str, def write_data_file(filename: str,
test_cases: Iterable[TestCase], test_cases: Iterable[TestCase],

16
tests/scripts/generate_psa_tests.py
View file

@ -203,7 +203,8 @@ class NotSupported:
# supported or not depending on implementation capabilities, # supported or not depending on implementation capabilities,
# only generate the test case once. # only generate the test case once.
continue continue
# Public key cannot be generated # For public key we expect that key generation fails with
# INVALID_ARGUMENT. It is handled by KeyGenerate class.
if not kt.name.endswith('_PUBLIC_KEY'): if not kt.name.endswith('_PUBLIC_KEY'):
yield test_case_for_key_type_not_supported( yield test_case_for_key_type_not_supported(
'generate', kt.expression, bits, 'generate', kt.expression, bits,
@ -246,8 +247,7 @@ def test_case_for_key_generation(
.format(short_key_type, bits)) .format(short_key_type, bits))
tc.set_dependencies(dependencies) tc.set_dependencies(dependencies)
tc.set_function('generate_key') tc.set_function('generate_key')
tc.set_arguments([key_type] + list(args)) tc.set_arguments([key_type] + list(args) + [result])
tc.set_result(result)
return tc return tc
@ -260,11 +260,8 @@ class KeyGenerate:
ECC_KEY_TYPES = ('PSA_KEY_TYPE_ECC_KEY_PAIR', ECC_KEY_TYPES = ('PSA_KEY_TYPE_ECC_KEY_PAIR',
'PSA_KEY_TYPE_ECC_PUBLIC_KEY') 'PSA_KEY_TYPE_ECC_PUBLIC_KEY')
RSA_KEY_TYPES = ('PSA_KEY_TYPE_RSA_KEY_PAIR', @staticmethod
'PSA_KEY_TYPE_RSA_PUBLIC_KEY')
def test_cases_for_key_type_key_generation( def test_cases_for_key_type_key_generation(
self,
kt: crypto_knowledge.KeyType kt: crypto_knowledge.KeyType
) -> Iterator[test_case.TestCase]: ) -> Iterator[test_case.TestCase]:
"""Return test cases exercising key generation. """Return test cases exercising key generation.
@ -279,11 +276,14 @@ class KeyGenerate:
import_dependencies += [psa_want_symbol(sym) import_dependencies += [psa_want_symbol(sym)
for i, sym in enumerate(kt.params)] for i, sym in enumerate(kt.params)]
if kt.name.endswith('_PUBLIC_KEY'): if kt.name.endswith('_PUBLIC_KEY'):
# The library checks whether the key type is a public key generically,
# before it reaches a point where it needs support for the specific key
# type, so it returns INVALID_ARGUMENT for unsupported public key types.
generate_dependencies = [] generate_dependencies = []
result = 'PSA_ERROR_INVALID_ARGUMENT' result = 'PSA_ERROR_INVALID_ARGUMENT'
else: else:
generate_dependencies = import_dependencies generate_dependencies = import_dependencies
if kt.name in self.RSA_KEY_TYPES: if kt.name == 'PSA_KEY_TYPE_RSA_KEY_PAIR':
generate_dependencies.append("MBEDTLS_GENPRIME") generate_dependencies.append("MBEDTLS_GENPRIME")
for bits in kt.sizes_to_test(): for bits in kt.sizes_to_test():
yield test_case_for_key_generation( yield test_case_for_key_generation(