From nobody Wed Jun 11 09:14:33 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 4bHKjj3JQbz600CB; Wed, 11 Jun 2025 09:14:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHKjj1V6zz3mFb; Wed, 11 Jun 2025 09:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633273; 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=j4xx5Gz5egsDO5fflnCPdN2VajDJP/4twbOu2ktLal8=; b=QzxdM8+lKY4PuyLi5DSaTZyhdF7SPAEYus9Eg8ubOaDncFz/bUvLPbJAjK/3N//ZTdFpFq vePqu5HZIRunJWPizAZWSEKi1YidM4JfzV11wf2YmOpNGfIytaM6X8ksrioddO91A5xvrM ZEFpCufpzA6nHNE/j3/wmsIoPF/sNf1J4DdxAkYSb9jTLetgR4oCWyg+IZ/YmOO2MhMXhn i480AxrwuQrQ2RZw+LjaB2bvsHLaJ5Kp+37F++IaA35aeKmKiOSmGNrVVUGlsfp+U5+PmC JqCD6Zf8nKa3SeyO0f/8+QKGVM3gAEGLF7ilhTc4whUDvEezs7nwVtMba/lV6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633273; 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=j4xx5Gz5egsDO5fflnCPdN2VajDJP/4twbOu2ktLal8=; b=N00JUSUq+HzBTu9k3mm9tdXfcoDAVKD4KWTW+MyrDEiI1hdpCJ9L1OKWwKyxEWnceTmy7l czupA0R0pzjD5PvNc7/cPZWLARFahfBMNxm4UCzIfNP1Y2ELLfPxWNb0fz7CNS/rITp1q5 iyc86vHj60w85UHVXw3j4XKZH3j4mIPpsAI2sL5/bDGxaZ1LxJTH2AWZP1ZHWLkbV5AxPX Mehg7bOijt5/FjvTHdn3wembvFozJY1W5ZuUcCLTF/2UYGfQY3SlEt7ZPeevRH9PImNDuV 2LglwLrKJ93mdZQTwQlrv6RnXnxxe6zf40WwsJOlMO7X3Jg34hv1dYSxoxF8ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633273; a=rsa-sha256; cv=none; b=iHLgrv6S9gudFZ7N+SON/dbNYpfHe5xj1G0im4iTP191/9xAFvLb6QjAqp+M8AP7nzypSJ 8sZfpMTSKoXJkZOKHDlzmAITHRzxZp0orl6msxoYGbd/uU2/MFiZ2zrhAOPYllRePzBiSo 9CV9XFuDyY5y7cS4i3FQwV06KNhHyC1bfq71fZg3tgbkmpru3zI3rZuiCInE1mF6pv8hDi 3wzVUH6y61OLi4rw9Dusuwac1lfIe/6I476iFgGVjunMrVwS7kpneQkG0rjj2ucLsBc4ds eh5EALAflZ87ync2h+2pvni4S8JypFQQ2k99QZuBRAKQzn1ilrEnDlVNc2FQVQ== 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 4bHKjj0p9Qz5VQ; Wed, 11 Jun 2025 09:14:33 +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 55B9EXAl062540; Wed, 11 Jun 2025 09:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9EXjA062537; Wed, 11 Jun 2025 09:14:33 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:33 GMT Message-Id: <202506110914.55B9EXjA062537@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: eca9d8e7fa08 - stable/14 - ifconfig: 802.11: factor out keyix printing 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: eca9d8e7fa0839015106595911d6624997191e17 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=eca9d8e7fa0839015106595911d6624997191e17 commit eca9d8e7fa0839015106595911d6624997191e17 Author: Bjoern A. Zeeb AuthorDate: 2025-05-27 19:51:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:41:10 +0000 ifconfig: 802.11: factor out keyix printing The node unicast key (PTK) uses a key index of (-1) and printing a 64k number does not look great. Factor out printing the key number into a buffer and use 'ucast' for the node unicast key. Hope is that this will be useful for the future as well when we will have more/different keys possibly. Looks like (with -vk): AES-CCM 2:128-bit rsc 0 tsc 0 rx AES-CCM 3:128-bit rsc 0 tsc 0 rx AES-GCM ucast:128-bit rsc 0 tsc 0 tx+rx Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50555 (cherry picked from commit 164bf9ffbe1a9fc8768b2f597fd4b32b3e406ac1) --- sbin/ifconfig/ifieee80211.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index c2aa51f250a6..9c753f865bc0 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -4763,6 +4763,17 @@ printcipher(int s, struct ieee80211req *ireq, int keylenop) } #endif +static void +printkey_index(uint16_t keyix, char *buf, size_t buflen) +{ + buf[0] = '\0'; + if (keyix == IEEE80211_KEYIX_NONE) { + snprintf(buf, buflen, "ucast"); + } else { + snprintf(buf, buflen, "%u", keyix+1); + } +} + static void printkey(if_ctx *ctx, const struct ieee80211req_key *ik) { @@ -4771,41 +4782,43 @@ printkey(if_ctx *ctx, const struct ieee80211req_key *ik) int printcontents; const int verbose = ctx->args->verbose; const bool printkeys = ctx->args->printkeys; + char keyix[16]; printcontents = printkeys && (memcmp(ik->ik_keydata, zerodata, keylen) != 0 || verbose); if (printcontents) LINE_BREAK(); + printkey_index(ik->ik_keyix, keyix, sizeof(keyix)); switch (ik->ik_type) { case IEEE80211_CIPHER_WEP: /* compatibility */ - LINE_CHECK("wepkey %u:%s", ik->ik_keyix+1, + LINE_CHECK("wepkey %s:%s", keyix, keylen <= 5 ? "40-bit" : keylen <= 13 ? "104-bit" : "128-bit"); break; case IEEE80211_CIPHER_TKIP: if (keylen > 128/8) keylen -= 128/8; /* ignore MIC for now */ - LINE_CHECK("TKIP %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("TKIP %s:%u-bit", keyix, 8*keylen); break; case IEEE80211_CIPHER_AES_OCB: - LINE_CHECK("AES-OCB %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("AES-OCB %s:%u-bit", keyix, 8*keylen); break; case IEEE80211_CIPHER_AES_CCM: - LINE_CHECK("AES-CCM %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("AES-CCM %s:%u-bit", keyix, 8*keylen); break; case IEEE80211_CIPHER_AES_GCM_128: - LINE_CHECK("AES-GCM %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("AES-GCM %s:%u-bit", keyix, 8*keylen); break; case IEEE80211_CIPHER_CKIP: - LINE_CHECK("CKIP %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("CKIP %s:%u-bit", keyix, 8*keylen); break; case IEEE80211_CIPHER_NONE: - LINE_CHECK("NULL %u:%u-bit", ik->ik_keyix+1, 8*keylen); + LINE_CHECK("NULL %s:%u-bit", keyix, 8*keylen); break; default: - LINE_CHECK("UNKNOWN (0x%x) %u:%u-bit", - ik->ik_type, ik->ik_keyix+1, 8*keylen); + LINE_CHECK("UNKNOWN (0x%x) %s:%u-bit", + ik->ik_type, keyix, 8*keylen); break; } if (printcontents) {