Attachment 291830 Details for Bug 213088 – patch against wpa_supplicant-0.5.7-21.fc8

[patch] patch against wpa_supplicant-0.5.7-21.fc8

wpa-drop-unenc-debug.patch (text/plain), 3.89 KB, created by Ilkka Tengvall on 2008-01-16 08:09:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ilkka Tengvall

Created: 2008-01-16 08:09:44 UTC

Size: 3.89 KB

patch

obsolete

>diff -up wpa_supplicant-0.5.7/wpa_supplicant.c.drop-unenc-debug wpa_supplicant-0.5.7/wpa_supplicant.c
>--- wpa_supplicant-0.5.7/wpa_supplicant.c.drop-unenc-debug	2007-12-11 16:48:45.000000000 -0500
>+++ wpa_supplicant-0.5.7/wpa_supplicant.c	2007-12-12 05:38:24.000000000 -0500
>@@ -1361,6 +1361,8 @@ void wpa_supplicant_associate(struct wpa
> 	 * previous association. */
> 	wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
> 
>+wpa_ssid_dump(ssid);
>+
> #ifdef IEEE8021X_EAPOL
> 	if (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
> 		if (ssid->leap) {
>@@ -1419,15 +1421,20 @@ void wpa_supplicant_associate(struct wpa
> 
> 	wpa_clear_keys(wpa_s, bss ? bss->bssid : NULL);
> 	use_crypt = 1;
>+wpa_printf(MSG_DEBUG, "%s: 1 - use_crypt = %d", __FUNCTION__, use_crypt);
> 	cipher_pairwise = cipher_suite2driver(wpa_s->pairwise_cipher);
> 	cipher_group = cipher_suite2driver(wpa_s->group_cipher);
> 	if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE ||
> 	    wpa_s->key_mgmt == WPA_KEY_MGMT_IEEE8021X_NO_WPA) {
> 		if (wpa_s->key_mgmt == WPA_KEY_MGMT_NONE)
>+{
> 			use_crypt = 0;
>+wpa_printf(MSG_DEBUG, "%s: 2 - use_crypt = %d", __FUNCTION__, use_crypt);
>+}
> 		for (i = 0; i < NUM_WEP_KEYS; i++) {
> 			if (ssid->wep_key_len[i]) {
> 				use_crypt = 1;
>+wpa_printf(MSG_DEBUG, "%s: 3 - use_crypt = %d", __FUNCTION__, use_crypt);
> 				wep_keys_set = 1;
> 				wpa_set_wep_key(wpa_s,
> 						i == ssid->wep_tx_keyidx,
>@@ -1444,6 +1451,7 @@ void wpa_supplicant_associate(struct wpa
> 		      EAPOL_FLAG_REQUIRE_KEY_BROADCAST)) == 0 &&
> 		    !wep_keys_set) {
> 			use_crypt = 0;
>+wpa_printf(MSG_DEBUG, "%s: 4 - use_crypt = %d", __FUNCTION__, use_crypt);
> 		} else {
> 			/* Assume that dynamic WEP-104 keys will be used and
> 			 * set cipher suites in order for drivers to expect
>@@ -1458,6 +1466,7 @@ void wpa_supplicant_associate(struct wpa
> 		wpa_supplicant_set_wpa_none_key(wpa_s, ssid);
> 	}
> 
>+wpa_printf(MSG_DEBUG, "%s: 5 - use_crypt = %d before drop_unencrypted() call", __FUNCTION__, use_crypt);
> 	wpa_drv_set_drop_unencrypted(wpa_s, use_crypt);
> 	wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATING);
> 	os_memset(&params, 0, sizeof(params));
>diff -up wpa_supplicant-0.5.7/driver_wext.c.drop-unenc-debug wpa_supplicant-0.5.7/driver_wext.c
>--- wpa_supplicant-0.5.7/driver_wext.c.drop-unenc-debug	2007-12-11 16:48:45.000000000 -0500
>+++ wpa_supplicant-0.5.7/driver_wext.c	2007-12-11 16:48:45.000000000 -0500
>@@ -1626,15 +1626,18 @@ static int wpa_driver_wext_set_counterme
> 					      enabled);
> }
> 
>-
>+#include <errno.h>
> static int wpa_driver_wext_set_drop_unencrypted(void *priv,
> 						int enabled)
> {
>+int ret;
> 	struct wpa_driver_wext_data *drv = priv;
>-	wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
>+wpa_printf(MSG_DEBUG, "%s: enabled = %d", __FUNCTION__, enabled);
> 	drv->use_crypt = enabled;
>-	return wpa_driver_wext_set_auth_param(drv, IW_AUTH_DROP_UNENCRYPTED,
>+	ret = wpa_driver_wext_set_auth_param(drv, IW_AUTH_DROP_UNENCRYPTED,
> 					      enabled);
>+wpa_printf(MSG_DEBUG, "%s: IW_AUTH_DROP_UNENCRYPTED returned %d (%s)", __FUNCTION__, ret, strerror(errno));
>+return ret;
> }
> 
> 
>--- wpa_supplicant-0.5.7-debug/config.h	2008-01-15 18:16:06.000000000 +0200
>+++ wpa_supplicant-0.5.7/config.h	2008-01-15 18:15:28.000000000 +0200
>@@ -336,4 +336,6 @@
>  */
> int wpa_config_write(const char *name, struct wpa_config *config);
> 
>+void wpa_ssid_dump(struct wpa_ssid *ssid);
>+
> #endif /* CONFIG_H */
>--- wpa_supplicant-0.5.7-debug/config.c	2008-01-15 18:16:06.000000000 +0200
>+++ wpa_supplicant-0.5.7/config.c	2008-01-15 18:15:28.000000000 +0200
>@@ -1755,3 +1754,19 @@
> 	}
> }
> #endif /* CONFIG_NO_STDOUT_DEBUG */
>+
>+void wpa_ssid_dump(struct wpa_ssid *ssid)
>+{
>+	int i;
>+
>+	wpa_printf(MSG_DEBUG, "*** Dumping ssid %p", ssid);
>+	for (i = 0; i < sizeof(ssid_fields) / sizeof(struct parse_data); i++) {
>+		const struct parse_data *entry = &ssid_fields[i];
>+		char *val = wpa_config_get(ssid, entry->name);
>+
>+		wpa_printf(MSG_DEBUG, "  %s : %s", entry->name, val);
>+		os_free(val);
>+	}
>+	wpa_printf(MSG_DEBUG, "  DONE");
>+}
>+

Actions: View | Diff

Attachments on bug 213088: 139758 | 139759 | 288571 | 291830 | 291831 | 291864 | 291894