wlanap.cgi: check pwd for non-ascii chars.

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 5eb480007b2542048256399a98bc67a911639303..2233af91968994bd9d699ebe6f776cbfec0d4d3d 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -124,11 +124,16 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
 }
 
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
-       # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc
+       # verify WPA Passphrase - only with enabled enc
        if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+               # must be 8 .. 63 characters
                if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
                        $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
                }
+               # only ASCII alowed
+               if ( ($wlanapsettings{'PWD'} !~ m/[\x00-\x7f]/) ){
+                       $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
+               }
        }
 
        if ( $errormessage eq '' ){
@@ -394,8 +399,6 @@ print <<END
 END
 ;
 
-#
-# If channel's found use a select dropdown if not a text inputfield.
 if ( scalar @channellist > 0 ){
        print <<END
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>

diff --git a/lfs/hostapd b/lfs/hostapd
index 2ce9c21868be06bf401587f5a25db52865615113..690f138b792620f07a9dc1a5e4b421bd5d602fb1 100644 (file)
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 24
+PAK_VER    = 25
 
 DEPS       = ""