From owner-p4-projects@FreeBSD.ORG  Sat Mar 12 06:10:59 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 51BA316A4D0; Sat, 12 Mar 2005 06:10:59 +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 2D36816A4CE
	for <perforce@freebsd.org>; Sat, 12 Mar 2005 06:10:59 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1227943D54
	for <perforce@freebsd.org>; Sat, 12 Mar 2005 06:10:59 +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 j2C6AwmJ085107
	for <perforce@freebsd.org>; Sat, 12 Mar 2005 06:10:58 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2C6AwHv085103
	for perforce@freebsd.org; Sat, 12 Mar 2005 06:10:58 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 12 Mar 2005 06:10:58 GMT
Message-Id: <200503120610.j2C6AwHv085103@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 72949 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: Sat, 12 Mar 2005 06:10:59 -0000

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

Change 72949 by sam@sam_ebb on 2005/03/12 06:10:27

	o reject association requests w/o a wpa/rsn ie when wpa
	  authentication is enabled
	Submitted by:	Divy Le Ray

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_input.c#6 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#6 (text+ko) ====

@@ -2454,6 +2454,23 @@
 			vap->iv_stats.is_rx_assoc_notauth++;
 			return;
 		}
+		if (wpa == NULL && (vap->iv_flags & IEEE80211_F_WPA)) {
+			/*
+			 * When operating with WPA/RSN, there must be
+			 * proper security credentials.
+			 */
+			IEEE80211_DPRINTF(vap,
+			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
+			    "[%s] deny %s request, no WPA/RSN ie\n",
+			    ether_sprintf(wh->i_addr2),
+			    reassoc ? "reassoc" : "assoc");
+			IEEE80211_SEND_MGMT(ni,
+			    IEEE80211_FC0_SUBTYPE_DEAUTH,
+			    IEEE80211_REASON_RSN_REQUIRED);
+			ieee80211_node_leave(ni);
+			vap->iv_stats.is_rx_assoc_badwpaie++;	/*XXX*/
+			return;
+		}
 		if (wpa != NULL) {
 			/*
 			 * Parse WPA information element.  Note that