From nobody Tue May 14 21:39:47 2024 X-Original-To: dev-commits-src-all@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 4Vf8rz6MZBz5L3yR; Tue, 14 May 2024 21:39:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vf8rz4q4qz4SgX; Tue, 14 May 2024 21:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722787; 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=Iynvmonh+ETdDrtJPCs+kP0r7Dmq0LpY8H6ano30XSM=; b=Kir6+2FTYSv/mTh9OuUjMnnsr0HClhgOoWTzjVUndoyi2l6HhXbRZNJ7MGSPNNRTiRYM16 aYnlCkb+AQZ0CMmLoj9NwBWjwpmISdvhdJuo295KLqGwsBvW3k1/jY5/HvAGYWSxuYlu5u /PwVVRppXfH5eFm153kusRPqFytDa9EqQA8zqu5IqG6CutiLJqK1VyoeVFKGBhZvcWE37k B2O30nK1VQsa3YyxYeNHl9KO8zcnRFJLL5wL7CVRQ4goqcVOrmdDi/YcPVC1p8a2jo3D2i c99uA9M6KEk2pLzsgZsHcNVRKgPmIDRYAqhDSrMzJGyMmNPyUB1grPJqRnXuLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722787; a=rsa-sha256; cv=none; b=udNvhvKrGNWpTjVxIY5ZavKJfHH8XQMZ9PKj1U+4O8e1eEQidUE95BdrhkkQfMDAqwZjM5 c0XRXls4TeU+a3+JafYF2JG4++hlXnUyJH7S4DSPll2q07TRVpcxSFqge9usApIwu6DjQE g6stDXOxOVfVYKBFpPeEI6HPG9zKED5Jfr2jcc7LZb4427EqwQTgh+Lk17/nn3DrMKc3nE TNFn6Cz1VjgUWOPe7avi6RWT8pgRZubrfrhvasEbQfVj2O6VFwJnonz6EIP8Rz19HeUwL7 /HMLhBaJupFz/92nNO9QR1Pg24u5yWPx/QJXgat21DX3mDHRYnOSGbEkUY/Wxg== 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=1715722787; 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=Iynvmonh+ETdDrtJPCs+kP0r7Dmq0LpY8H6ano30XSM=; b=Ap8smtBtaWsjxRnNdKvn7oPDVSsFutdr3WiEN8lM6tJut1wYiV9t24FOiGHj7MsDraR/Om AEyuVWTFfSRy8SNBN8+sWr8wTqOP/DkSJfCpPXm7YzdZbI6A+CsocB51jSQGthGSCAmGdc UD5lUs9mJ6fdWywFHAlciHqKKoQV3rlo2fzw8fJa+EUzPHi26ldF9/aKm0LjuwednYkHd0 mq3xfXAlaY8iwsWgO1fXsekihBk/wOlSGX0aba+CIMu855RurMhAldAQupgh5t1OEMRPRI N/o9UlQqK73I6Uj9NwVy04W1k84K3bzFLceukV+BM3ZgYSu/P2DoBnRGyawM/g== 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 4Vf8rz46byznvh; Tue, 14 May 2024 21:39:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44ELdlKl094286; Tue, 14 May 2024 21:39:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELdlcI094283; Tue, 14 May 2024 21:39:47 GMT (envelope-from git) Date: Tue, 14 May 2024 21:39:47 GMT Message-Id: <202405142139.44ELdlcI094283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 05540e62e75f - main - net80211: add the 802.11-2016 cipher list to the crypto array set. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05540e62e75f8b2de7e337738eacfb0b159515a6 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=05540e62e75f8b2de7e337738eacfb0b159515a6 commit 05540e62e75f8b2de7e337738eacfb0b159515a6 Author: Adrian Chadd AuthorDate: 2024-04-22 03:25:33 +0000 Commit: Adrian Chadd CommitDate: 2024-05-14 21:39:00 +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 --- 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 9637278701ff..e09b822289d7 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<