From: Jo-Philipp Wich Date: Tue, 24 Jan 2012 21:01:16 +0000 (+0000) Subject: luci-0.10: merge r8190 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c1dbd33cfb009e63b231e6f90b1c3e41cae529de;p=oweals%2Fluci.git luci-0.10: merge r8190 --- diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua index fdbaae479..b007c8666 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -869,6 +869,12 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then cacert:depends({mode="sta-wds", encryption="wpa"}) cacert:depends({mode="sta-wds", encryption="wpa2"}) + clientcert = s:taboption("encryption", FileUpload, "client_cert", translate("Path to Client-Certificate")) + clientcert:depends({mode="sta", encryption="wpa"}) + clientcert:depends({mode="sta", encryption="wpa2"}) + clientcert:depends({mode="sta-wds", encryption="wpa"}) + clientcert:depends({mode="sta-wds", encryption="wpa2"}) + privkey = s:taboption("encryption", FileUpload, "priv_key", translate("Path to Private Key")) privkey:depends({mode="sta", eap_type="tls", encryption="wpa2"}) privkey:depends({mode="sta", eap_type="tls", encryption="wpa"})