From nobody Thu Mar 27 01:28:50 2025 X-Original-To: dev-commits-src-main@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 4ZNQzR1yQwz5rVgV; Thu, 27 Mar 2025 01:28:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNQzR15DRz3R3r; Thu, 27 Mar 2025 01:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743038931; 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=sdeQ/FRUBk9bHPxGdr6yMV26DOrrMIxb7FBzJBhj9BM=; b=m85TDnTj+TTfWvQXFyO/TEdGbqRb0ecJctSvh0fQgXFkf+pp8Z3H5gr2MD/a6byFtbfGsJ RWDPdHzeu2SuhwpxGrsZ/7JZOyaizWdyvjuy9jnGMDTs0bu2Xhr3hTX/nPIUOk0/pl9JsC E0PZxaYS3jxvndT/s8swWVr5F7Ac+C73AjUGttsiaC0QhklF2hTOUYITKPmc1w5EfpZvWq qC2ahu40xCizCiMlu0uJqqnH8NFp/hJLjgTcNmm6DTdmqMCuw+PRENwIioXNPawxyd7Hcq WjJe02v9brfxCWM2LZw62XIjXYogrQAYUYnJLfdfxgc/vUUI43f/Zmvb3RAvRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743038931; a=rsa-sha256; cv=none; b=Ew/6Tss0QjpjgcRmE7c0Rua6jy8BJ6AckF/moQ8S/ea7mIEySt2cCIWFISFDhyrG2GnVGt ITk7gwjuaorSinugbJ0Cw7UGiF3bb+KxL4qYQeTMFT0UsPrgb7BXJfstG3D6mebpJxAHc3 bqIr4dg3BqTNeGYHGZRtmYr90nmflpT05wrp807tt+xEVklB68DiHxl+GxDMLLj0W2gsaf pNvD+AVfmuokWeRQhY09fCzkHfAQNzMM7L6KJvzbZHL/k6aULc0XHoo4anbDEEpznqhX8K tbrG0FpCCUCCfZ/0sOmc3um41KdKBaSYKzqDSbKIEBqEqJlblAOIKFPb+CzoTg== 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=1743038931; 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=sdeQ/FRUBk9bHPxGdr6yMV26DOrrMIxb7FBzJBhj9BM=; b=EOiQWWoAb8aiAh5tW+i8uYSo0Z5YJ6k69+kX979kZmXKhrIJAjovMDgASWdnO62rLJenta oFx78Z50sQh6Lt86Gebx/ScTOcl6JSQJ2IjO4YcplN+C1WjSuSy6oB/W+MIUCELoYm3CKh efdaTJllPpVb8YRl0ANxcFFmEKkbT7+TJd2nkKXGRh8to08D3A9FgLrSEG29EaDVYRm8Kz gAAOHIWdf+ZaRNYt57b38bN2kHzXeYITTZYSsAHHe4G6t3ZUhvxXh+b0en2UZ+o9x/oyXu MK+UPc5dsMjbBQgbvsSiIxJQDtSLvenS2zqwhCLs+qlwmM5oDcWw8sJy4UFM9w== 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 4ZNQzR0KXlzc2l; Thu, 27 Mar 2025 01:28:51 +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 52R1SokT039803; Thu, 27 Mar 2025 01:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52R1Soi3039800; Thu, 27 Mar 2025 01:28:50 GMT (envelope-from git) Date: Thu, 27 Mar 2025 01:28:50 GMT Message-Id: <202503270128.52R1Soi3039800@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: 077108d94ae1 - main - rtwn: add support for AES-GCM-128 in the supported software cipher set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 077108d94ae1928cdeed5e63d87a8b53a9dc0382 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=077108d94ae1928cdeed5e63d87a8b53a9dc0382 commit 077108d94ae1928cdeed5e63d87a8b53a9dc0382 Author: Adrian Chadd AuthorDate: 2025-03-01 04:36:42 +0000 Commit: Adrian Chadd CommitDate: 2025-03-27 01:28:46 +0000 rtwn: add support for AES-GCM-128 in the supported software cipher set I'm testing this with rtwn(4) NICs right now, so enable it here. Locally tested: * RTL8812AU / RTL8821AU, STA mode (with some wpa_supplicant.conf shenanigans to force GCMP as the pairwise key to an OpenWRT AP configured to use GCMP but without requiring MFP.) Differential Revision: https://reviews.freebsd.org/D49190 Reviewed by: bz --- sys/dev/rtwn/if_rtwn.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c index 2003fa7d20be..7df1b78db37b 100644 --- a/sys/dev/rtwn/if_rtwn.c +++ b/sys/dev/rtwn/if_rtwn.c @@ -298,6 +298,11 @@ rtwn_attach(struct rtwn_softc *sc) sc->sc_node_free = ic->ic_node_free; ic->ic_node_free = rtwn_node_free; + /* Note: this has to happen AFTER ieee80211_ifattach() */ + ieee80211_set_software_ciphers(ic, IEEE80211_CRYPTO_WEP | + IEEE80211_CRYPTO_TKIP | IEEE80211_CRYPTO_AES_CCM | + IEEE80211_CRYPTO_AES_GCM_128); + rtwn_postattach(sc); rtwn_radiotap_attach(sc);