From nobody Fri Apr 18 14:37:00 2025 X-Original-To: dev-commits-src-all@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 4ZfHQj4T7dz5stf2; Fri, 18 Apr 2025 14:37:01 +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 4ZfHQh2t8lz3KB0; Fri, 18 Apr 2025 14:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987020; 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=o0zf3C04ZCZn13uWGa2HH3LAsTrmBNUzKZQSuz8nwTc=; b=JTK4ivS5En0Uimudo+RGXQhhNIwrpiQXdluAQdqaivECC9Q3RpeaSiH3p/x5ouUuxoXPGR MIKC+s8RwI+9vktrMnr6dwHOIr/ZCkgaw+zEocFYuQrJaHqOCqSQAd/N9VUe5nnVxao2Xb KnV7lRWmwdRG8rt/TZR6LluOchWt39yv0JceMP0LfIBP2emiztuz+EZuKcFH6mkDxaJGVV s3zvK+cDUx+DdamWnWorGVX+0XENFstEVu/nzkPJE9krmIPPxJVyqVBvz+CilfNaboL+5c 8hOx/wYesXtiopsdCKvwISS3zo/d2/jK1YidpMFnLKvuOkes0ocEe5h+1i6j3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987020; a=rsa-sha256; cv=none; b=J44++4SDxsbovvJRh5LZV2HHsBgJB6WrAD0kmxCJKc4dxW+g7IGgSQe1wANLFg74ENsXb7 PwN3aYuGBJ/2ARiDHKcSYg1SDwiDrj9CButkC80TiPX2LwKAHpGzcKEs9Ut7bsxUQ++9ps sFAi0+jfn4BEnZcm2g+xPbXDBtg/cwgOOWsmYNKSF8OaPIQFYUUD+2HTqw6ZYu7Q1B7kEU vr8Mjf4A3+nIedlQojSv91ZAcTXJ0blN34sbgLI3fKuugF3SMPrcvzO39bNB93zieDvMw3 fqu13bKb4g8NsqEgYk2VIx1wwcykRJc1xWuw8nd7JZQ4NhWxT3LrqvAOIj95NQ== 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=1744987020; 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=o0zf3C04ZCZn13uWGa2HH3LAsTrmBNUzKZQSuz8nwTc=; b=qbANbVnACtHf45JxGnvNQSEg24xpY26AOWSdSlToU9GiTNs/HPEgV6hBTEE3Q7tp9C2b6h 9/1SdAIVj2CaVSPJWyJ8flCfo+s/uKSy9ouNa+uJZkfm+yIDHzSrlJO5tDHPd62aqyv47y sI3chLb6LT/kfMsvp0+g1M4FxlFiDZaWmTXWqsFDZkV3RsCA2/6TRv4Cp45sN19YnvHnBZ UXEs5qFRTYR5u2qCRlctzGrrJRHY1XocXFXI/wNOxOaP7KPQfMttEfAnn40qvuv7aqxkYR idh7RhhZn14852f+YXT0SYjuNIEpeLZumOTcPm01cNMMbyHx/jg0AeJOSNICCg== 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 4ZfHQh0kJDzdwf; Fri, 18 Apr 2025 14:37:00 +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 53IEb0GO091389; Fri, 18 Apr 2025 14:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEb0wP091386; Fri, 18 Apr 2025 14:37:00 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:00 GMT Message-Id: <202504181437.53IEb0wP091386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 20f3d58fb8a6 - stable/14 - net80211: correct IEEE80211_KEY_BITS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20f3d58fb8a61582dbaedb87d76eecc42f15b961 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=20f3d58fb8a61582dbaedb87d76eecc42f15b961 commit 20f3d58fb8a61582dbaedb87d76eecc42f15b961 Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:22:41 +0000 Commit: Bjoern A. Zeeb 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)