adds option to select tls provider when using wpa_supplicant, fixes #3770

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12016 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index d3700fa..10b8a43 100644 (file)
--- a/package/wpa_supplicant/Config.in
+++ b/package/wpa_supplicant/Config.in
@@ -6,4 +6,16 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
        help
          This disables the timestamp check for certificates in wpa_supplicant
          Useful for devices without RTC that cannot reliably get the real date/time
+choice
+        prompt "Choose TLS provider"
+        default WPA_SUPPLICANT_INTERNAL
+       depends PACKAGE_wpa-supplicant
+
+config WPA_SUPPLICANT_INTERNAL
+       bool "internal"
+
+config WPA_SUPPLICANT_OPENSSL
+       bool "openssl"
+       select PACKAGE_libopenssl
 
+endchoice

diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index d6ff186..d57e3cd 100644 (file)
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -23,6 +23,7 @@ define Package/wpa-supplicant
   SECTION:=net
   CATEGORY:=Network
   TITLE:=WPA Supplicant
+  DEPENDS:=$(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),+libopenssl)
   URL:=http://hostap.epitest.fi/wpa_supplicant/
 endef
 
@@ -52,6 +53,7 @@ TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/madwifi $(if $(CONFIG_WPA_SUPPLICA
 define Build/Configure
        cp $(CONFIG) $(PKG_BUILD_DIR)/wpa_supplicant/.config
        $(if $(CONFIG_PACKAGE_kmod-madwifi),,$(SED) 's,^CONFIG_DRIVER_MADWIFI,#CONFIG_DRIVER_MADWIFI,g' $(PKG_BUILD_DIR)/wpa_supplicant/.config)
+       $(if $(CONFIG_WPA_SUPPLICANT_OPENSSL),$(SED) 's|^CONFIG_TLS.*|CONFIG_TLS=openssl|g' $(PKG_BUILD_DIR)/wpa_supplicant/.config)
 endef
 
 define Build/Compile