From patchwork Thu Aug 13 08:55:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 41004 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7D8rsWD018496 for ; Thu, 13 Aug 2009 08:53:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753781AbZHMIxu (ORCPT ); Thu, 13 Aug 2009 04:53:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753771AbZHMIxu (ORCPT ); Thu, 13 Aug 2009 04:53:50 -0400 Received: from mga11.intel.com ([192.55.52.93]:25438 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753765AbZHMIxu (ORCPT ); Thu, 13 Aug 2009 04:53:50 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 13 Aug 2009 01:43:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.43,373,1246863600"; d="scan'208";a="716428860" Received: from unknown (HELO localhost.localdomain) ([10.239.23.11]) by fmsmga001.fm.intel.com with ESMTP; 13 Aug 2009 01:56:58 -0700 From: Zhu Yi To: j@w1.fi Cc: hostap@lists.shmoo.com, linux-wireless@vger.kernel.org, Zhu Yi Subject: [PATCH] Fix cipher overwide problem for 802.1X WEP Date: Thu, 13 Aug 2009 16:55:30 +0800 Message-Id: <1250153731-17208-1-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.0.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 --- 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. */