From owner-svn-src-all@freebsd.org Wed Dec 7 04:02:42 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B1EEFC67EC1; Wed, 7 Dec 2016 04:02:42 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6845019E5; Wed, 7 Dec 2016 04:02:42 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB742fQ8047706; Wed, 7 Dec 2016 04:02:41 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB742fZH047704; Wed, 7 Dec 2016 04:02:41 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201612070402.uB742fZH047704@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Wed, 7 Dec 2016 04:02:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309664 - head/sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2016 04:02:42 -0000 Author: adrian Date: Wed Dec 7 04:02:41 2016 New Revision: 309664 URL: https://svnweb.freebsd.org/changeset/base/309664 Log: [net80211] start refactoring out the "am I a wep / group key!" code. This is a bunch of pointer arithmetic that is copypasta'ed everywhere. Let's undo that copypasta. Modified: head/sys/net80211/ieee80211_crypto.c head/sys/net80211/ieee80211_crypto.h Modified: head/sys/net80211/ieee80211_crypto.c ============================================================================== --- head/sys/net80211/ieee80211_crypto.c Wed Dec 7 01:15:10 2016 (r309663) +++ head/sys/net80211/ieee80211_crypto.c Wed Dec 7 04:02:41 2016 (r309664) @@ -520,6 +520,26 @@ ieee80211_crypto_setkey(struct ieee80211 return dev_key_set(vap, key); } +/* + * Return index if the key is a WEP key (0..3); -1 otherwise. + * + * This is different to "get_keyid" which defaults to returning + * 0 for unicast keys; it assumes that it won't be used for WEP. + */ +int +ieee80211_crypto_get_key_wepidx(const struct ieee80211vap *vap, + const struct ieee80211_key *k) +{ + + if (k >= &vap->iv_nw_keys[0] && + k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) + return (k - vap->iv_nw_keys); + return (-1): +} + +/* + * Note: only supports a single unicast key (0). + */ uint8_t ieee80211_crypto_get_keyid(struct ieee80211vap *vap, struct ieee80211_key *k) { Modified: head/sys/net80211/ieee80211_crypto.h ============================================================================== --- head/sys/net80211/ieee80211_crypto.h Wed Dec 7 01:15:10 2016 (r309663) +++ head/sys/net80211/ieee80211_crypto.h Wed Dec 7 04:02:41 2016 (r309664) @@ -202,6 +202,8 @@ void ieee80211_crypto_register(const str void ieee80211_crypto_unregister(const struct ieee80211_cipher *); int ieee80211_crypto_available(u_int cipher); +int ieee80211_crypto_get_key_wepidx(const struct ieee80211vap *, + const struct ieee80211_key *k); uint8_t ieee80211_crypto_get_keyid(struct ieee80211vap *vap, struct ieee80211_key *k); struct ieee80211_key *ieee80211_crypto_get_txkey(struct ieee80211_node *,