Merge branch 'bugfix/supplicant_disable_tls_v1.2_backport_v4.1' into 'release/v4.1'

Disable TLS v1.2 (backport v4.1) See merge request espressif/esp-idf!8536
2020-04-28 16:22:26 +08:00 · 2020-04-28 16:22:26 +08:00 · 69c8d9211f
parent 198953df8f 6254bf443e
commit 69c8d9211f
3 changed files with 10 additions and 1 deletions
--- a/components/wpa_supplicant/CMakeLists.txt
+++ b/components/wpa_supplicant/CMakeLists.txt
@ -112,6 +112,5 @@ target_compile_definitions(${COMPONENT_LIB} PRIVATE
    CONFIG_ECC
    CONFIG_IEEE80211W
    CONFIG_WPA3_SAE
-    CONFIG_TLSV12
    CONFIG_SHA256
    )
--- a/components/wpa_supplicant/Kconfig
+++ b/components/wpa_supplicant/Kconfig
@ -6,4 +6,10 @@ menu "Supplicant"
        help
            Select this option to use MbedTLS crypto API's which utilize hardware acceleration.

+    config WPA_TLS_V12
+        bool "Enable TLS v1.2"
+        default n
+        help
+            Select this to enable TLS v1.2 for WPA2-Enterprise Authentication.
+
 endmenu
--- a/components/wpa_supplicant/port/include/supplicant_opt.h
+++ b/components/wpa_supplicant/port/include/supplicant_opt.h
@ -21,4 +21,8 @@
 #define USE_MBEDTLS_CRYPTO 1
 #endif

+#if CONFIG_WPA_TLS_V12
+#define CONFIG_TLSV12
+#endif
+
 #endif /* _SUPPLICANT_OPT_H */