Differential D57799

net80211: fix CCMP/GCMP AAD for MFP frames
ClosedPublic
Actions

Authored by adrian on Jun 24 2026, 4:18 AM.

Tags

Referenced Files

	F169086377: D57799.id180496.diff
	Mon, Aug 31, 9:14 AM

	F169043140: D57799.id180496.diff
	Mon, Aug 31, 5:37 AM

	F168984691: D57799.id181132.diff
	Mon, Aug 31, 1:34 AM

	F168949258: D57799.id.diff
	Sun, Aug 30, 10:13 PM

	F168947808: D57799.id180496.diff
	Sun, Aug 30, 10:01 PM

	Unknown Object (File)
	Sun, Aug 30, 5:46 AM

	Unknown Object (File)
	Sun, Aug 23, 12:57 AM

	Unknown Object (File)
	Fri, Aug 21, 4:25 PM

Subscribers

Details

Reviewers

None

Group Reviewers

Commits

rGa2d087b67e14: net80211: fix CCMP/GCMP AAD for MFP frames

Summary

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.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

adrian created this revision.Jun 24 2026, 4:18 AM

Herald added subscribers: glebius, melifaro, imp. · View Herald TranscriptJun 24 2026, 4:18 AM

adrian requested review of this revision.Jun 24 2026, 4:18 AM

Harbormaster completed remote builds in B74181: Diff 180496.Jun 24 2026, 4:18 AM

adrian added a parent revision: D57798: net80211: encrypt/decrypt MFP CCMP frames.Jun 24 2026, 4:24 AM

adrian added a reviewer: wireless.

adrian added a project: wireless.

This revision was not accepted when it landed; it landed in state Needs Review.Jul 1 2026, 12:21 AM

Closed by commit rGa2d087b67e14: net80211: fix CCMP/GCMP AAD for MFP frames (authored by adrian). · Explain Why

This revision was automatically updated to reflect the committed changes.

adrian added a commit: rGa2d087b67e14: net80211: fix CCMP/GCMP AAD for MFP frames.

adrian added a child revision: D58098: net80211: update drivers to allocate sequence numbers in the raw path.Jul 8 2026, 5:56 AM

Revision Contents
Changeset List

Path

Size

sys/

net80211/

ieee80211_crypto.c

9 lines

Diff 181132

sys/net80211/ieee80211_crypto.c

Loading...