From patchwork Wed Nov 16 09:17:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 125964 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id C68D3B6F86 for ; Wed, 16 Nov 2011 20:17:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 5B1209C1A3; Wed, 16 Nov 2011 04:17:47 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m3P7qKLW1pv3; Wed, 16 Nov 2011 04:17:47 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 22EFC9C133; Wed, 16 Nov 2011 04:17:42 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 26F9B9C132 for ; Wed, 16 Nov 2011 04:17:41 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qYPCroiSj-ou for ; Wed, 16 Nov 2011 04:17:37 -0500 (EST) Received: from sipsolutions.net (he.sipsolutions.net [78.46.109.217]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 84C1B9C133 for ; Wed, 16 Nov 2011 04:17:37 -0500 (EST) Received: by sipsolutions.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.77) (envelope-from ) id 1RQbce-0000uA-GY for hostap@lists.shmoo.com; Wed, 16 Nov 2011 10:17:36 +0100 Subject: [PATCH 19/18] driver_nl80211: don't encrypt 802.1X WEP EAPOL From: Johannes Berg To: hostap@lists.shmoo.com In-Reply-To: <20111104103749.617144560@sipsolutions.net> References: <20111104103749.617144560@sipsolutions.net> Date: Wed, 16 Nov 2011 10:17:35 +0100 Message-ID: <1321435055.4773.13.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From: Johannes Berg Set the NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT flag for nl80211 to tell drivers (mac80211) to not encrypt the EAPOL frames for WEP 802.1X. Signed-hostap: Johannes Berg --- src/drivers/driver_nl80211.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 7c56fec..af6c332 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -4985,6 +4985,10 @@ static int wpa_driver_nl80211_set_ap(void *priv, num_suites * sizeof(u32), suites); } + if (params->key_mgmt_suites & WPA_KEY_MGMT_IEEE8021X && + params->pairwise_ciphers & (WPA_CIPHER_WEP104 | WPA_CIPHER_WEP40)) + NLA_PUT_FLAG(msg, NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT); + num_suites = 0; if (params->pairwise_ciphers & WPA_CIPHER_CCMP) suites[num_suites++] = WLAN_CIPHER_SUITE_CCMP;