From nobody Tue May 14 21:39:48 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 4Vf8s06Y7yz5L45M; Tue, 14 May 2024 21:39:48 +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 4Vf8s05BDZz4SXG; Tue, 14 May 2024 21:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722788; 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=ONCeVhXkaUpe1p9umGcZ3Z5Y9DmvG5tx4/2F76faofs=; b=PzguWupzfcoI0TK+Ey688075K1fljkEBMi3smsCLXFpC9YefS6PiS0LEaehZ2a+lk5LtAy 6bvWWU+ejGfAuGQ4xbzRwI21nSDId0qS1cLI7D7mSmGAg9++7q5QE/+N55HJ6Tq/Oe0gqE fqmshq85n1GtKVdN/jRPHHh0X+1jdLBuw7Anoz8pCJcWgbmVuknRzDPFLI+awECXHLVbdx YZ3J59Jfd78ZWPbiFXzcukBb98YA6yMOG+8B7+NkHkLZgftg9wG+la0y+PJUOvNUGzvOBR U9wMUMw1kNxbhYUIPvnZr/pAEhCzsVOB/pqNGpCokRCd/1NSmUFh016tC/H0iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722788; a=rsa-sha256; cv=none; b=nrlKVZlDpvtmMol5fsau7K1zm6O80NTRcTUTqY7aiDHpP4kt2NpvsH0Bega8YQER60p4Aj F/9/vMtvVObvfllNCCEWrqGHhaztrlT9gK45S6Cc51Iv/oWXaaNyg00+DL6V2fxlesM0Uf qsIJCrnt5IKC6P+/I6uDC15lWtg0lPbyUsySKAVZmtc6kSiXxHkCUJuXy7j1Evknj6fdbN doTElVRyDfcsOXID/m4Vf51H+iGiqCek58r2b0UkLuOhChTlGNgFSmqYFkOY/qcrA5oPMM 1TxV+JwBW9LXW1uWPC5+/kuTQSfXCc6cXoGRZ0Cd4Mp6dz0T2CNkd+WLTfgQlA== 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=1715722788; 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=ONCeVhXkaUpe1p9umGcZ3Z5Y9DmvG5tx4/2F76faofs=; b=Yw4y6YZMlpoJONZdpCAivH84Im2xA1cggG+Ve8lRIiW+0d2jKJlxkl5vsF3oXAyojdUBMx Ek2ytC4DNsLjC5EivnHryl3/NVS6I4DxQuFR0/ofEy5OD0Z4/rgZsW1efyXeeEkKmZX6JZ 9zptaqii1HiI1xgDbsEH5Wgs0KRNrvPvLDKcLIGze73CAge/JZP8qWE/i8Anfp+3ux2Ixr ag6CN7uk0cmOSTjeR3zxoXQdWHKn0VKwZxJUTwKb/ipoePsri9zDpikvAZyuQxNJddkpFL +EDaiT5VC3Ak08hT2ODW5HVMaQKBcgEx0FTYv+JyiqHZ4v+Se8f8kXIphiEAvA== 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 4Vf8s04nrzzp8x; Tue, 14 May 2024 21:39:48 +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 44ELdmmb094347; Tue, 14 May 2024 21:39:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELdm3x094344; Tue, 14 May 2024 21:39:48 GMT (envelope-from git) Date: Tue, 14 May 2024 21:39:48 GMT Message-Id: <202405142139.44ELdm3x094344@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: 98e8df90b5cc - main - net80211: add placeholder module names for the new ciphers 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: 98e8df90b5cc5180c09e71998e5f3e05c76a4fe1 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=98e8df90b5cc5180c09e71998e5f3e05c76a4fe1 commit 98e8df90b5cc5180c09e71998e5f3e05c76a4fe1 Author: Adrian Chadd AuthorDate: 2024-04-22 03:29:08 +0000 Commit: Adrian Chadd CommitDate: 2024-05-14 21:39:11 +0000 net80211: add placeholder module names for the new ciphers This is effectively a no-op as we currently don't advertise these ciphers as available anywhere. Note though the intent to support 128 and 256 bit ciphers in the same crypto module. Differential Revision: https://reviews.freebsd.org/D44900 Reviewed by: cc, cy Approved by: cc, cy --- sys/net80211/ieee80211_crypto.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index e849fe06db65..3659d3f7c79a 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -274,6 +274,13 @@ static const char *cipher_modnames[IEEE80211_CIPHER_MAX] = { [IEEE80211_CIPHER_TKIPMIC] = "#4", /* NB: reserved */ [IEEE80211_CIPHER_CKIP] = "wlan_ckip", [IEEE80211_CIPHER_NONE] = "wlan_none", + [IEEE80211_CIPHER_AES_CCM_256] = "wlan_ccmp", + [IEEE80211_CIPHER_BIP_CMAC_128] = "wlan_bip_cmac", + [IEEE80211_CIPHER_BIP_CMAC_256] = "wlan_bip_cmac", + [IEEE80211_CIPHER_BIP_GMAC_128] = "wlan_bip_gmac", + [IEEE80211_CIPHER_BIP_GMAC_256] = "wlan_bip_gmac", + [IEEE80211_CIPHER_AES_GCM_128] = "wlan_gcmp", + [IEEE80211_CIPHER_AES_GCM_256] = "wlan_gcmp", }; /* NB: there must be no overlap between user-supplied and device-owned flags */