From: John Crispin <john@openwrt.org>
Date: Wed, 30 Jul 2008 17:04:50 +0000 (+0000)
Subject: adds option to select tls provider when using wpa_supplicant, fixes #3770
X-Git-Tag: reboot~25970
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=93ce64320a8db6c5cdff9ab1e4e047f4ebd8def4;p=oweals%2Fopenwrt.git

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

SVN-Revision: 12016
---

diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in
index d3700fae84..10b8a43a87 100644
--- 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 d6ff186cc5..d57e3cd2f0 100644
--- 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