From nobody Tue Apr 29 11:41:37 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zmz1G1j9Zz5tvKl; Tue, 29 Apr 2025 11:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zmz1F3Hkxz3wgX; Tue, 29 Apr 2025 11:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8yeAFirc19Azm8m5De/gkr/mMzKx2/Rf/Y+aT3Jo0c=; b=KhHR53k1Oj/Uf6kWyaLnfJmcB/gpeTkd/gVIChUi+gCdMBBfZKeoGHLk8XJd9etjTclEe1 NCXoZQ1Hn9MlyrBVtYs91QuXSHLfyDEyf1zWtg/ByNvq17qQCva09yNkZihlc54gSRvZo8 FW59rqKNLQXSRmV8Hj5+vasxK7rPReykrN0zuMXg9YURmJvgfdGDjaO/k96HVwTyvCiUUX VY4ls7OclLFyaW4j1ofJt8+C7zHTsyQTjUzRLqPVeUkb05giH6NUAgV2eWid3ob6kl0caj M3vN0ZlCd8fpmMxW18IcwWIX0tpxMSzATeYIZ+zy3DZwUuXMH2+tbqbZ7mRiGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926897; a=rsa-sha256; cv=none; b=O5D23CksdiAZDlPXDMbjLATMz8LWSQ7/DLSwwIsGVyLzb/rVUi64+AfCv6lLE1FyN1h2Pj ee4TGDYgkIjN9tBTdMB1jIxXvGvxxSruAb+Fbd01fUCBf5MHISq55SS2ZHTCf/ozEj4NKD WeP2SRGcGJmx6RgBixsZrZhKnTwvzJpYmvv3qQXykTUPUpBA8Fhk4aTUw3aRXKrY2UINPl pdEKjrOkt7envN8UA2jkSmINr0L5DGals9tG3ZdjeYAhYgTMjzHyEONeq2fGqcSqdnzdCw rZTI4Fs4ubL2+ODryD3Xc0Gh38TLpQzL8sCxhaoAdmHHHIqZ4+NdOthJaRuaIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8yeAFirc19Azm8m5De/gkr/mMzKx2/Rf/Y+aT3Jo0c=; b=nTEHj7ju7tgtwfxMyL0h8Bwj2EJLReCO69TWXKm5XtSZVkn5YLuz+zEePwxhFLYfT60ZP2 6CwBVeZmHPOe+sgT/IpxvxzAE2WIFbHU+JUgXsktxFKgV7RJ+pKDgrU7zkbXzdvOdAMUXi 7rZhrKSlwCgZ+ZL1HGW11sO42pqExXCsT4GTGVx4fXB4yCeVs4xnGSa1Xb2UwftUW2OvjT qX3Tf7/3qZqQjbndUqF1uPHU2/rBQh5p0EuZmJfd2X3hWZLsXDjpGgTlgWHPqOvsyD+qvv /51bSyeRv4BwiHOcda3OCS7PwE2RHfPdHf2/Gld7X8DZ1GLIQJt1EByBbthATw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zmz1F2Gfhz3f3; Tue, 29 Apr 2025 11:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53TBfba1045734; Tue, 29 Apr 2025 11:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBfbBR045731; Tue, 29 Apr 2025 11:41:37 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:37 GMT Message-Id: <202504291141.53TBfbBR045731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0ed97681a30d - stable/14 - net80211: add the 802.11-2016 cipher list to the crypto array set. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ed97681a30d968c03c5526739948da29d3f2215 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed97681a30d968c03c5526739948da29d3f2215 commit 0ed97681a30d968c03c5526739948da29d3f2215 Author: Adrian Chadd AuthorDate: 2024-04-22 03:25:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:28 +0000 net80211: add the 802.11-2016 cipher list to the crypto array set. These are the bitmap / cipher module number fields used for net80211 ciphers. This requires a kernel recompile, but nothing (currently) in userland is using these. Differential Revision: https://reviews.freebsd.org/D44899 Reviewed by: bz, cc (cherry picked from commit 05540e62e75f8b2de7e337738eacfb0b159515a6) --- sys/net80211/ieee80211_crypto.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index 49e3f93410b2..fcc6973dd62e 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -137,8 +137,17 @@ struct ieee80211_key { #define IEEE80211_CIPHER_TKIPMIC 4 /* TKIP MIC capability */ #define IEEE80211_CIPHER_CKIP 5 #define IEEE80211_CIPHER_NONE 6 /* pseudo value */ +#define IEEE80211_CIPHER_AES_CCM_256 7 +#define IEEE80211_CIPHER_BIP_CMAC_128 8 +#define IEEE80211_CIPHER_BIP_CMAC_256 9 +#define IEEE80211_CIPHER_BIP_GMAC_128 10 +#define IEEE80211_CIPHER_BIP_GMAC_256 11 +#define IEEE80211_CIPHER_AES_GCM_128 12 +#define IEEE80211_CIPHER_AES_GCM_256 13 -#define IEEE80211_CIPHER_MAX (IEEE80211_CIPHER_NONE+1) +#define IEEE80211_CIPHER_LAST 13 + +#define IEEE80211_CIPHER_MAX (IEEE80211_CIPHER_LAST+1) /* capability bits in ic_cryptocaps/iv_cryptocaps */ #define IEEE80211_CRYPTO_WEP (1<