From nobody Thu Mar 27 01:28:54 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 4ZNQzV67rSz5rVjs; Thu, 27 Mar 2025 01:28:54 +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 4ZNQzV3BJnz3R9T; Thu, 27 Mar 2025 01:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743038934; 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=ewtqkonDV+k/xrxRvyhn3i2FeLJbftgALRkT9ZuR7/o=; b=OdwJYFngj3EM3XnWSw0Y9hBj1T8R2DNFdi39K8cn7ILM2sNv3WswjH8ZM2h3EhR3VY7+vo tGaYNVdzBGc6FTsIrWBA8M7d6lMO1piwGrAndS9cW5iEhJ7aVuzJZlMJps1gRFOBX+CNvF CiXj5MIR+Lx57AP92Hlpi5p/YtJuHPmnyNzY0vKZqF3ayLl23cggeZoiS5COhcIIfcIh7q 1M4PpSHelTBIxLvJOQFfr3O4gslOqm5WrpqJAYP4r8FILlU+XIDBCzeWmmtwI+PLaSfUvz lF3sA7kZuR/C8jJU2WfWoGo1U81KkCYSAUJopjVZeVkMZG2HBMzAUBd0xU9vbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743038934; a=rsa-sha256; cv=none; b=qUnKjRiLUYijmrB789k6VxPlu9zXUF216LY/s7zgv9nYNsaFDR0y3rIVB57Zyv6CBnbWD0 yR0bWHobj6GLtDWpGvwFbK6imKoX3yxtRFVyxVA9O8Mj0ky7PSRI22O4loCxSIfOZ6shie m2lCwVHKSJh+2t8VKibcp23eyjLqWzdQNTlQq/oZzw0L2iCSYCjjfOD23s1yJ2DkNS3rbS z6F4FxPwliB4Lu/KtdMHpEtA4gAbdG0mkmiXhndxw4YMTrgqymDlkopdmqrpmC3BL1sVLp yiEAOIOV8Dbw/pp/sEnmqyv5QecGOFeX6Xs5GlOKCO38g84VxAIflh8Zdq2KKQ== 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=1743038934; 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=ewtqkonDV+k/xrxRvyhn3i2FeLJbftgALRkT9ZuR7/o=; b=Zec5soLA3fAqhOk89/Ek+R10A0IkG0By5i7eMkFjG5pQcMJArdsKCkXW5b3eysj5cE0BU5 Ibw6Flj+0HxLmghdC1CUR/HYlGyDZ5WA+Sq7KxQUAqltEEZeatK4lbjR+jACjxrMcjoZXp Unl1A5R7ZUJ6DkDEZzGqX3EbRwv1XKxOLfR4QQWlb3V0r+e+0WZ0XAsnTY1BqGlPZiVgHN w/dPA+Db079d6tDsL0JQdlNkjcuVaDn9tSzhIpX8m50eYP2zTDmCBTLdljnfZRDUzVVkAy 4pcAwiFFMfDG4Hgfq8KvlLWeWK48/sSaHyipSBwtOgYQ20723DjK/g5a/YKAXw== 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 4ZNQzV2hRFzbZ1; Thu, 27 Mar 2025 01:28:54 +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 52R1Ss1f039908; Thu, 27 Mar 2025 01:28:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52R1Ssf6039905; Thu, 27 Mar 2025 01:28:54 GMT (envelope-from git) Date: Thu, 27 Mar 2025 01:28:54 GMT Message-Id: <202503270128.52R1Ssf6039905@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: d342ae67192f - main - uath: add support for GCMP-128 encryption 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: d342ae67192f776e41476c8292117fe87c5b6f7c Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=d342ae67192f776e41476c8292117fe87c5b6f7c commit d342ae67192f776e41476c8292117fe87c5b6f7c Author: Adrian Chadd AuthorDate: 2025-03-15 02:05:04 +0000 Commit: Adrian Chadd CommitDate: 2025-03-27 01:28:47 +0000 uath: add support for GCMP-128 encryption Explicitly set the software ciphers; add support for GCMP-128. Locally tested: * AR5523 11abg NIC, 2/5GHz STA operation, GCMP forced in wpa_supplicant.conf Differential Revision: https://reviews.freebsd.org/D49370 Reviewed by: bz --- sys/dev/usb/wlan/if_uath.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c index 28c176df1f14..b49c75032d77 100644 --- a/sys/dev/usb/wlan/if_uath.c +++ b/sys/dev/usb/wlan/if_uath.c @@ -441,6 +441,12 @@ uath_attach(device_t dev) ieee80211_init_channels(ic, NULL, bands); ieee80211_ifattach(ic); + + /* 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); + ic->ic_raw_xmit = uath_raw_xmit; ic->ic_scan_start = uath_scan_start; ic->ic_scan_end = uath_scan_end;