From nobody Wed Jul 1 00:18:48 2026 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 4gqgbs1Pwzz6kC8r for ; Wed, 01 Jul 2026 00:18:49 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqgbr4Rnxz3Rv2 for ; Wed, 01 Jul 2026 00:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782865128; 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=92mPOAy6WlKit4fyaZ8XbrTpG3pM5BMJ8jNKnz24muU=; b=OYTnNWMYlfFEGyuaL8T5JKwWOwU6UJxLNQ2nFEaSuwMalr165dgVvb+SzV0ptvaY0QaZVU zp5iWM5oNjNNgVOn/ynt+w8t1XBnsZvfKoj2PH8/s1h2gXIKVMMWtnR4Mje76urkG8IPH5 XhmwaJtcM2H7YGiACecPf2NdI9OFLxYJjqF/EKuUnZzJiTQGkU60r2QOzZks9514Q4ymgo Jp7vI8hjQH/qyVGacZwlDM8yj1cWeBiWhh9J6FIowAW46n7dImyYPNJKEYB4ZPBi/9F8rR mttZXUgHMsdQmL+RyqVOfmoj0wvuE9YlDGFm7TvhPdfwn+uY/0JyuwgW0r91Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782865128; a=rsa-sha256; cv=none; b=o9tHV1tkPI3YK1SwBxulCZvoUIm0f9peWR+5TxcuE4zoSI0+Shc3/GysGqPRzXAZazkfIq sQ10uIvR5lcn2H3Mj8RTHwKmxJ33jeXTuL1rlNLnD0BuygAQ698UXOYLiKRenLyJYPkN5o foYOH4uGGcRrgBPtE8n4peb2NvdF/nK0WXopLcFiZQcXzI/V2cRP+cEbpWFwcH3ZXveXub LCLjYCg7OPGczC6RdhvrXClWTLJ9KJc69fy6o9lKzgC0ur/ra+AXA0tlVpAHOJh6cOpIdt WxM22oYkpQ4kuGBxyLX2Ilel+rzeFYt+hHdPd+2po78wNB8QsnrZaZMrkGoV8w== 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=1782865128; 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=92mPOAy6WlKit4fyaZ8XbrTpG3pM5BMJ8jNKnz24muU=; b=O2z5ekUeq9oV43wHDlCkoM++CzRk8bYBuqRBGd5wjoYJmg5fA5+xbHcLT7UpNPGZiw1SWL o2g3GijtQXrnF4OvIailuLFNk2uLtvzEmxreRhEt+5kFrMy72rABE5d/BXuy/XhnLOZfOr rghWYomnQsKhDs9+GpdwvwpUtCKEgpWhGHpb1sw7lKO/N0DL2cG2BJ5PYaicHbFi3bT8Gu ynRPJ2IZLkZvkdTg6tm5P+tbHfa+SBV5NU/osTXbCxVGHWocAZhB25jkOr4xtBbUwiSLnF iyXayCuALuVCUfl8+YfumrUCFboK8s6xp25NgM22lViNMtBl2jKudzvHHj99UA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqgbr3TL1z16MR for ; Wed, 01 Jul 2026 00:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21a38 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Jul 2026 00:18:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: a2d087b67e14 - main - net80211: fix CCMP/GCMP AAD for MFP frames 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: a2d087b67e14ea2a2496d6424df8d9668e271177 Auto-Submitted: auto-generated Date: Wed, 01 Jul 2026 00:18:48 +0000 Message-Id: <6a445ce8.21a38.476969f2@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=a2d087b67e14ea2a2496d6424df8d9668e271177 commit a2d087b67e14ea2a2496d6424df8d9668e271177 Author: Adrian Chadd AuthorDate: 2026-07-01 00:18:00 +0000 Commit: Adrian Chadd CommitDate: 2026-07-01 00:18:40 +0000 net80211: fix CCMP/GCMP AAD for MFP frames Update ieee80211_crypto_init_aad() to do what 802.11-2020 says - only mask fc[0] bits 4-6 on data frames, not on management frames. This (with other diffs to actually negotiate MFP and configure ath(4) for MFP + software keys) allows the CCMP path to decrypt CCMP MFP frames in the software path. Differential Revision: https://reviews.freebsd.org/D57799 --- sys/net80211/ieee80211_crypto.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 566f0b2e0c23..3dad4ce77d3c 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -1025,7 +1025,8 @@ ieee80211_crypto_init_aad(const struct ieee80211_frame *wh, uint8_t *aad, /* * AAD for PV0 MPDUs: * - * FC with bits 4..6 and 11..13 masked to zero; 14 is always one + * FC + data frame - mask bits 4..6 + * FC 11..13 masked to zero; 14 is always one * A1 | A2 | A3 * SC with bits 4..15 (seq#) masked to zero * A4 (if present) @@ -1033,7 +1034,11 @@ ieee80211_crypto_init_aad(const struct ieee80211_frame *wh, uint8_t *aad, */ aad[0] = 0; /* AAD length >> 8 */ /* NB: aad[1] set below */ - aad[2] = wh->i_fc[0] & 0x8f; /* see above for bitfields */ + /* Only mask bits 4,5,6 if its a data frame */ + aad[2] = wh->i_fc[0]; + if (IEEE80211_IS_DATA(wh)) + aad[2] &= 0x8f; /* see above for bitfields */ + aad[3] = wh->i_fc[1] & 0xc7; /* see above for bitfields */ /* mask aad[3] b7 if frame is data frame w/ QoS control field */ if (IEEE80211_IS_QOS_ANY(wh))