espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/mbedtls_guomi' into 'master'

Browse Source 
mbedtls: Provision for GM/T SSL 1.1 support under config option

Closes IDF-2977

See merge request espressif/esp-idf!12532
This commit is contained in:
Mahavir Jain
2021-07-29 04:49:08 +00:00
parent 30056c0116 b8892137f5
commit 8a51fb0361
3 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/mbedtls/CMakeLists.txt
View File

@@ -71,6 +71,20 @@ get_target_property(src_tls mbedtls SOURCES)
list(REMOVE_ITEM src_tls net_sockets.c) list(REMOVE_ITEM src_tls net_sockets.c)
set_property(TARGET mbedtls PROPERTY SOURCES ${src_tls}) set_property(TARGET mbedtls PROPERTY SOURCES ${src_tls})
if(CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1)
get_target_property(src_tls mbedtls SOURCES)
list(REMOVE_ITEM src_tls ssl_ciphersuites.c ssl_cli.c ssl_tls.c)
set_property(TARGET mbedtls PROPERTY SOURCES ${src_tls})
get_target_property(src_crypto mbedcrypto SOURCES)
list(REMOVE_ITEM src_crypto cipher_wrap.c ecdsa.c ecp.c ecp_curves.c oid.c pk_wrap.c)
set_property(TARGET mbedcrypto PROPERTY SOURCES ${src_crypto})
get_target_property(src_x509 mbedx509 SOURCES)
list(REMOVE_ITEM src_x509 x509_crt.c)
set_property(TARGET mbedx509 PROPERTY SOURCES ${src_x509})
endif()
set(mbedtls_targets mbedtls mbedcrypto mbedx509) set(mbedtls_targets mbedtls mbedcrypto mbedx509)
set(mbedtls_target_sources "${COMPONENT_DIR}/port/mbedtls_debug.c" set(mbedtls_target_sources "${COMPONENT_DIR}/port/mbedtls_debug.c"

7
components/mbedtls/Kconfig
View File

@@ -538,6 +538,13 @@ menu "mbedTLS"
depends on MBEDTLS_TLS_ENABLED depends on MBEDTLS_TLS_ENABLED
default y default y
config MBEDTLS_SSL_PROTO_GMTSSL1_1
bool "Support GM/T SSL 1.1 protocol"
depends on MBEDTLS_TLS_ENABLED
default n
help
Provisions for GM/T SSL 1.1 support
config MBEDTLS_SSL_PROTO_DTLS config MBEDTLS_SSL_PROTO_DTLS
bool "Support DTLS protocol (all versions)" bool "Support DTLS protocol (all versions)"
default n default n

14
components/mbedtls/component.mk
View File

@@ -9,6 +9,20 @@ COMPONENT_SRCDIRS := mbedtls/library port port/$(IDF_TARGET) port/sha port/sha/p
COMPONENT_OBJEXCLUDE := mbedtls/library/net_sockets.o COMPONENT_OBJEXCLUDE := mbedtls/library/net_sockets.o
ifdef CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1
COMPONENT_OBJEXCLUDE += \
mbedtls/library/ssl_ciphersuites.o \
mbedtls/library/ecp.o \
mbedtls/library/cipher_wrap.o \
mbedtls/library/oid.o \
mbedtls/library/ecp_curves.o \
mbedtls/library/pk_wrap.o \
mbedtls/library/ecdsa.o \
mbedtls/library/x509_crt.o \
mbedtls/library/ssl_tls.o \
mbedtls/library/ssl_cli.o
endif
COMPONENT_SUBMODULES += mbedtls COMPONENT_SUBMODULES += mbedtls