linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zhu Yi <yi.zhu@intel.com>
To: j@w1.fi
Cc: hostap@lists.shmoo.com, linux-wireless@vger.kernel.org,
	Zhu Yi <yi.zhu@intel.com>
Subject: [PATCH] Fix cipher overwide problem for 802.1X WEP
Date: Thu, 13 Aug 2009 16:55:30 +0800	[thread overview]
Message-ID: <1250153731-17208-1-git-send-email-yi.zhu@intel.com> (raw)

We set the cipher_pairwise and cipher_group to WEP104 only if they
are not set already. Otherwise WEP40 has no way to be configured.
This problem is found on 802.1X with static WEP.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
 wpa_supplicant/wpa_supplicant.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index d03e9da..f1f929a 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1116,7 +1116,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
 		      EAPOL_FLAG_REQUIRE_KEY_BROADCAST)) == 0 &&
 		    !wep_keys_set) {
 			use_crypt = 0;
-		} else {
+		} else if (cipher_pairwise == WPA_CIPHER_NONE &&
+			   cipher_group == WPA_CIPHER_NONE) {
 			/* Assume that dynamic WEP-104 keys will be used and
 			 * set cipher suites in order for drivers to expect
 			 * encryption. */
-- 
1.6.0.4


             reply	other threads:[~2009-08-13  8:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-13  8:55 Zhu Yi [this message]
2009-08-13  8:55 ` [PATCH] nl80211 connect API support Zhu Yi
2009-08-13  9:11   ` Jouni Malinen
2009-08-13  9:29     ` Zhu Yi
2009-08-13 10:46       ` Jouni Malinen
2009-08-14  4:17         ` Zhu Yi
2009-08-14  5:50           ` Johannes Berg
2009-08-14  7:55             ` Zhu Yi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1250153731-17208-1-git-send-email-yi.zhu@intel.com \
    --to=yi.zhu@intel.com \
    --cc=hostap@lists.shmoo.com \
    --cc=j@w1.fi \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).