summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-10 12:23:41 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-10 12:23:41 +0000
commitea689bc52eb353b1d5bb92be1110a491f2072c40 (patch)
tree508c01fb72f2194cd2f7ad79e02c17f0cd6f7267
parent1fc290f2e3fe2529f5f48b6a070516ed4edd3ea4 (diff)
[package] hostapd: introduce new default-off option "auth_cache" which controls PMKSA and Opportunistic Key Caching (#12129)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33359 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/hostapd/Makefile2
-rw-r--r--package/hostapd/files/hostapd.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 122ee9b1a..e438ef349 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd
PKG_VERSION:=20120428
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_REV:=1f0cc27eb98f7d1af9c64d0752238184cbdb9a24
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 10062307e..fc84ec50f 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -84,6 +84,9 @@ hostapd_set_bss_options() {
config_get auth_secret "$vif" auth_secret
[ -z "$auth_secret" ] && config_get auth_secret "$vif" key
append "$var" "auth_server_shared_secret=$auth_secret" "$N"
+ config_get_bool auth_cache "$vif" auth_cache 0
+ [ "$auth_cache" -gt 0 ] || append "$var" "disable_pmksa_caching=1" "$N"
+ [ "$auth_cache" -gt 0 ] || append "$var" "okc=0" "$N"
config_get acct_server "$vif" acct_server
[ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N"
config_get acct_port "$vif" acct_port
@@ -174,7 +177,7 @@ hostapd_set_bss_options() {
if [ "$wpa" -ge "2" ]
then
# RSN -> allow preauthentication
- config_get rsn_preauth "$vif" rsn_preauth
+ config_get_bool rsn_preauth "$vif" rsn_preauth "$auth_cache"
if [ -n "$bridge" -a "$rsn_preauth" = 1 ]
then
append "$var" "rsn_preauth=1" "$N"