From 3af89eb5857600d79926ac2c4bf032d239422536 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 24 Feb 2013 13:47:41 +0100
Subject: [PATCH] wlanap.cgi: check pwd for non-ascii chars.

---
 html/cgi-bin/wlanap.cgi | 9 ++++++---
 lfs/hostapd             | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 5eb480007b..2233af9196 100644
--- 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 2ce9c21868..690f138b79 100644
--- 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       = ""
 
-- 
2.39.5