mirror of
https://github.com/ARMmbed/mbedtls.git
synced 2025-05-10 00:49:04 +08:00
Merge pull request #10050 from valeriosetti/issue8151-development
[development] Remove the dynamic SE interface in 4.0
This commit is contained in:
commit
6bf29fd417
@ -1 +1 @@
|
|||||||
Subproject commit 72b5acd590097ee9d108b024bf727d752d18f97d
|
Subproject commit 2b03d629240c0c23a0bfa5444f005b8d9b6f8ba8
|
@ -113,7 +113,6 @@ OBJS_CRYPTO= \
|
|||||||
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto.o \
|
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto.o \
|
||||||
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_client.o \
|
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_client.o \
|
||||||
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_driver_wrappers_no_static.o \
|
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_driver_wrappers_no_static.o \
|
||||||
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_se.o \
|
|
||||||
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_slot_management.o \
|
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_slot_management.o \
|
||||||
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_storage.o \
|
$(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_storage.o \
|
||||||
$(TF_PSA_CRYPTO_CORE_PATH)/psa_its_file.o \
|
$(TF_PSA_CRYPTO_CORE_PATH)/psa_its_file.o \
|
||||||
|
@ -162,7 +162,6 @@ EXCLUDE_FROM_BAREMETAL = frozenset([
|
|||||||
'MBEDTLS_PLATFORM_FPRINTF_ALT', # requires FILE* from stdio.h
|
'MBEDTLS_PLATFORM_FPRINTF_ALT', # requires FILE* from stdio.h
|
||||||
'MBEDTLS_PLATFORM_NV_SEED_ALT', # requires a filesystem and ENTROPY_NV_SEED
|
'MBEDTLS_PLATFORM_NV_SEED_ALT', # requires a filesystem and ENTROPY_NV_SEED
|
||||||
'MBEDTLS_PLATFORM_TIME_ALT', # requires a clock and HAVE_TIME
|
'MBEDTLS_PLATFORM_TIME_ALT', # requires a clock and HAVE_TIME
|
||||||
'MBEDTLS_PSA_CRYPTO_SE_C', # requires a filesystem and PSA_CRYPTO_STORAGE_C
|
|
||||||
'MBEDTLS_PSA_CRYPTO_STORAGE_C', # requires a filesystem
|
'MBEDTLS_PSA_CRYPTO_STORAGE_C', # requires a filesystem
|
||||||
'MBEDTLS_PSA_ITS_FILE_C', # requires a filesystem
|
'MBEDTLS_PSA_ITS_FILE_C', # requires a filesystem
|
||||||
'MBEDTLS_THREADING_C', # requires a threading interface
|
'MBEDTLS_THREADING_C', # requires a threading interface
|
||||||
@ -238,7 +237,6 @@ def crypto_adapter(adapter):
|
|||||||
return continuation
|
return continuation
|
||||||
|
|
||||||
DEPRECATED = frozenset([
|
DEPRECATED = frozenset([
|
||||||
'MBEDTLS_PSA_CRYPTO_SE_C',
|
|
||||||
*PSA_DEPRECATED_FEATURE
|
*PSA_DEPRECATED_FEATURE
|
||||||
])
|
])
|
||||||
def no_deprecated_adapter(adapter):
|
def no_deprecated_adapter(adapter):
|
||||||
|
@ -29,7 +29,6 @@ my @skip_functions = (
|
|||||||
'mbedtls_psa_get_stats', # uses unsupported type
|
'mbedtls_psa_get_stats', # uses unsupported type
|
||||||
'mbedtls_psa_inject_entropy', # not in the default config, generally not for client use anyway
|
'mbedtls_psa_inject_entropy', # not in the default config, generally not for client use anyway
|
||||||
'mbedtls_psa_platform_get_builtin_key', # not in the default config, uses unsupported type
|
'mbedtls_psa_platform_get_builtin_key', # not in the default config, uses unsupported type
|
||||||
'mbedtls_psa_register_se_key', # not in the default config, generally not for client use anyway
|
|
||||||
'psa_get_key_slot_number', # not in the default config, uses unsupported type
|
'psa_get_key_slot_number', # not in the default config, uses unsupported type
|
||||||
'psa_key_derivation_verify_bytes', # not implemented yet
|
'psa_key_derivation_verify_bytes', # not implemented yet
|
||||||
'psa_key_derivation_verify_key', # not implemented yet
|
'psa_key_derivation_verify_key', # not implemented yet
|
||||||
|
@ -277,7 +277,6 @@ component_test_no_platform () {
|
|||||||
scripts/config.py unset MBEDTLS_PLATFORM_C
|
scripts/config.py unset MBEDTLS_PLATFORM_C
|
||||||
scripts/config.py unset MBEDTLS_NET_C
|
scripts/config.py unset MBEDTLS_NET_C
|
||||||
scripts/config.py unset MBEDTLS_FS_IO
|
scripts/config.py unset MBEDTLS_FS_IO
|
||||||
scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C
|
|
||||||
scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C
|
scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C
|
||||||
scripts/config.py unset MBEDTLS_PSA_ITS_FILE_C
|
scripts/config.py unset MBEDTLS_PSA_ITS_FILE_C
|
||||||
scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED
|
scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED
|
||||||
|
@ -114,9 +114,6 @@ component_test_tsan () {
|
|||||||
# Interruptible ECC tests are not thread safe
|
# Interruptible ECC tests are not thread safe
|
||||||
scripts/config.py unset MBEDTLS_ECP_RESTARTABLE
|
scripts/config.py unset MBEDTLS_ECP_RESTARTABLE
|
||||||
|
|
||||||
# The deprecated MBEDTLS_PSA_CRYPTO_SE_C interface is not thread safe.
|
|
||||||
scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C
|
|
||||||
|
|
||||||
CC=clang cmake -D CMAKE_BUILD_TYPE:String=TSan .
|
CC=clang cmake -D CMAKE_BUILD_TYPE:String=TSan .
|
||||||
make
|
make
|
||||||
|
|
||||||
@ -189,4 +186,3 @@ component_release_test_valgrind_psa () {
|
|||||||
msg "test: main suites, Valgrind (full config)"
|
msg "test: main suites, Valgrind (full config)"
|
||||||
make memcheck
|
make memcheck
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit f5b4a9ce21ea86c00163e175540c2f7d26c65a36
|
Subproject commit 5048bced5e1c000c0e3888be8126eb63a2b91937
|
Loading…
x
Reference in New Issue
Block a user