lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-10 05:03:02 +03:00
Code Activity

Merge pull request #6963 from davidhorstmann-arm/2.28-fix-check-python-errors

Browse Source 
[Backport 2.28] Fix check python errors
This commit is contained in:
Gilles Peskine
2023-01-26 21:54:30 +01:00
committed by GitHub
parent c2738f22b3 659d905cf9
commit 0f16ce0116
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mbedtls_dev/crypto_knowledge.py
View File

@@ -20,7 +20,7 @@ This module is entirely based on the PSA API.
import enum import enum
import re import re
from typing import FrozenSet, Iterable, List, Optional, Tuple from typing import FrozenSet, Iterable, List, Optional, Tuple, Dict
from .asymmetric_key_data import ASYMMETRIC_KEY_DATA from .asymmetric_key_data import ASYMMETRIC_KEY_DATA
@@ -148,7 +148,7 @@ class KeyType:
'PSA_ECC_FAMILY_BRAINPOOL_P_R1': (160, 192, 224, 256, 320, 384, 512), 'PSA_ECC_FAMILY_BRAINPOOL_P_R1': (160, 192, 224, 256, 320, 384, 512),
'PSA_ECC_FAMILY_MONTGOMERY': (255, 448), 'PSA_ECC_FAMILY_MONTGOMERY': (255, 448),
'PSA_ECC_FAMILY_TWISTED_EDWARDS': (255, 448), 'PSA_ECC_FAMILY_TWISTED_EDWARDS': (255, 448),
} } # type: Dict[str, Tuple[int, ...]]
KEY_TYPE_SIZES = { KEY_TYPE_SIZES = {
'PSA_KEY_TYPE_AES': (128, 192, 256), # exhaustive 'PSA_KEY_TYPE_AES': (128, 192, 256), # exhaustive
'PSA_KEY_TYPE_ARC4': (8, 128, 2048), # extremes + sensible 'PSA_KEY_TYPE_ARC4': (8, 128, 2048), # extremes + sensible
@@ -160,7 +160,7 @@ class KeyType:
'PSA_KEY_TYPE_HMAC': (128, 160, 224, 256, 384, 512), # standard size for each supported hash 'PSA_KEY_TYPE_HMAC': (128, 160, 224, 256, 384, 512), # standard size for each supported hash
'PSA_KEY_TYPE_RAW_DATA': (8, 40, 128), # sample 'PSA_KEY_TYPE_RAW_DATA': (8, 40, 128), # sample
'PSA_KEY_TYPE_RSA_KEY_PAIR': (1024, 1536), # small sample 'PSA_KEY_TYPE_RSA_KEY_PAIR': (1024, 1536), # small sample
} } # type: Dict[str, Tuple[int, ...]]
def sizes_to_test(self) -> Tuple[int, ...]: def sizes_to_test(self) -> Tuple[int, ...]:
"""Return a tuple of key sizes to test. """Return a tuple of key sizes to test.

2
tests/scripts/generate_psa_tests.py
View File

@@ -354,7 +354,7 @@ class OpFail:
dependencies[i] = '!' + dep dependencies[i] = '!' + dep
tc.set_dependencies(dependencies) tc.set_dependencies(dependencies)
tc.set_function(category.name.lower() + '_fail') tc.set_function(category.name.lower() + '_fail')
arguments = [] arguments = [] # type: List[str]
if kt: if kt:
key_material = kt.key_material(kt.sizes_to_test()[0]) key_material = kt.key_material(kt.sizes_to_test()[0])
arguments += [key_type, test_case.hex_string(key_material)] arguments += [key_type, test_case.hex_string(key_material)]