From owner-cvs-all@FreeBSD.ORG Fri Dec 31 21:54:54 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49A4516A4CE; Fri, 31 Dec 2004 21:54:54 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37DA643D1D; Fri, 31 Dec 2004 21:54:54 +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 iBVLssbW043914; Fri, 31 Dec 2004 21:54:54 GMT (envelope-from sam@repoman.freebsd.org) Received: (from sam@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBVLsst0043913; Fri, 31 Dec 2004 21:54:54 GMT (envelope-from sam) Message-Id: <200412312154.iBVLsst0043913@repoman.freebsd.org> From: Sam Leffler Date: Fri, 31 Dec 2004 21:54:54 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/net80211 ieee80211_ioctl.h ieee80211_output.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Dec 2004 21:54:54 -0000 sam 2004-12-31 21:54:54 UTC FreeBSD src repository Modified files: sys/net80211 ieee80211_ioctl.h ieee80211_output.c Log: Relearn how WPA keying is supposed to work and fix WPA+WME while we're at it: o WPA/802.11i has a unicast key and a group key; in station mode everything is sent with the unicast key--we were consulting the destination mac address and incorrectly using the group key o (perpetuate fallback use of the default tx key to maintain compatibility with the way wpa_supplicant works) o correct EAPOL encryption logic to check unicast key instead of assuming other state implies this o move QoS encapsulation up to before enmic work so TKIP has the information required to calculate the pseudo-header o do not do QoS-encapsulation of EAPOL frames as some ap's do the wrong thing with such frames (may need to revisit this if ap's start dropping non-QoS frames from stations assoc'd with QoS) o move ieee80211_mbuf_adjust closer to its caller Revision Changes Path 1.7 +1 -0 src/sys/net80211/ieee80211_ioctl.h 1.14 +128 -111 src/sys/net80211/ieee80211_output.c