Skip to content

Commit 76b7383

Browse files
tomi-fontcarlescufi
authored andcommitted
modules: mbedtls: remove Kconfig options for TLS 1.0 and 1.1
Support for those has been removed from Mbed TLS a while ago: Mbed-TLS/mbedtls#4286 Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent b649efe commit 76b7383

File tree

3 files changed

+11
-30
lines changed

3 files changed

+11
-30
lines changed

doc/releases/migration-guide-4.0.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ Modules
3030
Mbed TLS
3131
========
3232

33+
* The Kconfig options ``CONFIG_MBEDTLS_TLS_VERSION_1_0`` and ``CONFIG_MBEDTLS_TLS_VERSION_1_1``
34+
have been removed because Mbed TLS doesn't support TLS 1.0 and 1.1 anymore since v3.0. (:github:`76833`)
35+
3336
Trusted Firmware-M
3437
==================
3538

modules/mbedtls/Kconfig.tls-generic

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,30 @@
44
# Copyright (c) 2018 Nordic Semiconductor ASA
55
# SPDX-License-Identifier: Apache-2.0
66

7-
menu "TLS configuration"
7+
menu "Mbed TLS configuration"
88
depends on MBEDTLS_BUILTIN && MBEDTLS_CFG_FILE = "config-tls-generic.h"
99

10-
menu "Supported TLS version"
11-
12-
config MBEDTLS_TLS_VERSION_1_0
13-
bool "Support for TLS 1.0"
14-
select MBEDTLS_CIPHER
15-
select MBEDTLS_MD5
16-
select MBEDTLS_SHA1
17-
select MBEDTLS_MD
18-
19-
config MBEDTLS_TLS_VERSION_1_1
20-
bool "Support for TLS 1.1 (DTLS 1.0)"
21-
select MBEDTLS_CIPHER
22-
select MBEDTLS_MD5
23-
select MBEDTLS_SHA1
24-
select MBEDTLS_MD
10+
menu "TLS"
2511

2612
config MBEDTLS_TLS_VERSION_1_2
2713
bool "Support for TLS 1.2 (DTLS 1.2)"
2814
select MBEDTLS_CIPHER
2915
select MBEDTLS_MD
3016

17+
if MBEDTLS_TLS_VERSION_1_2
18+
3119
config MBEDTLS_DTLS
3220
bool "Support for DTLS"
33-
depends on MBEDTLS_TLS_VERSION_1_1 || MBEDTLS_TLS_VERSION_1_2
3421

3522
config MBEDTLS_SSL_EXPORT_KEYS
3623
bool "Support for exporting SSL key block and master secret"
37-
depends on MBEDTLS_TLS_VERSION_1_0 || MBEDTLS_TLS_VERSION_1_1 || MBEDTLS_TLS_VERSION_1_2
3824

3925
config MBEDTLS_SSL_ALPN
4026
bool "Support for setting the supported Application Layer Protocols"
41-
depends on MBEDTLS_TLS_VERSION_1_0 || MBEDTLS_TLS_VERSION_1_1 || MBEDTLS_TLS_VERSION_1_2
4227

43-
endmenu
28+
endif
29+
30+
endmenu # TLS
4431

4532
menu "Ciphersuite configuration"
4633

modules/mbedtls/configs/config-tls-generic.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,13 @@
5151
/* mbedTLS feature support */
5252

5353
/* Supported TLS versions */
54-
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_0)
55-
#define MBEDTLS_SSL_PROTO_TLS1
56-
#endif
5754

58-
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_1)
59-
#define MBEDTLS_SSL_PROTO_TLS1_1
60-
#endif
6155

6256
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2)
6357
#define MBEDTLS_SSL_PROTO_TLS1_2
6458
#endif
6559

66-
67-
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_0) || \
68-
defined(CONFIG_MBEDTLS_TLS_VERSION_1_1) || \
69-
defined(CONFIG_MBEDTLS_TLS_VERSION_1_2)
60+
#if defined(CONFIG_MBEDTLS_TLS_VERSION_1_2)
7061

7162
/* Modules required for TLS */
7263
#define MBEDTLS_SSL_TLS_C

0 commit comments

Comments
 (0)