Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-06-05 21:15:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cosmetic issues reported by pylint

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2026-03-02 13:39:40 +01:00
parent 7bc3cdfd12
commit d393ebd792
3 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/mbedtls_framework/code_wrapper/psa_buffer.py
-4
View File
@@ -4,9 +4,6 @@
# Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
from typing import List
from .. import typing_util
class BufferParameter:
"""Description of an input or output buffer parameter sequence to a PSA function."""
#pylint: disable=too-few-public-methods
@@ -26,4 +23,3 @@ class BufferParameter:
self.buffer_name = buffer_name
self.size_name = size_name
self.is_output = is_output
scripts/mbedtls_framework/code_wrapper/psa_test_wrapper.py
+4 -16
View File
@@ -4,18 +4,9 @@
# Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
import argparse
import itertools
import os
from typing import Iterator, List, Collection, Optional, Tuple
from typing import List, Optional
from .. import build_tree
from .. import c_parsing_helper
from .. import c_wrapper_generator
from .. import typing_util
from .psa_buffer import BufferParameter
from .psa_wrapper import PSAWrapper, PSALoggingWrapper, PSAWrapperConfiguration
from .psa_wrapper import PSAWrapper, PSALoggingWrapper
class PSATestWrapper(PSAWrapper):
"""Generate a C source file containing wrapper functions for PSA Crypto API calls."""
@@ -31,9 +22,6 @@ class PSATestWrapper(PSAWrapper):
class PSALoggingTestWrapper(PSATestWrapper, PSALoggingWrapper):
"""Generate a C source file containing wrapper functions that log PSA Crypto API calls."""
def __init__(self, out_h_f: str,
out_c_f: str,
stream: str,
in_headers: Optional[List[str]] = None) -> None:
def __init__(self, out_h_f: str, out_c_f: str, stream: str,
in_headers: Optional[List[str]] = None) -> None:
super().__init__(out_h_f, out_c_f, stream, in_headers)
scripts/mbedtls_framework/code_wrapper/psa_wrapper.py
+24 -20
View File
@@ -4,10 +4,9 @@
# Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
import argparse
import itertools
import os
from typing import Any, Iterator, List, Dict, Collection, Optional, Tuple
from typing import Iterator, List, Collection, Optional, Tuple
from .. import build_tree
from .. import c_parsing_helper
@@ -20,7 +19,11 @@ class PSAWrapperConfiguration:
"""Configuration data class for PSA Wrapper."""
def __init__(self) -> None:
self.cpp_guards = ["MBEDTLS_PSA_CRYPTO_C", "MBEDTLS_TEST_HOOKS", "!RECORD_PSA_STATUS_COVERAGE_LOG"]
self.cpp_guards = [
"MBEDTLS_PSA_CRYPTO_C",
"MBEDTLS_TEST_HOOKS",
"!RECORD_PSA_STATUS_COVERAGE_LOG",
]
self.skipped_functions = frozenset([
'mbedtls_psa_external_get_random', # not a library function
@@ -108,7 +111,7 @@ class PSAWrapper(c_wrapper_generator.Base):
# case can just be removed.
if build_tree.looks_like_mbedtls_root(self.project_root) and \
not build_tree.is_mbedtls_3_6():
path_list = ['tf-psa-crypto' ] + path_list
path_list = ['tf-psa-crypto'] + path_list
return os.path.join(self.project_root, *path_list, filename)
return os.path.join(self.project_root, *path_list, filename)
@@ -123,8 +126,8 @@ class PSAWrapper(c_wrapper_generator.Base):
output = ""
dl = [("defined({})".format(n) if n[0] != "!" else
"!defined({})".format(n[1:]))
for n in def_list]
"!defined({})".format(n[1:]))
for n in def_list]
# Split the list in chunks of 2 and add new lines
for i in range(0, len(dl), 2):
@@ -161,31 +164,33 @@ class PSAWrapper(c_wrapper_generator.Base):
return True
def _poison_wrap(self, param : BufferParameter, poison: bool, ident_lv = 1) -> str:
def _poison_wrap(self, param: BufferParameter, poison: bool,
ident_lv: int = 1) -> str:
"""Returns a call to MBEDTLS_TEST_MEMORY_[UN]POISON.
The output is prefixed with MBEDTLS_TEST_MEMORY_ followed by POISON/UNPOISON
and the input parameter arguments (name, length)
"""
return "{}MBEDTLS_TEST_MEMORY_{}({}, {});\n".format((ident_lv * 4) * ' ',
'POISON' if poison else 'UNPOISON',
param.buffer_name, param.size_name)
return "{}MBEDTLS_TEST_MEMORY_{}({}, {});\n".format(
(ident_lv * 4) * ' ',
'POISON' if poison else 'UNPOISON',
param.buffer_name, param.size_name)
def _poison_multi_write(self,
out: typing_util.Writable,
buffer_parameters: List['BufferParameter'],
poison: bool) -> None:
"""Write poisoning or unpoisoning code for the buffer parameters.
"""Write poisoning or unpoisoning code for the buffer parameters.
Write poisoning code if poison is true, unpoisoning code otherwise.
"""
Write poisoning code if poison is true, unpoisoning code otherwise.
"""
if not buffer_parameters:
return
out.write('#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)\n')
for param in buffer_parameters:
out.write(self._poison_wrap(param, poison))
out.write('#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */\n')
if not buffer_parameters:
return
out.write('#if !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS)\n')
for param in buffer_parameters:
out.write(self._poison_wrap(param, poison))
out.write('#endif /* !defined(MBEDTLS_PSA_ASSUME_EXCLUSIVE_BUFFERS) */\n')
# Override parent's methods
def _write_function_call(self, out: typing_util.Writable,
@@ -284,4 +289,3 @@ class PSALoggingWrapper(PSAWrapper, c_wrapper_generator.Logging):
['(unsigned) psa_get_key_{}({})'.format(field, var)
for field in ['id', 'lifetime', 'type', 'bits', 'algorithm', 'usage_flags']])
return super()._printf_parameters(typ, var)