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

Remove some settings that don't exist in 2.28

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2024-06-26 20:11:59 +02:00
parent 744741bf2c
commit cfba2477e6
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/scripts/generate_config_tests.py
View File

@ -40,9 +40,6 @@ def single_setting_case(setting: config.Setting, when_on: bool,
return tc return tc
PSA_WANT_KEY_TYPE_KEY_PAIR_RE = \
re.compile(r'(?P<prefix>PSA_WANT_KEY_TYPE_(?P<type>\w+)_KEY_PAIR_)(?P<operation>\w+)\Z')
# If foo is a setting that is only meaningful when bar is enabled, set # If foo is a setting that is only meaningful when bar is enabled, set
# SIMPLE_DEPENDENCIES[foo]=bar. More generally, bar can be a colon-separated # SIMPLE_DEPENDENCIES[foo]=bar. More generally, bar can be a colon-separated
# list of settings, meaning that all the settings must be enabled. Each setting # list of settings, meaning that all the settings must be enabled. Each setting
@ -50,7 +47,6 @@ PSA_WANT_KEY_TYPE_KEY_PAIR_RE = \
# depends_on directive in test data. # depends_on directive in test data.
# See also `dependencies_of_settting`. # See also `dependencies_of_settting`.
SIMPLE_DEPENDENCIES = { SIMPLE_DEPENDENCIES = {
'MBEDTLS_AESCE_C': 'MBEDTLS_AES_C',
'MBEDTLS_AESNI_C': 'MBEDTLS_AES_C', 'MBEDTLS_AESNI_C': 'MBEDTLS_AES_C',
'MBEDTLS_ERROR_STRERROR_DUMMY': '!MBEDTLS_ERROR_C', 'MBEDTLS_ERROR_STRERROR_DUMMY': '!MBEDTLS_ERROR_C',
'MBEDTLS_GENPRIME': 'MBEDTLS_RSA_C', 'MBEDTLS_GENPRIME': 'MBEDTLS_RSA_C',
@ -95,8 +91,7 @@ def dependencies_of_setting(cfg: config.Config,
# Requiring both sides to be enabled also means we know we'll run # Requiring both sides to be enabled also means we know we'll run
# tests that only run Mbed TLS against itself, which only run in # tests that only run Mbed TLS against itself, which only run in
# configurations with both sides enabled. # configurations with both sides enabled.
if name.startswith('MBEDTLS_SSL_TLS1_3_') or \ if name.startswith('MBEDTLS_SSL_TLS1_3_'):
name == 'MBEDTLS_SSL_EARLY_DATA':
return 'MBEDTLS_SSL_CLI_C:MBEDTLS_SSL_SRV_C:MBEDTLS_SSL_PROTO_TLS1_3' return 'MBEDTLS_SSL_CLI_C:MBEDTLS_SSL_SRV_C:MBEDTLS_SSL_PROTO_TLS1_3'
if name.startswith('MBEDTLS_SSL_DTLS_'): if name.startswith('MBEDTLS_SSL_DTLS_'):
return 'MBEDTLS_SSL_CLI_C:MBEDTLS_SSL_SRV_C:MBEDTLS_SSL_PROTO_DTLS' return 'MBEDTLS_SSL_CLI_C:MBEDTLS_SSL_SRV_C:MBEDTLS_SSL_PROTO_DTLS'
@ -106,9 +101,6 @@ def dependencies_of_setting(cfg: config.Config,
super_name = name[:pos.start()] + '_C' super_name = name[:pos.start()] + '_C'
if cfg.known(super_name): if cfg.known(super_name):
return super_name return super_name
m = PSA_WANT_KEY_TYPE_KEY_PAIR_RE.match(name)
if m and m.group('operation') != 'BASIC':
return m.group('prefix') + 'BASIC'
return None return None
def conditions_for_setting(cfg: config.Config, def conditions_for_setting(cfg: config.Config,