From nobody Tue Mar 18 09:22:15 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 4ZH5vr1FSJz5qKyq; Tue, 18 Mar 2025 09:22:16 +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 4ZH5vq2g41z4574; Tue, 18 Mar 2025 09:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289735; 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=pIBKJyJsdwr968Dae1vP6uf1q0xOabSdDdpZ409Fkpo=; b=FNwiAZxVaGKm/kyartaVUvhFtLZVBaRYYvQxIcxvmlWcyzWTyuTXRMavdcYddkDr2cayq5 YCi/hcdEVjRhUb0yTs7WpK6pOB+hHcdHyPpjuvrVE9JBW4Iwa2kAAV4V6DclyHf12qsmJ5 vQEWk9/66L5PZBVT8GlWFSYoWRIZEKiS79N+jR0K0PEn824QcFFLlSZBAHiW1MiuEFBl3V vgDVS2+xuy6Tkx170iC9bojEZfgBPILcM144ma7Fiy5rVGy4s6CnKIQAmIw3EKbhCeIFtJ qAg9ioylYLaSGX6OwtmXpz5/VeDltw3axPGv/XcDzgr1dJ4o3k4RkApBAR2K0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289735; a=rsa-sha256; cv=none; b=faKBoXgIjZQY2mMD5xUW8uuQk9YBUd1TtSLWVsY+jfngZpLxoY8wDL7bWl/85591lwdebG 90Hata+WelxswwBLHfcz0tUoxB7C+gEabqEH72Ha242ewFub0Q7gifxUFfNq9kDFJhGgis nb/D/TxGoYPIVV9vmwhiaJXWXFSumczYvIhjzRCMH2LGTQJelXAU4ricwjejrGOPq5X0ns mAJ0lGOxuMSSbxGQdepSSwBmqlkGoA1UmziElpxoqtSNiMxKhPCplYYJ9Xzyt73G/5rev/ Xo74ggIepn/IYn4S1kTL9UK3YyfwaU7ohoer2oIAhs4GFcFdGKlQmRPlf/GKAw== 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=1742289735; 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=pIBKJyJsdwr968Dae1vP6uf1q0xOabSdDdpZ409Fkpo=; b=cQ31wfGilX4PQcZtjejMFgHFZRqGTuHp02sibhvYBSVbYjY8GccVN94g6iYMU/rf6ThmW8 E5L38wTZCQVtemsJS1PhEiINWW5enFZN1zPJvtKYLx0mc3ivA72EMtriLGQUjAam/SAiRd ny/ajNkUZFUaXl27TOl3Fa1x+JsTvdPYU8vL4KCanjN4MfDHlNurLKFweo4gIQUqq7yqv5 UNtmdYXPDJ7XUm2ruypCJznZO4y1BkLCu2RlBw3WgCvSay9JtZKxio91vMXDWqHqXsdtAJ 1PC2V0nadojk4Yih2tRT/Sq3Y4cn1tgk5NNoFv92bwztsTlK8UigEvPPRlqkPw== 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 4ZH5vq23mLzBb8; Tue, 18 Mar 2025 09:22:15 +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 52I9MFS0076289; Tue, 18 Mar 2025 09:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MFPg076286; Tue, 18 Mar 2025 09:22:15 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:15 GMT Message-Id: <202503180922.52I9MFPg076286@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: c8a6676eb652 - main - LinuxKPI: 802.11: crypto pn lengths 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: c8a6676eb652b59fee545dc3e24ffec21bd0cd8d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c8a6676eb652b59fee545dc3e24ffec21bd0cd8d commit c8a6676eb652b59fee545dc3e24ffec21bd0cd8d Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:01:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22: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 MFC after: 3 days --- 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 9faf58ed6ee5..4dc1aaccb886 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -581,10 +581,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;