From owner-p4-projects@FreeBSD.ORG  Fri Dec  3 01:02:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E064B16A4D1; Fri,  3 Dec 2004 01:02:15 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B636416A4CF
	for <perforce@freebsd.org>; Fri,  3 Dec 2004 01:02:15 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A667043D49
	for <perforce@freebsd.org>; Fri,  3 Dec 2004 01:02:15 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB312Fij024493
	for <perforce@freebsd.org>; Fri, 3 Dec 2004 01:02:15 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB312FJR024490
	for perforce@freebsd.org; Fri, 3 Dec 2004 01:02:15 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 3 Dec 2004 01:02:15 GMT
Message-Id: <200412030102.iB312FJR024490@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 66290 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Dec 2004 01:02:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=66290

Change 66290 by sam@sam_ebb on 2004/12/03 01:02:08

	hack: reorder the unicast cipher selectors in WPA/RSN ie's
	to match that used by hostapd; otherwise the supplicant may
	barf if it blindly compares the ie in the probe response to
	the ie in the PTK handshake

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#19 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#19 (text+ko) ====

@@ -683,14 +683,14 @@
 	/* unicast cipher list */
 	selcnt = frm;
 	ADDSHORT(frm, 0);			/* selector count */
+	if (rsn->rsn_ucastcipherset & (1<<IEEE80211_CIPHER_AES_CCM)) {
+		selcnt[0]++;
+		ADDSELECTOR(frm, cipher_suite[IEEE80211_CIPHER_AES_CCM]);
+	}
 	if (rsn->rsn_ucastcipherset & (1<<IEEE80211_CIPHER_TKIP)) {
 		selcnt[0]++;
 		ADDSELECTOR(frm, cipher_suite[IEEE80211_CIPHER_TKIP]);
 	}
-	if (rsn->rsn_ucastcipherset & (1<<IEEE80211_CIPHER_AES_CCM)) {
-		selcnt[0]++;
-		ADDSELECTOR(frm, cipher_suite[IEEE80211_CIPHER_AES_CCM]);
-	}
 
 	/* authenticator selector list */
 	selcnt = frm;
@@ -766,14 +766,14 @@
 	/* unicast cipher list */
 	selcnt = frm;
 	ADDSHORT(frm, 0);			/* selector count */
+	if (rsn->rsn_ucastcipherset & (1<<IEEE80211_CIPHER_AES_CCM)) {
+		selcnt[0]++;
+		ADDSELECTOR(frm, cipher_suite[IEEE80211_CIPHER_AES_CCM]);
+	}
 	if (rsn->rsn_ucastcipherset & (1<<IEEE80211_CIPHER_TKIP)) {
 		selcnt[0]++;
 		ADDSELECTOR(frm, cipher_suite[IEEE80211_CIPHER_TKIP]);
 	}
-	if (rsn->rsn_ucastcipherset & (1<<IEEE80211_CIPHER_AES_CCM)) {
-		selcnt[0]++;
-		ADDSELECTOR(frm, cipher_suite[IEEE80211_CIPHER_AES_CCM]);
-	}
 
 	/* authenticator selector list */
 	selcnt = frm;
@@ -811,10 +811,10 @@
 {
 
 	KASSERT(ic->ic_flags & IEEE80211_F_WPA, ("no WPA/RSN!"));
+	if (ic->ic_flags & IEEE80211_F_WPA2)
+		frm = ieee80211_setup_rsn_ie(ic, frm);
 	if (ic->ic_flags & IEEE80211_F_WPA1)
 		frm = ieee80211_setup_wpa_ie(ic, frm);
-	if (ic->ic_flags & IEEE80211_F_WPA2)
-		frm = ieee80211_setup_rsn_ie(ic, frm);
 	return frm;
 }