OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wpa_supplicant?expand=0&rev=18

wpa_supplicant-hide_secrets-2.patch

@@ -0,0 +1,60 @@
+iff -ur BUILD/wpa_supplicant-0.6.4/wpa_supplicant/ctrl_iface.c BUILD2/wpa_supplicant-0.6.4/wpa_supplicant/ctrl_iface.c
+--- BUILD/wpa_supplicant-0.6.4/wpa_supplicant/ctrl_iface.c	2008-08-10 19:33:12.000000000 +0200
++++ BUILD2/wpa_supplicant-0.6.4/wpa_supplicant/ctrl_iface.c	2008-12-08 15:36:59.000000000 +0100
+@@ -798,6 +798,8 @@
+ 	int id;
+ 	struct wpa_ssid *ssid;
+ 	char *name, *value;
++	int show_value = 1;
++	const char *nokey = "[REMOVED]";
+ 
+ 	/* cmd: "<network id> <variable name> <value>" */
+ 	name = os_strchr(cmd, ' ');
+@@ -805,6 +807,15 @@
+ 		return -1;
+ 	*name++ = '\0';
+ 
++	/* Only show passwords and keys if requested */
++	if (!strncmp (name, "wep_key", 7)
++			|| !strncmp (name, "psk", 3)
++			|| !strncmp (name, "password", 8)
++			|| !strncmp (name, "pin", 3)
++			|| !strncmp (name, "private_key_passwd", 18)) {
++		show_value = wpa_s->global->params.wpa_debug_show_keys;
++	}
++
+ 	value = os_strchr(name, ' ');
+ 	if (value == NULL)
+ 		return -1;
+@@ -1346,6 +1358,19 @@
+ 	    os_strncmp(buf, "SET_NETWORK ", 12) == 0) {
+ 		wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
+ 				      (const u8 *) buf, os_strlen(buf));
++	} else if (strncmp(buf, "SET_NETWORK ", 12) == 0) {
++		/* Check for forbidden material here too */
++		if (strstr (buf, " wep_key")
++				|| strstr (buf, " psk ")
++				|| strstr (buf, " password ")
++				|| strstr (buf, " pin ")
++				|| strstr (buf, " private_key_passwd ")) {
++			wpa_hexdump_ascii_key(MSG_DEBUG, "RX ctrl_iface",
++				      (const u8 *) buf, os_strlen(buf));
++		} else {
++			wpa_hexdump_ascii(MSG_DEBUG, "RX ctrl_iface",
++					  (const u8 *) buf, os_strlen(buf));
++		}
+ 	} else {
+ 		wpa_hexdump_ascii(MSG_DEBUG, "RX ctrl_iface",
+ 				  (const u8 *) buf, os_strlen(buf));
+diff -ur BUILD/wpa_supplicant-0.6.4/wpa_supplicant/config.c BUILD2//wpa_supplicant-0.6.4/wpa_supplicant/config.c
+--- BUILD/wpa_supplicant-0.6.4/wpa_supplicant/config.c	2008-12-08 16:35:13.000000000 +0100
++++ BUILD2//wpa_supplicant-0.6.4/wpa_supplicant/config.c	2008-12-08 16:34:25.000000000 +0100
+@@ -1001,7 +1001,7 @@
+ 				   "password.", line);
+ 			return -1;
+ 		}
+-		wpa_hexdump_ascii(MSG_MSGDUMP, data->name,
++		wpa_hexdump_ascii_key(MSG_MSGDUMP, data->name,
+ 				  (u8 *) tmp, res_len);
+ 
+ 		os_free(ssid->eap.password);

wpa_supplicant.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec  8 15:45:55 CET 2008 - hschaa@suse.de
+
+- Add patch wpa_supplicant-hide_secrets-2.patch to _not_ print
+  passwords in clear text when started by NM with enabled debug
+  output
+
 -------------------------------------------------------------------
 Mon Nov 10 17:35:43 EET 2008 - tambet@novell.com
 

wpa_supplicant.spec

@@ -22,7 +22,7 @@ Name:           wpa_supplicant
 BuildRequires:  dbus-1-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel
 Url:            http://hostap.epitest.fi/wpa_supplicant/
 Version:        0.6.4
-Release:        15
+Release:        16
 License:        BSD 3-Clause; GPL v2 or later
 Group:          Productivity/Networking/Other
 Summary:        WPA supplicant implementation
@@ -41,6 +41,7 @@ Patch7:         wpa_supplicant-dont_report_empty_initial_scan.patch
 Patch8:         wpa_supplicant-fix_set_mode.patch
 Patch9:         wpa_supplicant-pkcs11-init-args.patch
 Patch10:        wpa_supplicant-dbus-reset-eapol.patch
+Patch11:        wpa_supplicant-hide_secrets-2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -85,6 +86,7 @@ cp %{SOURCE1} wpa_supplicant/.config
 %patch5 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p2
 
 %build
 cd wpa_supplicant
@@ -129,6 +131,10 @@ install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
 /usr/sbin/wpa_gui
 
 %changelog
+* Mon Dec 08 2008 hschaa@suse.de
+- Add patch wpa_supplicant-hide_secrets-2.patch to _not_ print
+  passwords in clear text when started by NM with enabled debug
+  output
 * Mon Nov 10 2008 tambet@novell.com
 - Fix a bug where authentication would always fail using PKCS#11
   interface from DBus control interface.
@@ -145,7 +151,7 @@ install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
   mode
 * Mon Sep 29 2008 hschaa@suse.de
 - add roaming capability (FATE 303806)
-* Wed Sep 24 2008 ro@suse.de
+* Tue Sep 23 2008 ro@suse.de
 - drop buildreq for madwifi (dropped package)
 * Tue Sep 02 2008 ro@suse.de
 - update to 0.6.4
@@ -572,7 +578,7 @@ install -m 755 wpa_supplicant/wpa_gui-qt4/wpa_gui %{buildroot}%{_sbindir}
   * fixed couple of unaligned reads in scan result parsing to fix WPA
   connection on some platforms (e.g., ARM)
 - disabled madwifi support on ppc
-* Wed Sep 29 2004 jg@suse.de
+* Tue Sep 28 2004 jg@suse.de
 - added support for ipw2100 driver
 * Tue Aug 31 2004 jg@suse.de
 - added support for writing pid-file