mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-04-16 08:42:50 +00:00
Update references to mbedtls_dev
Change these to point to the new mbedtls_framework module in the framework submodule. Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
parent
04f3433a55
commit
9638ca389b
@ -86,7 +86,7 @@ Summary of files to modify when adding a new algorithm or key type:
|
|||||||
* [ ] `tests/suites/test_suite_psa_crypto_metadata.data` — [New functions and macros](#new-functions-and-macros)
|
* [ ] `tests/suites/test_suite_psa_crypto_metadata.data` — [New functions and macros](#new-functions-and-macros)
|
||||||
* (If adding `PSA_IS_xxx`) `tests/suites/test_suite_psa_crypto_metadata.function` — [New functions and macros](#new-functions-and-macros)
|
* (If adding `PSA_IS_xxx`) `tests/suites/test_suite_psa_crypto_metadata.function` — [New functions and macros](#new-functions-and-macros)
|
||||||
* [ ] `tests/suites/test_suite_psa_crypto*.data`, `tests/suites/test_suite_psa_crypto*.function` — [Unit tests](#unit-tests)
|
* [ ] `tests/suites/test_suite_psa_crypto*.data`, `tests/suites/test_suite_psa_crypto*.function` — [Unit tests](#unit-tests)
|
||||||
* [ ] `scripts/mbedtls_dev/crypto_knowledge.py`, `scripts/mbedtls_dev/asymmetric_key_data.py` — [Unit tests](#unit-tests)
|
* [ ] `framework/scripts/mbedtls_framework/crypto_knowledge.py`, `framework/scripts/mbedtls_framework/asymmetric_key_data.py` — [Unit tests](#unit-tests)
|
||||||
* [ ] `ChangeLog.d/*.txt` — changelog entry
|
* [ ] `ChangeLog.d/*.txt` — changelog entry
|
||||||
|
|
||||||
Summary of files to modify when adding new API functions:
|
Summary of files to modify when adding new API functions:
|
||||||
@ -161,8 +161,8 @@ A number of unit tests are automatically generated by `tests/scripts/generate_ps
|
|||||||
|
|
||||||
When adding a new key type or algorithm:
|
When adding a new key type or algorithm:
|
||||||
|
|
||||||
* `scripts/mbedtls_dev/crypto_knowledge.py` contains knowledge about the compatibility of key types, key sizes and algorithms.
|
* `framework/scripts/mbedtls_framework/crypto_knowledge.py` contains knowledge about the compatibility of key types, key sizes and algorithms.
|
||||||
* `scripts/mbedtls_dev/asymmetric_key_data.py` contains valid key data for asymmetric key types.
|
* `framework/scripts/mbedtls_framework/asymmetric_key_data.py` contains valid key data for asymmetric key types.
|
||||||
|
|
||||||
Other things need to be tested manually, either in `tests/suites/test_sutie_psa_crypto.data` or in another file. For example (this is not an exhaustive list):
|
Other things need to be tested manually, either in `tests/suites/test_sutie_psa_crypto.data` or in another file. For example (this is not an exhaustive list):
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ from types import SimpleNamespace
|
|||||||
|
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
|
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
|
|
||||||
|
|
||||||
class AbiChecker:
|
class AbiChecker:
|
||||||
|
@ -21,9 +21,9 @@ import sys
|
|||||||
import typing
|
import typing
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
|
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
from mbedtls_dev import logging_util
|
from mbedtls_framework import logging_util
|
||||||
from mbedtls_dev import typing_util
|
from mbedtls_framework import typing_util
|
||||||
|
|
||||||
class SupportedArch(Enum):
|
class SupportedArch(Enum):
|
||||||
"""Supported architecture for code size measurement."""
|
"""Supported architecture for code size measurement."""
|
||||||
|
@ -17,7 +17,7 @@ from traceback import format_tb
|
|||||||
import argparse
|
import argparse
|
||||||
import jsonschema
|
import jsonschema
|
||||||
import jinja2
|
import jinja2
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
|
|
||||||
JSONSchema = NewType('JSONSchema', object)
|
JSONSchema = NewType('JSONSchema', object)
|
||||||
# The Driver is an Object, but practically it's indexable and can called a dictionary to
|
# The Driver is an Object, but practically it's indexable and can called a dictionary to
|
||||||
|
@ -17,8 +17,8 @@ file is written:
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
from mbedtls_dev import macro_collector
|
from mbedtls_framework import macro_collector
|
||||||
|
|
||||||
OUTPUT_TEMPLATE = '''\
|
OUTPUT_TEMPLATE = '''\
|
||||||
/* Automatically generated by generate_psa_constant.py. DO NOT EDIT. */
|
/* Automatically generated by generate_psa_constant.py. DO NOT EDIT. */
|
||||||
|
@ -14,7 +14,7 @@ import re
|
|||||||
import os
|
import os
|
||||||
import textwrap
|
import textwrap
|
||||||
import argparse
|
import argparse
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
|
|
||||||
|
|
||||||
def remove_c_comments(string):
|
def remove_c_comments(string):
|
||||||
|
@ -14,7 +14,7 @@ import tempfile
|
|||||||
import typing
|
import typing
|
||||||
|
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
from mbedtls_dev import typing_util
|
from mbedtls_framework import typing_util
|
||||||
|
|
||||||
def pylint_doesn_t_notice_that_certain_types_are_used_in_annotations(
|
def pylint_doesn_t_notice_that_certain_types_are_used_in_annotations(
|
||||||
_list: List[typing.Any],
|
_list: List[typing.Any],
|
||||||
|
@ -85,12 +85,12 @@ if(GEN_FILES)
|
|||||||
--directory ${CMAKE_CURRENT_BINARY_DIR}/suites
|
--directory ${CMAKE_CURRENT_BINARY_DIR}/suites
|
||||||
DEPENDS
|
DEPENDS
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../tests/scripts/generate_bignum_tests.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../tests/scripts/generate_bignum_tests.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/bignum_common.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/bignum_common.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/bignum_core.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/bignum_core.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/bignum_mod_raw.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/bignum_mod_raw.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/bignum_mod.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/bignum_mod.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/test_case.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/test_case.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/test_data_generation.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/test_data_generation.py
|
||||||
)
|
)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT
|
||||||
@ -103,10 +103,10 @@ if(GEN_FILES)
|
|||||||
--directory ${CMAKE_CURRENT_BINARY_DIR}/suites
|
--directory ${CMAKE_CURRENT_BINARY_DIR}/suites
|
||||||
DEPENDS
|
DEPENDS
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../tests/scripts/generate_ecp_tests.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../tests/scripts/generate_ecp_tests.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/bignum_common.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/bignum_common.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/ecp.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/ecp.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/test_case.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/test_case.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/test_data_generation.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/test_data_generation.py
|
||||||
)
|
)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT
|
||||||
@ -119,13 +119,13 @@ if(GEN_FILES)
|
|||||||
--directory ${CMAKE_CURRENT_BINARY_DIR}/suites
|
--directory ${CMAKE_CURRENT_BINARY_DIR}/suites
|
||||||
DEPENDS
|
DEPENDS
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../tests/scripts/generate_psa_tests.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../tests/scripts/generate_psa_tests.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/crypto_data_tests.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/crypto_data_tests.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/crypto_knowledge.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/crypto_knowledge.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/macro_collector.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/macro_collector.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/psa_information.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/psa_information.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/psa_storage.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/psa_storage.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/test_case.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/test_case.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/mbedtls_dev/test_data_generation.py
|
${CMAKE_CURRENT_SOURCE_DIR}/../framework/scripts/mbedtls_framework/test_data_generation.py
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../include/psa/crypto_config.h
|
${CMAKE_CURRENT_SOURCE_DIR}/../include/psa/crypto_config.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../include/psa/crypto_values.h
|
${CMAKE_CURRENT_SOURCE_DIR}/../include/psa/crypto_values.h
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../include/psa/crypto_extra.h
|
${CMAKE_CURRENT_SOURCE_DIR}/../include/psa/crypto_extra.h
|
||||||
|
@ -50,35 +50,35 @@ generated_files: $(GENERATED_FILES) src/test_keys.h src/test_certs.h
|
|||||||
.SECONDARY: generated_bignum_test_data generated_ecp_test_data generated_psa_test_data
|
.SECONDARY: generated_bignum_test_data generated_ecp_test_data generated_psa_test_data
|
||||||
$(GENERATED_BIGNUM_DATA_FILES): $(gen_file_dep) generated_bignum_test_data
|
$(GENERATED_BIGNUM_DATA_FILES): $(gen_file_dep) generated_bignum_test_data
|
||||||
generated_bignum_test_data: scripts/generate_bignum_tests.py
|
generated_bignum_test_data: scripts/generate_bignum_tests.py
|
||||||
generated_bignum_test_data: ../scripts/mbedtls_dev/bignum_common.py
|
generated_bignum_test_data: ../framework/scripts/mbedtls_framework/bignum_common.py
|
||||||
generated_bignum_test_data: ../scripts/mbedtls_dev/bignum_core.py
|
generated_bignum_test_data: ../framework/scripts/mbedtls_framework/bignum_core.py
|
||||||
generated_bignum_test_data: ../scripts/mbedtls_dev/bignum_mod_raw.py
|
generated_bignum_test_data: ../framework/scripts/mbedtls_framework/bignum_mod_raw.py
|
||||||
generated_bignum_test_data: ../scripts/mbedtls_dev/bignum_mod.py
|
generated_bignum_test_data: ../framework/scripts/mbedtls_framework/bignum_mod.py
|
||||||
generated_bignum_test_data: ../scripts/mbedtls_dev/test_case.py
|
generated_bignum_test_data: ../framework/scripts/mbedtls_framework/test_case.py
|
||||||
generated_bignum_test_data: ../scripts/mbedtls_dev/test_data_generation.py
|
generated_bignum_test_data: ../framework/scripts/mbedtls_framework/test_data_generation.py
|
||||||
generated_bignum_test_data:
|
generated_bignum_test_data:
|
||||||
echo " Gen $(GENERATED_BIGNUM_DATA_FILES)"
|
echo " Gen $(GENERATED_BIGNUM_DATA_FILES)"
|
||||||
$(PYTHON) scripts/generate_bignum_tests.py
|
$(PYTHON) scripts/generate_bignum_tests.py
|
||||||
|
|
||||||
$(GENERATED_ECP_DATA_FILES): $(gen_file_dep) generated_ecp_test_data
|
$(GENERATED_ECP_DATA_FILES): $(gen_file_dep) generated_ecp_test_data
|
||||||
generated_ecp_test_data: scripts/generate_ecp_tests.py
|
generated_ecp_test_data: scripts/generate_ecp_tests.py
|
||||||
generated_ecp_test_data: ../scripts/mbedtls_dev/bignum_common.py
|
generated_ecp_test_data: ../framework/scripts/mbedtls_framework/bignum_common.py
|
||||||
generated_ecp_test_data: ../scripts/mbedtls_dev/ecp.py
|
generated_ecp_test_data: ../framework/scripts/mbedtls_framework/ecp.py
|
||||||
generated_ecp_test_data: ../scripts/mbedtls_dev/test_case.py
|
generated_ecp_test_data: ../framework/scripts/mbedtls_framework/test_case.py
|
||||||
generated_ecp_test_data: ../scripts/mbedtls_dev/test_data_generation.py
|
generated_ecp_test_data: ../framework/scripts/mbedtls_framework/test_data_generation.py
|
||||||
generated_ecp_test_data:
|
generated_ecp_test_data:
|
||||||
echo " Gen $(GENERATED_ECP_DATA_FILES)"
|
echo " Gen $(GENERATED_ECP_DATA_FILES)"
|
||||||
$(PYTHON) scripts/generate_ecp_tests.py
|
$(PYTHON) scripts/generate_ecp_tests.py
|
||||||
|
|
||||||
$(GENERATED_PSA_DATA_FILES): $(gen_file_dep) generated_psa_test_data
|
$(GENERATED_PSA_DATA_FILES): $(gen_file_dep) generated_psa_test_data
|
||||||
generated_psa_test_data: scripts/generate_psa_tests.py
|
generated_psa_test_data: scripts/generate_psa_tests.py
|
||||||
generated_psa_test_data: ../scripts/mbedtls_dev/crypto_data_tests.py
|
generated_psa_test_data: ../framework/scripts/mbedtls_framework/crypto_data_tests.py
|
||||||
generated_psa_test_data: ../scripts/mbedtls_dev/crypto_knowledge.py
|
generated_psa_test_data: ../framework/scripts/mbedtls_framework/crypto_knowledge.py
|
||||||
generated_psa_test_data: ../scripts/mbedtls_dev/macro_collector.py
|
generated_psa_test_data: ../framework/scripts/mbedtls_framework/macro_collector.py
|
||||||
generated_psa_test_data: ../scripts/mbedtls_dev/psa_information.py
|
generated_psa_test_data: ../framework/scripts/mbedtls_framework/psa_information.py
|
||||||
generated_psa_test_data: ../scripts/mbedtls_dev/psa_storage.py
|
generated_psa_test_data: ../framework/scripts/mbedtls_framework/psa_storage.py
|
||||||
generated_psa_test_data: ../scripts/mbedtls_dev/test_case.py
|
generated_psa_test_data: ../framework/scripts/mbedtls_framework/test_case.py
|
||||||
generated_psa_test_data: ../scripts/mbedtls_dev/test_data_generation.py
|
generated_psa_test_data: ../framework/scripts/mbedtls_framework/test_data_generation.py
|
||||||
## The generated file only depends on the options that are present in
|
## The generated file only depends on the options that are present in
|
||||||
## crypto_config.h, not on which options are set. To avoid regenerating this
|
## crypto_config.h, not on which options are set. To avoid regenerating this
|
||||||
## file all the time when switching between configurations, don't declare
|
## file all the time when switching between configurations, don't declare
|
||||||
|
@ -29,8 +29,8 @@ from cryptography import x509
|
|||||||
from generate_test_code import FileWrapper
|
from generate_test_code import FileWrapper
|
||||||
|
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
from mbedtls_dev import logging_util
|
from mbedtls_framework import logging_util
|
||||||
|
|
||||||
def check_cryptography_version():
|
def check_cryptography_version():
|
||||||
match = re.match(r'^[0-9]+', cryptography.__version__)
|
match = re.match(r'^[0-9]+', cryptography.__version__)
|
||||||
|
@ -31,14 +31,14 @@ EOF
|
|||||||
|
|
||||||
can_pylint () {
|
can_pylint () {
|
||||||
# Pylint 1.5.2 from Ubuntu 16.04 is too old:
|
# Pylint 1.5.2 from Ubuntu 16.04 is too old:
|
||||||
# E: 34, 0: Unable to import 'mbedtls_dev' (import-error)
|
# E: 34, 0: Unable to import 'mbedtls_framework' (import-error)
|
||||||
# Pylint 1.8.3 from Ubuntu 18.04 passed on the first commit containing this line.
|
# Pylint 1.8.3 from Ubuntu 18.04 passed on the first commit containing this line.
|
||||||
check_version pylint 1.8.3
|
check_version pylint 1.8.3
|
||||||
}
|
}
|
||||||
|
|
||||||
can_mypy () {
|
can_mypy () {
|
||||||
# mypy 0.770 is too old:
|
# mypy 0.770 is too old:
|
||||||
# tests/scripts/test_psa_constant_names.py:34: error: Cannot find implementation or library stub for module named 'mbedtls_dev'
|
# tests/scripts/test_psa_constant_names.py:34: error: Cannot find implementation or library stub for module named 'mbedtls_framework'
|
||||||
# mypy 0.780 from pip passed on the first commit containing this line.
|
# mypy 0.780 from pip passed on the first commit containing this line.
|
||||||
check_version mypy.version 0.780
|
check_version mypy.version 0.780
|
||||||
}
|
}
|
||||||
@ -55,7 +55,7 @@ elif [ "$1" = "--can-mypy" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo 'Running pylint ...'
|
echo 'Running pylint ...'
|
||||||
$PYTHON -m pylint scripts/mbedtls_dev/*.py scripts/*.py tests/scripts/*.py || {
|
$PYTHON -m pylint framework/scripts/mbedtls_framework/*.py scripts/*.py tests/scripts/*.py || {
|
||||||
echo >&2 "pylint reported errors"
|
echo >&2 "pylint reported errors"
|
||||||
ret=1
|
ret=1
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ except ImportError:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
|
|
||||||
|
|
||||||
class FileIssueTracker:
|
class FileIssueTracker:
|
||||||
|
@ -45,7 +45,7 @@ import subprocess
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
|
|
||||||
|
|
||||||
# Naming patterns to check against. These are defined outside the NameCheck
|
# Naming patterns to check against. These are defined outside the NameCheck
|
||||||
|
@ -48,12 +48,12 @@ from abc import ABCMeta
|
|||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev import test_data_generation
|
from mbedtls_framework import test_data_generation
|
||||||
from mbedtls_dev import bignum_common
|
from mbedtls_framework import bignum_common
|
||||||
# Import modules containing additional test classes
|
# Import modules containing additional test classes
|
||||||
# Test function classes in these modules will be registered by
|
# Test function classes in these modules will be registered by
|
||||||
# the framework
|
# the framework
|
||||||
from mbedtls_dev import bignum_core, bignum_mod_raw, bignum_mod # pylint: disable=unused-import
|
from mbedtls_framework import bignum_core, bignum_mod_raw, bignum_mod # pylint: disable=unused-import
|
||||||
|
|
||||||
class BignumTarget(test_data_generation.BaseTarget):
|
class BignumTarget(test_data_generation.BaseTarget):
|
||||||
#pylint: disable=too-few-public-methods
|
#pylint: disable=too-few-public-methods
|
||||||
|
@ -11,11 +11,11 @@ as in generate_bignum_tests.py.
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev import test_data_generation
|
from mbedtls_framework import test_data_generation
|
||||||
# Import modules containing additional test classes
|
# Import modules containing additional test classes
|
||||||
# Test function classes in these modules will be registered by
|
# Test function classes in these modules will be registered by
|
||||||
# the framework
|
# the framework
|
||||||
from mbedtls_dev import ecp # pylint: disable=unused-import
|
from mbedtls_framework import ecp # pylint: disable=unused-import
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
# Use the section of the docstring relevant to the CLI as description
|
# Use the section of the docstring relevant to the CLI as description
|
||||||
|
@ -14,13 +14,13 @@ import sys
|
|||||||
from typing import Callable, Dict, FrozenSet, Iterable, Iterator, List, Optional
|
from typing import Callable, Dict, FrozenSet, Iterable, Iterator, List, Optional
|
||||||
|
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev import crypto_data_tests
|
from mbedtls_framework import crypto_data_tests
|
||||||
from mbedtls_dev import crypto_knowledge
|
from mbedtls_framework import crypto_knowledge
|
||||||
from mbedtls_dev import macro_collector #pylint: disable=unused-import
|
from mbedtls_framework import macro_collector #pylint: disable=unused-import
|
||||||
from mbedtls_dev import psa_information
|
from mbedtls_framework import psa_information
|
||||||
from mbedtls_dev import psa_storage
|
from mbedtls_framework import psa_storage
|
||||||
from mbedtls_dev import test_case
|
from mbedtls_framework import test_case
|
||||||
from mbedtls_dev import test_data_generation
|
from mbedtls_framework import test_data_generation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,10 +15,10 @@ import os
|
|||||||
from typing import Iterator, List, Optional, Tuple
|
from typing import Iterator, List, Optional, Tuple
|
||||||
|
|
||||||
import scripts_path #pylint: disable=unused-import
|
import scripts_path #pylint: disable=unused-import
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
from mbedtls_dev import c_parsing_helper
|
from mbedtls_framework import c_parsing_helper
|
||||||
from mbedtls_dev import c_wrapper_generator
|
from mbedtls_framework import c_wrapper_generator
|
||||||
from mbedtls_dev import typing_util
|
from mbedtls_framework import typing_util
|
||||||
|
|
||||||
|
|
||||||
class BufferParameter:
|
class BufferParameter:
|
||||||
|
@ -14,7 +14,7 @@ import sys
|
|||||||
import argparse
|
import argparse
|
||||||
import jinja2
|
import jinja2
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev.build_tree import guess_project_root
|
from mbedtls_framework.build_tree import guess_project_root
|
||||||
|
|
||||||
TEST_DIR = os.path.join(guess_project_root(), 'tests')
|
TEST_DIR = os.path.join(guess_project_root(), 'tests')
|
||||||
DATA_FILES_PATH = os.path.join(TEST_DIR, 'data_files')
|
DATA_FILES_PATH = os.path.join(TEST_DIR, 'data_files')
|
||||||
|
@ -10,8 +10,8 @@ from typing import Iterator, List, Tuple
|
|||||||
import re
|
import re
|
||||||
import argparse
|
import argparse
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev.asymmetric_key_data import ASYMMETRIC_KEY_DATA
|
from mbedtls_framework.asymmetric_key_data import ASYMMETRIC_KEY_DATA
|
||||||
from mbedtls_dev.build_tree import guess_project_root
|
from mbedtls_framework.build_tree import guess_project_root
|
||||||
|
|
||||||
BYTES_PER_LINE = 16
|
BYTES_PER_LINE = 16
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ from typing import List
|
|||||||
|
|
||||||
#pylint: disable=unused-import
|
#pylint: disable=unused-import
|
||||||
import scripts_path
|
import scripts_path
|
||||||
from mbedtls_dev import build_tree
|
from mbedtls_framework import build_tree
|
||||||
|
|
||||||
# PSA Compliance tests we expect to fail due to known defects in Mbed TLS /
|
# PSA Compliance tests we expect to fail due to known defects in Mbed TLS /
|
||||||
# TF-PSA-Crypto (or the test suite).
|
# TF-PSA-Crypto (or the test suite).
|
||||||
|
@ -19,9 +19,9 @@ import sys
|
|||||||
from typing import Iterable, List, Optional, Tuple
|
from typing import Iterable, List, Optional, Tuple
|
||||||
|
|
||||||
import scripts_path # pylint: disable=unused-import
|
import scripts_path # pylint: disable=unused-import
|
||||||
from mbedtls_dev import c_build_helper
|
from mbedtls_framework import c_build_helper
|
||||||
from mbedtls_dev.macro_collector import InputsForTest, PSAMacroEnumerator
|
from mbedtls_framework.macro_collector import InputsForTest, PSAMacroEnumerator
|
||||||
from mbedtls_dev import typing_util
|
from mbedtls_framework import typing_util
|
||||||
|
|
||||||
def gather_inputs(headers: Iterable[str],
|
def gather_inputs(headers: Iterable[str],
|
||||||
test_suites: Iterable[str],
|
test_suites: Iterable[str],
|
||||||
|
Loading…
x
Reference in New Issue
Block a user