From nobody Tue Mar 18 09:22:11 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 4ZH5vm2YHwz5qL1m; Tue, 18 Mar 2025 09:22:12 +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 4ZH5vl6xPbz459W; Tue, 18 Mar 2025 09:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289732; 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=QjZgQayx4wLq4JfDnWNsT/2Yjn/DCufEPJWq8gM5LAk=; b=P0JTXlCpE338Er84d3yVF9u6TgQohocdcsYWWrTDDVJPtdRRUFRiK3roDOV0cjdzJa9UlI Ndov8OxvZtyjbYOlVgzDGRxwh7eXJ6N02XmxzPRcY+bMJfGtBD3L/rttoXwAi36OpmhpS7 j4Z3SRDgEqQrJZgIkugFOU0ffbVDZpn1cwlbDlMrB8ZvsxDFf2g6TPoATyjc8hJ5hqsj+/ hqLFDWKMdyoF5ZyhCwBVl4bMmcG5tAzcxyohklV583yH3gyx/QVoCvP1FOXsgDhYHZBgH6 e3MswQG3GNAzQOzvgQZLwT0ek6c7k+EdHlZ7JJjQrsijz7qV4vZi+Sc4V7xccg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289732; a=rsa-sha256; cv=none; b=qU1JRPlyjWXeGbFONoNPyR5KIzmttD+f+6iPnDNuSqXKv9rN4OWxykNaUomk5zM/k3d/Ra DxNHx4OxgCd7bvL8E5Ao/o9K2yAmtr8vRivzyXMGnYj0RINTkfS1SdBYjI+9COxoxSEvHa Xko2HTbxjVapnCx7LtI4XtAsB9sUfaATEGxacbA+l6k5lruInnBPz/yaTKkC5uTSReUh+K zzQCMXBkUU0GRrT9HoJWjwQoZzoSj9gD0h0hhPvFak3uVYoXv/LVr8uL2G8FMwDa5VpYhB V7+Mfjj4G75ruVbM7yfdtJuJNFfnartwilNYoHsr/HIB01HUWdhi1W72aeFdbA== 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=1742289732; 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=QjZgQayx4wLq4JfDnWNsT/2Yjn/DCufEPJWq8gM5LAk=; b=ixCmM3SQnf3Qi1I00xJTYV6llZlwi1jOyQbHQGeEaTfAEvoIsp/owJE341phoXL6objR0d 6RMbDVhzErhQRr7SvX+nEZZqoi4ahYxsbNoFOhDr7smdmEHOKpaZTsBn0KkXp0JUcIVZed dogQdYrbbsEUSL34JMAKQzsirwfXP1tprwmQxsq7OAp21KyWxhfAktWy5VHO1GHPCHjFfx XLKciXyAMxBYtQ/H/LN4KW05ug5h8ul1Ax9LkJRPij3i0Oa4gYw2BiDF11jwiPF0Nyt8hq AyEjZKoa6BnuTEKFZPoKhPN0IikzHFf+//6GL+ul2I0laHNwPDPkIUdS01oCbw== 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 4ZH5vl6Wx1zBGD; Tue, 18 Mar 2025 09:22:11 +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 52I9MBX0076184; Tue, 18 Mar 2025 09:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MBjV076181; Tue, 18 Mar 2025 09:22:11 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:11 GMT Message-Id: <202503180922.52I9MBjV076181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0461600deaa2 - main - net80211: correct IEEE80211_KEY_BITS 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0461600deaa227050fbff60274ba72ab3a407bcc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0461600deaa227050fbff60274ba72ab3a407bcc commit 0461600deaa227050fbff60274ba72ab3a407bcc Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:22:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:31 +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 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49366 --- 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 b69df0cff3bd..5a365dd37aa3 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)