From nobody Fri Apr 18 14:37:02 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 4ZfHQk5vZQz5stbf; Fri, 18 Apr 2025 14:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfHQk3RPsz3KFQ; Fri, 18 Apr 2025 14:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987022; 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=K7gqkXGKEszJ4EtStdtQbFnQiSii4nxwUTyLTy17Q/8=; b=ryBf05Jj2+fY61B1XO64qf/Wqc4eTjadqQgdaEpo1omFrvQFZzLzji0c989CMu3a7K6TiF fFDpIYDv5ZcrFlcQzkrWiDtIr9uSARK7o004iCuD/Vw/Ch06E/ThBcGLFzIKACbFFwjNZ9 5NEUAVE8K985ykdkxWZS880cpewDP5dZNbECz4iNbCHiDPPqWqYNlmEKsKuBc+p579B1iu MB3LcBl4ycYIgMzBWghuF93r0MTd1HGl1xgvqa+koWcLRTQpg/vT05UhGhvoNSDBjfWuXu O3Meq3MexbeZMnh4nmT1EIJLVlnjq5FPlIiO+ux5HJjxS6YDPDspdmzFCoIWBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987022; a=rsa-sha256; cv=none; b=ZNEUKBG1kEtxI8+tKHDRvo6sIUC/G+IhEyj3IkRvtfXBsHxwMaHBc8Y2XjY+708cjhjnJl QOhnjg3MdDDwBY8Bkuxrui1S4Ah7EFY5QfRMHzODD8wBBwX2VCsvWi7eqdGYM/ktiTKus4 oVqJCtSf55bp+FPL1ybR8IIp68pRHb1Jaz1lQUbdcZ5/Y/RUq0XIT5DqBHHpktrSnAyQOi nxPIiCVW/94utaJAynsbxilnoalKHwBNqF28JnG54CKsE2GaQSgXkPOfnmy68Awrnn46R6 l1OACxhaj/I6tOvUna+27XeJyXw78mDoZf/1dGtDJh9hOuFtWBskRFriLJPZSw== 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=1744987022; 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=K7gqkXGKEszJ4EtStdtQbFnQiSii4nxwUTyLTy17Q/8=; b=ycc6t4H7DW52ysn2yXG9iDH41EvUX/b12U/xnDsUz9OSuXBKqhf8XtR5a3a/xMCEgE0Vml GpWLmB65maFancqfzLI7dxaAmvnVLC6nR82dijbmEEQVm9N3VcualPO0ah0BthhkRZj0ZT xlKqi+OlFgFgjBaNTj2PDiWHkG0jZYWfGdDRlZMYzX5z7W/04QNveIu5yL7ov2iCUf7x8w ShruUDCOoBJIkxsVMpapucF6F61AwcEVzEZuTBOr40rnpkJXPskM1+42074T9+TbNaI9/N CfVJPl8S33/bGUkLk/sDSkbUu9mtGw15kn97VoblNDlnJ7e+vI34+Eo5eKLTQw== 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 4ZfHQk2zjFzdtB; Fri, 18 Apr 2025 14:37: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 53IEb2vC091463; Fri, 18 Apr 2025 14:37:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEb2Jg091460; Fri, 18 Apr 2025 14:37:02 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:02 GMT Message-Id: <202504181437.53IEb2Jg091460@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: e0bd174e0e36 - stable/14 - net80211: make use of IEEE80211_KEY_BITS for debug messages 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: e0bd174e0e369af59cc533f2d7bf6f231dc250df Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e0bd174e0e369af59cc533f2d7bf6f231dc250df commit e0bd174e0e369af59cc533f2d7bf6f231dc250df Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:43:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:35:59 +0000 net80211: make use of IEEE80211_KEY_BITS for debug messages Use %b with IEEE80211_KEY_BITS for the debug logging in ieee80211_crypto.c rather than just printing the hex value, which makes some of the messages more obvious and avoids having the header file next to one at all times. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49369 (cherry picked from commit 7513a0afe5fb26d30dbcae0347e43728e3511d3e) --- sys/net80211/ieee80211_crypto.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 45316b43605a..bb7a612ac36c 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -391,14 +391,15 @@ ieee80211_crypto_newkey(struct ieee80211vap *vap, */ IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: driver override for cipher %s, flags " - "0x%x -> 0x%x\n", __func__, cip->ic_name, - oflags, key->wk_flags); + "%b -> %b\n", __func__, cip->ic_name, + oflags, IEEE80211_KEY_BITS, + key->wk_flags, IEEE80211_KEY_BITS); keyctx = cip->ic_attach(vap, key); if (keyctx == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: unable to attach cipher %s with " - "flags 0x%x\n", __func__, cip->ic_name, - key->wk_flags); + "flags %b\n", __func__, cip->ic_name, + key->wk_flags, IEEE80211_KEY_BITS); key->wk_flags = oflags; /* restore old flags */ vap->iv_stats.is_crypto_attachfail++; return 0; @@ -423,9 +424,9 @@ _ieee80211_crypto_delkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(key->wk_cipher != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b rsc %ju tsc %ju len %u\n", __func__, key->wk_cipher->ic_name, - key->wk_keyix, key->wk_flags, + key->wk_keyix, key->wk_flags, IEEE80211_KEY_BITS, key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -491,9 +492,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(cip != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x mac %s rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b mac %s rsc %ju tsc %ju len %u\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_flags, ether_sprintf(key->wk_macaddr), + key->wk_flags, IEEE80211_KEY_BITS, ether_sprintf(key->wk_macaddr), key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -511,9 +512,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) */ if (!cip->ic_setkey(key)) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: cipher %s rejected key index %u len %u flags 0x%x\n", + "%s: cipher %s rejected key index %u len %u flags %b\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_keylen, key->wk_flags); + key->wk_keylen, key->wk_flags, IEEE80211_KEY_BITS); vap->iv_stats.is_crypto_setkey_cipher++; return 0; }