mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-25 09:02:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use crypto_knowledge to determine the cipher key types

Browse Source 
Replace the old implementation which uses `cipher.h` to gather
information.

Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei 2024-11-04 17:30:32 +01:00
parent 03cc5921be
commit fb6b0dbbfd
No known key found for this signature in database
GPG Key ID: 6310BD29B0BFF98C
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/scripts/depends.py
View File

@ -457,20 +457,6 @@ Both parent class __init__ calls are performed in any order and
each call adds respective jobs. The job array initialization is done once in each call adds respective jobs. The job array initialization is done once in
BaseDomain, before the parent __init__ calls.""" BaseDomain, before the parent __init__ calls."""
class CipherInfo: # pylint: disable=too-few-public-methods
"""Collect data about cipher.h."""
def __init__(self):
self.base_symbols = set()
if os.path.isdir('tf-psa-crypto'):
cipher_h_path = 'tf-psa-crypto/drivers/builtin/include/mbedtls/cipher.h'
else:
cipher_h_path = 'include/mbedtls/cipher.h'
with open(cipher_h_path, encoding="utf-8") as fh:
for line in fh:
m = re.match(r' *MBEDTLS_CIPHER_ID_(\w+),', line)
if m and m.group(1) not in ['NONE', 'NULL', '3DES']:
self.base_symbols.add('PSA_WANT_KEY_TYPE_' + m.group(1))
class DomainData: class DomainData:
"""A container for domains and jobs, used to structurize testing.""" """A container for domains and jobs, used to structurize testing."""
def config_symbols_matching(self, regexp): def config_symbols_matching(self, regexp):
@ -504,17 +490,17 @@ class DomainData:
# Find key exchange enabling macros by name. # Find key exchange enabling macros by name.
key_exchange_symbols = self.config_symbols_matching(r'MBEDTLS_KEY_EXCHANGE_\w+_ENABLED\Z') key_exchange_symbols = self.config_symbols_matching(r'MBEDTLS_KEY_EXCHANGE_\w+_ENABLED\Z')
# Find cipher IDs (block permutations and stream ciphers --- chaining # Find cipher key types
# and padding modes are exercised separately) information by parsing cipher_key_types = {symbol
# cipher.h, as the information is not readily available in mbedtls_config.h. for key_type, symbol in key_types.items()
cipher_info = CipherInfo() for alg in cipher_algs
if key_type.can_do(alg)}
# Find block cipher chaining and padding mode enabling macros by name. # Find block cipher chaining and padding mode enabling macros by name.
cipher_chaining_symbols = self.config_symbols_matching(r'MBEDTLS_CIPHER_MODE_\w+\Z') cipher_chaining_symbols = self.config_symbols_matching(r'MBEDTLS_CIPHER_MODE_\w+\Z')
cipher_padding_symbols = self.config_symbols_matching(r'MBEDTLS_CIPHER_PADDING_\w+\Z') cipher_padding_symbols = self.config_symbols_matching(r'MBEDTLS_CIPHER_PADDING_\w+\Z')
self.domains = { self.domains = {
# Cipher IDs, chaining modes and padding modes. Run the test suites. # Cipher key types
'cipher_id': ExclusiveDomain(cipher_info.base_symbols, 'cipher_id': ExclusiveDomain(cipher_key_types, build_and_test),
build_and_test),
'cipher_chaining': ExclusiveDomain(cipher_chaining_symbols, 'cipher_chaining': ExclusiveDomain(cipher_chaining_symbols,
build_and_test), build_and_test),
'cipher_padding': ExclusiveDomain(cipher_padding_symbols, 'cipher_padding': ExclusiveDomain(cipher_padding_symbols,