rpms/wpa_supplicant/FC-5 wpa_supplicant-ctrl-iface-hide-keys.patch, 1.1, 1.2 wpa_supplicant-ssid-len-fix.patch, 1.1, 1.2 wpa_supplicant.config, 1.2, 1.3 wpa_supplicant.spec, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/wpa_supplicant/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv16163

Modified Files:
	wpa_supplicant-ctrl-iface-hide-keys.patch 
	wpa_supplicant-ssid-len-fix.patch wpa_supplicant.config 
	wpa_supplicant.spec 
Log Message:
Update from devel branch:

* Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
- Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)

* Tue Apr 11 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-8
- Fix control interface key obfuscation a bit



wpa_supplicant-ctrl-iface-hide-keys.patch:
 ctrl_iface.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

Index: wpa_supplicant-ctrl-iface-hide-keys.patch
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant-ctrl-iface-hide-keys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-ctrl-iface-hide-keys.patch	28 Feb 2006 05:03:44 -0000	1.1
+++ wpa_supplicant-ctrl-iface-hide-keys.patch	25 Apr 2006 15:27:04 -0000	1.2
@@ -14,8 +14,8 @@
  	*name++ = '\0';
  
 +	/* Only show passwords and keys if requested */
-+	if (!strncmp (name, "wep_key", 7) || !strcmp (name, "psk")
-+		|| !strcmp (name, "password") || !strcmp (name, "pin")) {
++	if (!strncmp (name, "wep_key", 7) || !strncmp (name, "psk", 3)
++		|| !strncmp (name, "password", 8) || !strncmp (name, "pin", 3)) {
 +		show_value = wpa_s->global->params.wpa_debug_show_keys;
 +	}
 +

wpa_supplicant-ssid-len-fix.patch:
 wpa_supplicant.c |    8 ++++++++
 1 files changed, 8 insertions(+)

Index: wpa_supplicant-ssid-len-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant-ssid-len-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_supplicant-ssid-len-fix.patch	2 Apr 2006 15:09:47 -0000	1.1
+++ wpa_supplicant-ssid-len-fix.patch	25 Apr 2006 15:27:04 -0000	1.2
@@ -1,9 +1,14 @@
 --- wpa_supplicant-0.4.8/wpa_supplicant.c.ssid-len-fix	2006-04-01 15:02:58.000000000 -0500
 +++ wpa_supplicant-0.4.8/wpa_supplicant.c	2006-04-01 15:03:02.000000000 -0500
-@@ -1425,6 +1425,9 @@
+@@ -1425,6 +1425,14 @@
  		return NULL;
  	}
  
++	/* Older/incorrect drivers return null-terminated SSIDs with
++	 * the null included in the length.  wpa_supplicant does memcmp()
++	 * with driver-reported SSIDs and SSIDs from the config file, which
++	 * don't include the null in their length.  Badness.
++	 */
 +	if ((ssid_len > 0) && (ssid[ssid_len-1] == '\0'))
 +		ssid_len--;
 +


Index: wpa_supplicant.config
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant.config,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wpa_supplicant.config	27 Mar 2006 19:10:21 -0000	1.2
+++ wpa_supplicant.config	25 Apr 2006 15:27:04 -0000	1.3
@@ -6,6 +6,7 @@
 CONFIG_DRIVER_WEXT=y
 CONFIG_DRIVER_NDISWRAPPER=y
 CONFIG_DRIVER_PRISM54=y
+CONFIG_DRIVER_WIRED=y
 //CONFIG_DRIVER_BROADCOM=y
 //CONFIG_DRIVER_IPW=y
 //CONFIG_DRIVER_BSD=y
@@ -25,3 +26,5 @@
 CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
 //CONFIG_PCSC=y
+CONFIG_PKCS12=y
+CONFIG_SMARTCARD=y


Index: wpa_supplicant.spec
===================================================================
RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wpa_supplicant.spec	2 Apr 2006 15:09:47 -0000	1.14
+++ wpa_supplicant.spec	25 Apr 2006 15:27:04 -0000	1.15
@@ -2,7 +2,7 @@
 Name: wpa_supplicant
 Epoch: 1
 Version: 0.4.8
-Release: 7.fc5
+Release: 9.fc5
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -127,6 +127,12 @@
 %{_bindir}/wpa_gui
 
 %changelog
+* Tue Apr 25 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-9
+- Enable Wired driver, PKCS12, and Smartcard options (#rh189805#)
+
+* Tue Apr 11 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-8
+- Fix control interface key obfuscation a bit
+
 * Sun Apr  2 2006 Dan Williams <dcbw at redhat.com> - 0.4.8-7
 - Work around older & incorrect drivers that return null-terminated SSIDs