michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modules: mbedtls: rename MBEDTLS_TLS_VERSION_1_2

Browse Source 
Align Kconfig name to the Mbed TLS build symbol.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
This commit is contained in:
Valerio Setti
2025-09-11 15:00:13 +02:00
committed by Chris Friedt
parent 851a20481b
commit f960db846c
14 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/hostap/Kconfig
View File

@@ -237,7 +237,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
select MBEDTLS_PEM_CERTIFICATE_FORMAT if MBEDTLS_BUILTIN
select MBEDTLS_SERVER_NAME_INDICATION if MBEDTLS_BUILTIN
select MBEDTLS_X509_CRL_PARSE_C
select MBEDTLS_TLS_VERSION_1_2
select MBEDTLS_SSL_PROTO_TLS1_2
select NOT_SECURE
select WIFI_CERTIFICATE_LIB
depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE

12
modules/mbedtls/Kconfig.mbedtls
View File

@@ -9,17 +9,17 @@ menu "Mbed TLS configuration"
menu "TLS"
config MBEDTLS_TLS_VERSION_1_2
config MBEDTLS_SSL_PROTO_TLS1_2
bool "Support for TLS 1.2 (DTLS 1.2)"
select MBEDTLS_CIPHER
select MBEDTLS_MD_C
if MBEDTLS_TLS_VERSION_1_2
if MBEDTLS_SSL_PROTO_TLS1_2
config MBEDTLS_DTLS
bool "Support for DTLS"
endif # MBEDTLS_TLS_VERSION_1_2
endif # MBEDTLS_SSL_PROTO_TLS1_2
config MBEDTLS_TLS_VERSION_1_3
bool "Support for TLS 1.3"
@@ -31,12 +31,12 @@ config MBEDTLS_TLS_SESSION_TICKETS
endif # MBEDTLS_TLS_VERSION_1_3
if MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
if MBEDTLS_SSL_PROTO_TLS1_2 || MBEDTLS_TLS_VERSION_1_3
config MBEDTLS_SSL_ALPN
bool "Support for setting the supported Application Layer Protocols"
endif # MBEDTLS_TLS_VERSION_1_2 || MBEDTLS_TLS_VERSION_1_3
endif # MBEDTLS_SSL_PROTO_TLS1_2 || MBEDTLS_TLS_VERSION_1_3
endmenu # TLS
@@ -516,7 +516,7 @@ endif # MBEDTLS_SSL_CACHE_C
config MBEDTLS_SSL_EXTENDED_MASTER_SECRET
bool "(D)TLS Extended Master Secret extension"
depends on MBEDTLS_TLS_VERSION_1_2
depends on MBEDTLS_SSL_PROTO_TLS1_2
help
Enable support for the (D)TLS Extended Master Secret extension
which ensures that master secrets are different for every

8
modules/mbedtls/configs/config-mbedtls.h
View File

@@ -61,7 +61,7 @@
/* Supported TLS versions */
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2)
#if defined(CONFIG_MBEDTLS_SSL_PROTO_TLS1_2)
#define MBEDTLS_SSL_PROTO_TLS1_2
#endif
@@ -71,7 +71,7 @@
#define MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE
#endif
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2) || \
#if defined(CONFIG_MBEDTLS_SSL_PROTO_TLS1_2) || \
defined(CONFIG_MBEDTLS_TLS_VERSION_1_3)
/* Common modules required for TLS 1.2 and 1.3 */
@@ -86,7 +86,7 @@
#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
#endif
#endif /* CONFIG_MBEDTLS_TLS_VERSION_1_2 || CONFIG_MBEDTLS_TLS_VERSION_1_3 */
#endif /* CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 || CONFIG_MBEDTLS_TLS_VERSION_1_3 */
#if defined(CONFIG_MBEDTLS_TLS_SESSION_TICKETS)
#define MBEDTLS_SSL_SESSION_TICKETS
@@ -520,7 +520,7 @@
#define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "config-psa.h"
#endif
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2) && defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
#if defined(CONFIG_MBEDTLS_SSL_PROTO_TLS1_2) && defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
#define MBEDTLS_SSL_ENCRYPT_THEN_MAC
#endif

2
modules/openthread/Kconfig
View File

@@ -179,7 +179,7 @@ config OPENTHREAD_MBEDTLS
select MBEDTLS_CMAC
select MBEDTLS_CIPHER
select MBEDTLS_MD_C
select MBEDTLS_TLS_VERSION_1_2 if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER
select MBEDTLS_SSL_PROTO_TLS1_2 if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER
select MBEDTLS_DTLS if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER
select MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER
select MBEDTLS_ECJPAKE_C if OPENTHREAD_COMMISSIONER || OPENTHREAD_JOINER

