From 4de85396cf98891b41e6277f54822a7e9de60a05 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 14 May 2024 10:20:56 +0200 Subject: [PATCH] Enable MBEDTLS_PSA_CRYPTO_C and MBEDTLS_USE_PSA_CRYPTO Enable MBEDTLS_PSA_CRYPTO_C and MBEDTLS_USE_PSA_CRYPTO is reference configurations as we are working towards removing (always on) them. Signed-off-by: Ronald Cron --- configs/config-ccm-psk-dtls1_2.h | 7 ++----- configs/config-ccm-psk-tls1_2.h | 7 ++----- configs/config-suite-b.h | 7 ++----- configs/config-symmetric-only.h | 4 ++-- configs/config-thread.h | 7 ++----- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/configs/config-ccm-psk-dtls1_2.h b/configs/config-ccm-psk-dtls1_2.h index 2ea9ac4618..fa012db8bd 100644 --- a/configs/config-ccm-psk-dtls1_2.h +++ b/configs/config-ccm-psk-dtls1_2.h @@ -25,7 +25,9 @@ #define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "../configs/crypto-config-ccm-psk-tls1_2.h" +#define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_CONFIG +#define MBEDTLS_USE_PSA_CRYPTO /* System support */ //#define MBEDTLS_HAVE_TIME /* Optionally used in Hello messages */ @@ -82,11 +84,6 @@ */ #define MBEDTLS_ENTROPY_MAX_SOURCES 2 -/* These defines are present so that the config modifying scripts can enable - * them during tests/scripts/test-ref-configs.pl */ -//#define MBEDTLS_USE_PSA_CRYPTO -//#define MBEDTLS_PSA_CRYPTO_C - /* Error messages and TLS debugging traces * (huge code size increase, needed for tests/ssl-opt.sh) */ //#define MBEDTLS_DEBUG_C diff --git a/configs/config-ccm-psk-tls1_2.h b/configs/config-ccm-psk-tls1_2.h index cbc7dab867..eb23fca1ce 100644 --- a/configs/config-ccm-psk-tls1_2.h +++ b/configs/config-ccm-psk-tls1_2.h @@ -24,7 +24,9 @@ #define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "../configs/crypto-config-ccm-psk-tls1_2.h" +#define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_CONFIG +#define MBEDTLS_USE_PSA_CRYPTO /* System support */ //#define MBEDTLS_HAVE_TIME /* Optionally used in Hello messages */ @@ -73,11 +75,6 @@ */ #define MBEDTLS_ENTROPY_MAX_SOURCES 2 -/* These defines are present so that the config modifying scripts can enable - * them during tests/scripts/test-ref-configs.pl */ -//#define MBEDTLS_USE_PSA_CRYPTO -//#define MBEDTLS_PSA_CRYPTO_C - /* Error messages and TLS debugging traces * (huge code size increase, needed for tests/ssl-opt.sh) */ //#define MBEDTLS_DEBUG_C diff --git a/configs/config-suite-b.h b/configs/config-suite-b.h index 77c0b1772f..bb9a312b36 100644 --- a/configs/config-suite-b.h +++ b/configs/config-suite-b.h @@ -23,7 +23,9 @@ #define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "../configs/crypto-config-suite-b.h" +#define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_CONFIG +#define MBEDTLS_USE_PSA_CRYPTO /* System support */ #define MBEDTLS_HAVE_ASM @@ -90,11 +92,6 @@ #define MBEDTLS_SSL_IN_CONTENT_LEN 1024 #define MBEDTLS_SSL_OUT_CONTENT_LEN 1024 -/* These defines are present so that the config modifying scripts can enable - * them during tests/scripts/test-ref-configs.pl */ -//#define MBEDTLS_USE_PSA_CRYPTO -//#define MBEDTLS_PSA_CRYPTO_C - /* Error messages and TLS debugging traces * (huge code size increase, needed for tests/ssl-opt.sh) */ //#define MBEDTLS_DEBUG_C diff --git a/configs/config-symmetric-only.h b/configs/config-symmetric-only.h index faeab178fd..e307c0b961 100644 --- a/configs/config-symmetric-only.h +++ b/configs/config-symmetric-only.h @@ -10,7 +10,9 @@ #define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "../configs/crypto-config-symmetric-only.h" +#define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_CONFIG +#define MBEDTLS_USE_PSA_CRYPTO /* System support */ //#define MBEDTLS_HAVE_ASM @@ -22,7 +24,6 @@ #define MBEDTLS_FS_IO #define MBEDTLS_ENTROPY_NV_SEED #define MBEDTLS_SELF_TEST -#define MBEDTLS_USE_PSA_CRYPTO #define MBEDTLS_VERSION_FEATURES /* Mbed TLS modules */ @@ -42,7 +43,6 @@ #define MBEDTLS_PKCS5_C #define MBEDTLS_PKCS12_C #define MBEDTLS_PLATFORM_C -#define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_SE_C #define MBEDTLS_PSA_CRYPTO_STORAGE_C #define MBEDTLS_PSA_ITS_FILE_C diff --git a/configs/config-thread.h b/configs/config-thread.h index e9b267c4c0..48c8301661 100644 --- a/configs/config-thread.h +++ b/configs/config-thread.h @@ -23,7 +23,9 @@ #define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "../configs/crypto-config-thread.h" +#define MBEDTLS_PSA_CRYPTO_C #define MBEDTLS_PSA_CRYPTO_CONFIG +#define MBEDTLS_USE_PSA_CRYPTO /* System support */ #define MBEDTLS_HAVE_ASM @@ -66,8 +68,3 @@ /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */ #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 - -/* These defines are present so that the config modifying scripts can enable - * them during tests/scripts/test-ref-configs.pl */ -//#define MBEDTLS_USE_PSA_CRYPTO -//#define MBEDTLS_PSA_CRYPTO_C