diff --git a/framework b/framework index 745122dc17..2f639b6bf4 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 745122dc172a77897df15d9e61fcb8d2dd51230b +Subproject commit 2f639b6bf4bcf57c4b1b0afb23ccb657607428bc diff --git a/scripts/config.py b/scripts/config.py index c38eb36263..bb4a22c9cc 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -37,7 +37,7 @@ def is_boolean_setting(name, value): return True return False -def realfull_adapter(_name, _value, _active, _section): +def realfull_adapter(_name, _value, _active): """Activate all symbols. This is intended for building the documentation, including the @@ -142,7 +142,7 @@ def include_in_full(name): return is_seamless_alt(name) return True -def full_adapter(name, value, active, _section): +def full_adapter(name, value, active): """Config adapter for "full".""" if not is_boolean_setting(name, value): return active @@ -180,7 +180,7 @@ def keep_in_baremetal(name): return False return True -def baremetal_adapter(name, value, active, _section): +def baremetal_adapter(name, value, active): """Config adapter for "baremetal".""" if not is_boolean_setting(name, value): return active @@ -199,10 +199,10 @@ EXCLUDE_FOR_SIZE = frozenset([ '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: return False - return baremetal_adapter(name, value, active, section) + return baremetal_adapter(name, value, active) def include_in_crypto(name): """Rules for symbols in a crypto configuration.""" @@ -221,15 +221,15 @@ def include_in_crypto(name): def crypto_adapter(adapter): """Modify an adapter to disable non-crypto symbols. - ``crypto_adapter(adapter)(name, value, active, section)`` is like - ``adapter(name, value, active, section)``, but unsets all X.509 and TLS symbols. + ``crypto_adapter(adapter)(name, value, active)`` is like + ``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): return False if adapter is None: return active - return adapter(name, value, active, section) + return adapter(name, value, active) return continuation DEPRECATED = frozenset([ @@ -238,34 +238,34 @@ DEPRECATED = frozenset([ def no_deprecated_adapter(adapter): """Modify an adapter to disable deprecated symbols. - ``no_deprecated_adapter(adapter)(name, value, active, section)`` is like - ``adapter(name, value, active, section)``, but unsets all deprecated symbols + ``no_deprecated_adapter(adapter)(name, value, active)`` is like + ``adapter(name, value, active)``, but unsets all deprecated symbols and sets ``MBEDTLS_DEPRECATED_REMOVED``. """ - def continuation(name, value, active, section): + def continuation(name, value, active): if name == 'MBEDTLS_DEPRECATED_REMOVED': return True if name in DEPRECATED: return False if adapter is None: return active - return adapter(name, value, active, section) + return adapter(name, value, active) return continuation def no_platform_adapter(adapter): """Modify an adapter to disable platform symbols. - ``no_platform_adapter(adapter)(name, value, active, section)`` is like - ``adapter(name, value, active, section)``, but unsets all platform symbols other + ``no_platform_adapter(adapter)(name, value, active)`` is like + ``adapter(name, value, active)``, but unsets all platform symbols other ``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. if name.startswith('MBEDTLS_PLATFORM_') and name != 'MBEDTLS_PLATFORM_C': return False if adapter is None: return active - return adapter(name, value, active, section) + return adapter(name, value, active) return continuation