2
samples/net/cloud/aws_iot_mqtt/prj.conf
View File

@@ -68,7 +68,7 @@ CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
CONFIG_MBEDTLS_SERVER_NAME_INDICATION=y
CONFIG_MBEDTLS_AES_ROM_TABLES=y
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
CONFIG_MBEDTLS_MEMORY_DEBUG=y
CONFIG_MBEDTLS_HAVE_TIME_DATE=y
CONFIG_MBEDTLS_SSL_ALPN=y

2
samples/net/lwm2m_client/overlay-dtls-cert.conf
View File

@@ -6,7 +6,7 @@ CONFIG_LWM2M_SECURITY_KEY_SIZE=2048
# Select Zephyr mbedtls
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
# Special MbedTLS changes
CONFIG_MBEDTLS_ENABLE_HEAP=y

2
samples/net/lwm2m_client/overlay-dtls.conf
View File

@@ -5,7 +5,7 @@ CONFIG_LWM2M_PEER_PORT=5684
# Select Zephyr mbedtls
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID=y
# Special MbedTLS changes

2
subsys/net/lib/sockets/Kconfig
View File

@@ -122,7 +122,7 @@ config NET_SOCKETS_SOCKOPT_TLS
bool "TCP TLS socket option support"
imply TLS_CREDENTIALS
select MBEDTLS if NET_NATIVE
imply MBEDTLS_TLS_VERSION_1_2 if !NET_L2_OPENTHREAD
imply MBEDTLS_SSL_PROTO_TLS1_2 if !NET_L2_OPENTHREAD
imply MBEDTLS_MD_C if !NET_L2_OPENTHREAD
imply MBEDTLS_RSA_C if !NET_L2_OPENTHREAD
imply MBEDTLS_PKCS1_V15 if !NET_L2_OPENTHREAD

2
tests/benchmarks/mbedtls/prj.conf
View File

@@ -17,7 +17,7 @@ CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=64000
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=2048
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
CONFIG_MBEDTLS_KEY_EXCHANGE_ALL_ENABLED=y
CONFIG_MBEDTLS_CIPHER_ALL_ENABLED=y
CONFIG_MBEDTLS_ECP_ALL_ENABLED=y

2
tests/boards/nrf/nrf70/ent_security/prj.conf
View File

@@ -29,6 +29,6 @@ CONFIG_NET_BUF_RX_COUNT=36
# for MbedTLS gives us more control over the heap size.
CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=55000
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
CONFIG_BUILD_ONLY_NO_BLOBS=y
CONFIG_MAX_THREAD_BYTES=3

2
tests/net/lib/lwm2m/interop/prj.conf
View File

@@ -70,7 +70,7 @@ CONFIG_LWM2M_SERVER_DEFAULT_PMIN=1
CONFIG_LWM2M_SERVER_DEFAULT_PMAX=10
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID=y
# Special MbedTLS changes

2
tests/net/socket/tls_configurations/overlay-tls12.conf
View File

@@ -1,4 +1,4 @@
CONFIG_MBEDTLS_TLS_VERSION_1_2=y
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
CONFIG_PSA_WANT_ALG_TLS12_PRF=y
CONFIG_PSA_WANT_KEY_TYPE_AES=y
CONFIG_PSA_WANT_ALG_CBC_NO_PADDING=y

2
tests/net/socket/tls_configurations/prj.conf
View File

@@ -35,7 +35,7 @@ CONFIG_ENTROPY_GENERATOR=y
# key exchange/certificate + AES encryption). What we want here instead is to
# have a basic configuration in this "prj.conf" file and then add algorithm
# support in overlay files.
CONFIG_MBEDTLS_TLS_VERSION_1_2=n
CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=n
CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=n
CONFIG_MBEDTLS_MD_C=n
CONFIG_MBEDTLS_RSA_C=n

4
tests/net/wifi/configs/testcase.yaml
View File

@@ -21,7 +21,7 @@ tests:
wifi.build.crypto_enterprise:
extra_configs:
- CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE=y
- CONFIG_MBEDTLS_TLS_VERSION_1_2=y
- CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
- CONFIG_EAP_TLS=y
- CONFIG_EAP_TTLS=y
- CONFIG_EAP_PEAP=y
@@ -40,7 +40,7 @@ tests:
wifi.build.wpa3:
extra_configs:
- CONFIG_WIFI_NM_WPA_SUPPLICANT_WPA3=y
- CONFIG_MBEDTLS_TLS_VERSION_1_2=y
- CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
wifi.build.ap:
extra_configs:
- CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y