From nobody Fri Apr 18 14:37:09 2025 X-Original-To: dev-commits-src-branches@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 4ZfHQs74Dfz5stf7; Fri, 18 Apr 2025 14:37:09 +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 4ZfHQs20QWz3Kfn; Fri, 18 Apr 2025 14:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987029; 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=7TlkQGaKlWi3Uk5yU5gDkT63J/Q+CVmhIjdm/szAWDQ=; b=kop95/ytUn7XYvfn2sQTjuaEACVTM5umybGgZh56eJ0ZIIEPbWS8pBgIgFoIfoz3RWUBxU SoeKGg0ZrqmcoeTJVQH6ta+CubUv1JSzuQQWAuKhfsaRlTJZHnh0JgkyNULKDBk9PhXBcf XNFYY5pWMnl/jc8R/6Q25SOt1HQq7MHspo15TyeXeLLvTopFuXfbHrEvGOaMCdY4yIyHGf /i3Uo62rgcEzWHvDzkfjdVEtfxlcF3rZurTlTZwyOb8ZNTOdoMHDB0w/wGbJ3+XVwh2yeS QTiGfshxhbUWRrcAssaq37O6X9CH4feeLaZUA4IKLORRUuWSMlsfesN/zBbqvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987029; a=rsa-sha256; cv=none; b=FW9PsAPzuocMYC3k7FH60ZdSbRvrJAXbsJsnvh7UMjLnG+iJR0yo+I5LYHgYoQ9i5N+Sw0 2YjpB/FuoRDABvr4h5cJwrBt3LfMmT72WuunGWi/eBYPzWnnv0nM7nRA4hXgfOlm4lYeNA My3eQzvaxkciLNZp9M4EBmQNayMDBx+2eT1JjKkPTqZHlMZhSdNkjJq7aBWFRhVIWN37/D hmQJdkG194sdVhPnEjZ8dYp1bfsbTd5VFpeEhfCcikzyC46TC9o2JwB5ev+WaFPHcd6sNN SXUjQ7Bhr/3KWk/RVsJYSRRIkgVFPT3rwYiaC5jj2MGmryrDUvOefDmqYSmZ6A== 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=1744987029; 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=7TlkQGaKlWi3Uk5yU5gDkT63J/Q+CVmhIjdm/szAWDQ=; b=aQthsWkDM87Uz0j8Ygh+mLygvMTbaQ6KCEuZtwD3DS82UU8M1TSdaEd72nJgya2lUgoZ0H KGbPTIZtj53WsOcjhPle/iYGODT3rJvMxmYflrppTJQKFyHCUiVInUrZOdKgwcFOh7mcBX 46VX9o8zxuIF2A8W1d/p6OlEIZ/yXs8NPwFHbpIjqYIrfhUblZrNze3jPBu6AMMKxVN6Tz v5rRLGN3ey0emasloenETHSU1FB+Cuppttkol/10ynzUsjBeHyH/lRpcLHPTa43duRmVsa QXjDx1jJB5tJR51RmzSazjDclbrPHrXQLS6DrwZ3+nrPtqszlILSGGfyulUlpw== 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 4ZfHQs12BVzdjY; Fri, 18 Apr 2025 14:37:09 +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 53IEb9h3091691; Fri, 18 Apr 2025 14:37:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEb9g1091688; Fri, 18 Apr 2025 14:37:09 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:09 GMT Message-Id: <202504181437.53IEb9g1091688@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: 64ec6ddac008 - stable/14 - LinuxKPI: 802.11: crypto pn lengths List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 64ec6ddac008a7f26527bce173855d215d88ca39 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=64ec6ddac008a7f26527bce173855d215d88ca39 commit 64ec6ddac008a7f26527bce173855d215d88ca39 Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:01:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:36:00 +0000 LinuxKPI: 802.11: crypto pn lengths Define the last missing PN length and for consistency use them in struct ieee80211_key_seq (even though a 6 is a 6 is a 6). Sponsored by: The FreeBSD Foundation (cherry picked from commit c8a6676eb652b59fee545dc3e24ffec21bd0cd8d) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 3 ++- sys/compat/linuxkpi/common/include/net/mac80211.h | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index ca1493e666c6..964fd970ecf0 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2024 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -64,6 +64,7 @@ struct ieee80211_mmie_16 { #define IEEE80211_GCMP_MIC_LEN 16 #define IEEE80211_GCMP_PN_LEN 6 #define IEEE80211_GMAC_PN_LEN 6 +#define IEEE80211_CMAC_PN_LEN 6 #define IEEE80211_MAX_PN_LEN 16 diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index dc1142270b9a..baac9fe67fdd 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -567,10 +567,13 @@ struct ieee80211_key_seq { uint8_t pn[IEEE80211_CCMP_PN_LEN]; } ccmp; struct { - uint8_t pn[IEEE80211_CCMP_PN_LEN]; + uint8_t pn[IEEE80211_GCMP_PN_LEN]; + } gcmp; + struct { + uint8_t pn[IEEE80211_CMAC_PN_LEN]; } aes_cmac; struct { - uint8_t pn[IEEE80211_CCMP_PN_LEN]; + uint8_t pn[IEEE80211_GMAC_PN_LEN]; } aes_gmac; struct { uint32_t iv32;