Date: Fri, 18 Apr 2025 14:37:00 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 20f3d58fb8a6 - stable/14 - net80211: correct IEEE80211_KEY_BITS Message-ID: <202504181437.53IEb0wP091386@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=20f3d58fb8a61582dbaedb87d76eecc42f15b961 commit 20f3d58fb8a61582dbaedb87d76eecc42f15b961 Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2025-03-14 23:22:41 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2025-04-18 14:35:58 +0000 net80211: correct IEEE80211_KEY_BITS Not only are some of the bits missing, \4 and following were also off-by-one. Correct that so we can use them instead of reading hex numbers. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49366 (cherry picked from commit 0461600deaa227050fbff60274ba72ab3a407bcc) --- sys/net80211/ieee80211_crypto.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index fc7c13cfdfb4..156d5d77fd55 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -118,8 +118,8 @@ struct ieee80211_key { IEEE80211_KEY_NOIVMGT|IEEE80211_KEY_NOMIC|IEEE80211_KEY_NOMICMGT) #define IEEE80211_KEY_BITS \ - "\20\1XMIT\2RECV\3GROUP\4SWENCRYPT\5SWDECRYPT\6SWENMIC\7SWDEMIC" \ - "\10DEVKEY\11CIPHER0\12CIPHER1" + "\20\1XMIT\2RECV\3GROUP\4NOREPLAY\5SWENCRYPT\6SWDECRYPT\7SWENMIC\10SWDEMIC" \ + "\11DEVKEY\12CIPHER0\13CIPHER1\14NOIV\15NOIVMGT\16NOMIC\17NOMICMGT" #define IEEE80211_KEYIX_NONE ((ieee80211_keyix) -1)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504181437.53IEb0wP091386>