fix #216

SVN-Revision: 3005

diff --git a/openwrt/package/webif/files/usr/lib/webif/validate.awk b/openwrt/package/webif/files/usr/lib/webif/validate.awk
index da765017d23a47ee492fde3d520a03dc9ea7f841..0aca1b0c8701f15e64f54cf2268abc2f03371d4e 100644 (file)
--- a/openwrt/package/webif/files/usr/lib/webif/validate.awk
+++ b/openwrt/package/webif/files/usr/lib/webif/validate.awk
@@ -70,6 +70,22 @@ $1 == "mac" {
        }
 }
 
+$1 == "wpapsk" {
+       valid_type = 1
+       if (length(value) > 64) {
+               valid = 0
+               verr = "String too long"
+       }
+       if (length(value) < 8) {
+               valid = 0
+               verr = "String too short"
+       }
+       if ((length(value) == 64) && (value ~ /[^0-9a-fA-F]/)) {
+               valid = 0
+               verr = "Invalid hex key"
+       }
+}
+
 valid_type != 1 { valid = 0 }
 
 valid == 1 {

diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh b/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
index c276e7ae6269ffc088d3ac3725cd740251ef0370..ebf844c1a8f547f3da70bf5306f62d2f77cae132 100755 (executable)
--- a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
+++ b/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
@@ -113,7 +113,7 @@ wep|FORM_key1|WEP key 1||$FORM_key1
 wep|FORM_key2|WEP key 2||$FORM_key2
 wep|FORM_key3|WEP key 3||$FORM_key3
 wep|FORM_key4|WEP key 4||$FORM_key4
-string|FORM_wpa_psk|WPA pre-shared key|min=8 max=63 $V_PSK|$FORM_wpa_psk
+wpapsk|FORM_wpa_psk|WPA pre-shared key|$V_PSK|$FORM_wpa_psk
 string|FORM_radius_key|RADIUS server key|min=4 max=63 $V_RADIUS|$FORM_radius_key
 string|FORM_ssid|ESSID|required|$FORM_ssid
 int|FORM_channel|Channel|required min=1 max=$CHANNEL_MAX|$FORM_channel