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

Don't pass the section name to adapters

Browse Source 
We have finished removing the reliance of named configuration on section
names.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2024-09-19 20:13:49 +02:00
parent 36571d6d8a
commit 00b9144608
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework

@ -1 +1 @@
Subproject commit 745122dc172a77897df15d9e61fcb8d2dd51230b Subproject commit 2f639b6bf4bcf57c4b1b0afb23ccb657607428bc

34
scripts/config.py
View File

@ -38,7 +38,7 @@ def is_boolean_setting(name, value):
return True return True
return False return False
def realfull_adapter(_name, _value, _active, _section): def realfull_adapter(_name, _value, _active):
"""Activate all symbols. """Activate all symbols.
This is intended for building the documentation, including the This is intended for building the documentation, including the
@ -145,7 +145,7 @@ def include_in_full(name):
return is_seamless_alt(name) return is_seamless_alt(name)
return True return True
def full_adapter(name, value, active, _section): def full_adapter(name, value, active):
"""Config adapter for "full".""" """Config adapter for "full"."""
if not is_boolean_setting(name, value): if not is_boolean_setting(name, value):
return active return active
@ -183,7 +183,7 @@ def keep_in_baremetal(name):
return False return False
return True return True
def baremetal_adapter(name, value, active, _section): def baremetal_adapter(name, value, active):
"""Config adapter for "baremetal".""" """Config adapter for "baremetal"."""
if not is_boolean_setting(name, value): if not is_boolean_setting(name, value):
return active return active
@ -202,10 +202,10 @@ EXCLUDE_FOR_SIZE = frozenset([
'MBEDTLS_TEST_HOOKS', # only useful with the hosted test framework, increases code size 'MBEDTLS_TEST_HOOKS', # only useful with the hosted test framework, increases code size
]) ])
def baremetal_size_adapter(name, value, active, section): def baremetal_size_adapter(name, value, active):
if name in EXCLUDE_FOR_SIZE: if name in EXCLUDE_FOR_SIZE:
return False return False
return baremetal_adapter(name, value, active, section) return baremetal_adapter(name, value, active)
def include_in_crypto(name): def include_in_crypto(name):
"""Rules for symbols in a crypto configuration.""" """Rules for symbols in a crypto configuration."""
@ -226,15 +226,15 @@ def include_in_crypto(name):
def crypto_adapter(adapter): def crypto_adapter(adapter):
"""Modify an adapter to disable non-crypto symbols. """Modify an adapter to disable non-crypto symbols.
``crypto_adapter(adapter)(name, value, active, section)`` is like ``crypto_adapter(adapter)(name, value, active)`` is like
``adapter(name, value, active, section)``, but unsets all X.509 and TLS symbols. ``adapter(name, value, active)``, but unsets all X.509 and TLS symbols.
""" """
def continuation(name, value, active, section): def continuation(name, value, active):
if not include_in_crypto(name): if not include_in_crypto(name):
return False return False
if adapter is None: if adapter is None:
return active return active
return adapter(name, value, active, section) return adapter(name, value, active)
return continuation return continuation
DEPRECATED = frozenset([ DEPRECATED = frozenset([
@ -244,34 +244,34 @@ DEPRECATED = frozenset([
def no_deprecated_adapter(adapter): def no_deprecated_adapter(adapter):
"""Modify an adapter to disable deprecated symbols. """Modify an adapter to disable deprecated symbols.
``no_deprecated_adapter(adapter)(name, value, active, section)`` is like ``no_deprecated_adapter(adapter)(name, value, active)`` is like
``adapter(name, value, active, section)``, but unsets all deprecated symbols ``adapter(name, value, active)``, but unsets all deprecated symbols
and sets ``MBEDTLS_DEPRECATED_REMOVED``. and sets ``MBEDTLS_DEPRECATED_REMOVED``.
""" """
def continuation(name, value, active, section): def continuation(name, value, active):
if name == 'MBEDTLS_DEPRECATED_REMOVED': if name == 'MBEDTLS_DEPRECATED_REMOVED':
return True return True
if name in DEPRECATED: if name in DEPRECATED:
return False return False
if adapter is None: if adapter is None:
return active return active
return adapter(name, value, active, section) return adapter(name, value, active)
return continuation return continuation
def no_platform_adapter(adapter): def no_platform_adapter(adapter):
"""Modify an adapter to disable platform symbols. """Modify an adapter to disable platform symbols.
``no_platform_adapter(adapter)(name, value, active, section)`` is like ``no_platform_adapter(adapter)(name, value, active)`` is like
``adapter(name, value, active, section)``, but unsets all platform symbols other ``adapter(name, value, active)``, but unsets all platform symbols other
``than MBEDTLS_PLATFORM_C. ``than MBEDTLS_PLATFORM_C.
""" """
def continuation(name, value, active, section): def continuation(name, value, active):
# Allow MBEDTLS_PLATFORM_C but remove all other platform symbols. # Allow MBEDTLS_PLATFORM_C but remove all other platform symbols.
if name.startswith('MBEDTLS_PLATFORM_') and name != 'MBEDTLS_PLATFORM_C': if name.startswith('MBEDTLS_PLATFORM_') and name != 'MBEDTLS_PLATFORM_C':
return False return False
if adapter is None: if adapter is None:
return active return active
return adapter(name, value, active, section) return adapter(name, value, active)
return continuation return continuation