aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-07-30 17:04:50 +0000
committerJohn Crispin <john@openwrt.org>2008-07-30 17:04:50 +0000
commit93ce64320a8db6c5cdff9ab1e4e047f4ebd8def4 (patch)
treefdf0f21c3c5fbec5781020d4683e25fdb0a01d32
parentcc99e5b35dad9198a26dd882852787f40b56d8f6 (diff)
downloadupstream-93ce64320a8db6c5cdff9ab1e4e047f4ebd8def4.tar.gz
upstream-93ce64320a8db6c5cdff9ab1e4e047f4ebd8def4.tar.bz2
upstream-93ce64320a8db6c5cdff9ab1e4e047f4ebd8def4.zip
adds option to select tls provider when using wpa_supplicant, fixes #3770
SVN-Revision: 12016
-rw-r--r--package/wpa_supplicant/Config.in12
-rw-r--r--package/wpa_supplicant/Makefile2
2 files changed, 14 insertions, 0 deletions
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