From nobody Mon Jun 9 21:45:01 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 4bGQSZ3fWrz5yXZP; Mon, 09 Jun 2025 21:45:02 +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 4bGQSZ17Kxz4H1D; Mon, 09 Jun 2025 21:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749505502; 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=U5/NdxzQWJ1BeAtMPmNx7JVDBBUgCwI8W5wfEqiFJag=; b=p/MWcJNmbjwTBcQGYL/9mMOx+ihVlqMm5G90HwIcGCnc8tSofe0EwpFlWs8Z+CleYLMd51 Hb0FF9sQ7EAQp9LKyro94pTvG4TdxvlwDTk87gZFE2HC4LYpogXH9+REDvz1C7+eKQrFL1 ECcaH+fyN3PhdTqft5jw7CqnKMUlMSGehMoBzNxjP27V49Y7IrDQryA/Gj9eFr8AHLPKEv 1qUfAQzDdvm/tn/BQdtLTMNetTa1s4undn7RYcKfP9qiby4ln612JVmXLOLCJmjfE/wRy8 nR8hVLvl0hiZQS4HTRV/wavEY34aAELsYinT4uiETDqMaq1Vn2dQOhTRWkOj3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749505502; 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=U5/NdxzQWJ1BeAtMPmNx7JVDBBUgCwI8W5wfEqiFJag=; b=wgUwZZqdlkEdds4Ps2PkqvkKgdYkE0TfU40BPjVl51s1CSpotWAV7lkZIAt9blGJzahE50 ycjGXCfEWTs4U5M+lK93kZZtTRCnBXFT1W0PaNMSmfM1GHAZf+NtR+A9jiLEc/G0Pl4OI5 9t3DiKk2Mzgzy20QWiXQzqAVDl459Xng2i2EyhCYztjw1esw06oDsD87gLJl3f6OlSQ777 H5Lrbrde2uJyhM2gaaXTLlzhRoTaE53tOhn/32srDEF7U7SoXdYd+g9prChvyXvQ0NrPPY cTvESS1p5uW2ivf4iKpuW6mnvh7DddRlXEonndEjBQN4VOlP43vKqs198ual3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749505502; a=rsa-sha256; cv=none; b=nVGHNVT/KG0WIo4yYjjaxuLn8A4n8lwB5oMhKy0cOV7A7dQ241lztBjrdliKWgBMIXNtDg YNV+/Ig1xBrGBZQ/isfapanV2Lrf3CTZ47VZgwhdfEXJ03Mx1am0hbTZ8/XsdIuS+qV6w8 bY47bP3lkYCygaiDPQ2IEDJNo3cofHBCgCik78b8PUbI35YlzfG1drsr2SkDmN/as4nXir xa9t8fvqvxJ0knpnZ3yeuLCjo8a4tnQ3H9otidZKAZdmVze4oZywhNV5bflfo79fka8131 3uNNUfeS9Vk8Hn++yguUq22yoNyFYtahmi1kk6scpgjVd1DSuZc3lGlNN9tskg== 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 4bGQSZ0fXZz1C9N; Mon, 09 Jun 2025 21:45:02 +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 559Lj1rD062914; Mon, 9 Jun 2025 21:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559Lj1Jw062911; Mon, 9 Jun 2025 21:45:01 GMT (envelope-from git) Date: Mon, 9 Jun 2025 21:45:01 GMT Message-Id: <202506092145.559Lj1Jw062911@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: 164bf9ffbe1a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 164bf9ffbe1a9fc8768b2f597fd4b32b3e406ac1 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=164bf9ffbe1a9fc8768b2f597fd4b32b3e406ac1 commit 164bf9ffbe1a9fc8768b2f597fd4b32b3e406ac1 Author: Bjoern A. Zeeb AuthorDate: 2025-05-27 19:51:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-09 21:44:25 +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 MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50555 --- 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 9ece44960378..d08b5c861c76 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -4773,6 +4773,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) { @@ -4781,41 +4792,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) {