Merge branch 'feature/mbedtls_for_guomi' into 'master'

donghengqaz · donghengqaz · commit 7a30d865e60b · 2021-07-26T11:30:03.000Z
feat(mbedtls): modify makefile for esp-mbedtls-guomi build

See merge request sdk/ESP8266_RTOS_SDK!1591
diff --git a/components/mbedtls/CMakeLists.txt b/components/mbedtls/CMakeLists.txt
@@ -17,6 +17,20 @@ get_target_property(src_tls mbedtls SOURCES)
 list(REMOVE_ITEM src_tls net_sockets.c)
 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)
 
 # Add port files to mbedtls targets
diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig
@@ -328,6 +328,13 @@ menu "mbedTLS"
         depends on MBEDTLS_TLS_ENABLED
         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
         bool "Support DTLS protocol (all versions)"
         default n
diff --git a/components/mbedtls/component.mk b/components/mbedtls/component.mk
@@ -8,6 +8,20 @@ COMPONENT_SRCDIRS := mbedtls/library port port/$(IDF_TARGET)
 
 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
 
 ifdef CONFIG_MBEDTLS_DYNAMIC_BUFFER
