From nobody Fri Apr 04 03:24:25 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 4ZTP961bW4z5rSPD; Fri, 04 Apr 2025 03:24:26 +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 4ZTP960bMrz3lM4; Fri, 04 Apr 2025 03:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743737066; 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=/IsX50caP34tSpf2ex/o3fuCCkjzquozEk90FlfY4gY=; b=cn6RHurobY3/mx0KJKMpYNzf4UW4IxTAPBiXcW0S9lPOHMqUx6vgq6elHwYKicXf67mRMj vQ42AGFy/MGmsQYjlkVv7IAh+uPWJ3OmmIdmB8WXxC/OgCvjd4oE2XvWTB/507S1SvWroM HVTL8EuHJCpFYJhYBDrxIG9XKX1KtJIQskULnWFqcpOSkdeNxPIfO4ccIHNephXM0R2Vdq zHPa13bd+fZ8JkNNPd7lEFPmw26EkEDdS+dz7lR8LVdGH5L3EnKp3Ozbbk0eMS+spC330q fbI65REJU0Xa0Ni1H4CbgMe6JaDQ5T/3vgd2Sltfu/f0bFV6c7+SqnFRj7To2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743737066; a=rsa-sha256; cv=none; b=Dl8ecYEoEFas/2BvvfBuxzOCi2Qs+hWWc5diOGy5LBy2kwe55Dm7mY6TC3ouN+vzkm2XGy h+8KBgqUhdDi1s9+cLrLg2hKYMnJAZpbHvXyalPueKGkef8xAAIQ9iIeGaAQ6dJ7ukgXBv usSEjYWnu874Di2WY3Yv434jiB4Q66DeIT6vg7ReXeLWDDd0oZVXfoWTUPd6kogYF72jHk F4RszCOfZIUYfGHDz8Wd03Rj1U7M7Go69b9Xz3vPVbR/94h/mvXGfJXbFMauf/fRnXEB79 90ufX4b3J0bq24xs6eY1KbjEySRa2zZWWwCNdHS248/AYpZTYIyDMNYviRedWQ== 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=1743737066; 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=/IsX50caP34tSpf2ex/o3fuCCkjzquozEk90FlfY4gY=; b=Ritfslpw4W1TZJiadHurU209SR+QQEKXRNqOV7hkCgvntbJTT4zJiYWditN7cOPcNCH2Kv 3TwnZvNGqUOJ9sQ2xL2cQt+OBm3X/jYffZJ7KGxptO8vfzdOAKpqQOHc/goPohiosGcuQn sF2kT/Zu89HYmLse9CZXrbe2Ig9mAFtZpQGqQvL7sRZwDBMLhVeft8HnbTrNaghFkBaj5y uxL3qSKQJNYF5QU9e8nY41xkq8BKzVDVj6X8/VY3bVnMbJCLtpb3G8EB24FRr8adNUuPhm NcFPCpEPXu/mNyAwVpKDhjFb9KFhZeSnzD9sSsZknDmZ48xJSmxOV8DJT0snNw== 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 4ZTP960BTrzDW0; Fri, 04 Apr 2025 03:24:26 +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 5343OPTY020622; Fri, 4 Apr 2025 03:24:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5343OPkK020619; Fri, 4 Apr 2025 03:24:25 GMT (envelope-from git) Date: Fri, 4 Apr 2025 03:24:25 GMT Message-Id: <202504040324.5343OPkK020619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 628d1501f7ec - main - ifconfig: decode 256 bit CCM/GCM ciphers and 256 bit 802.1x/none keymgmt 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: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 628d1501f7ec5674ac06d10861d60e7326e0ef25 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=628d1501f7ec5674ac06d10861d60e7326e0ef25 commit 628d1501f7ec5674ac06d10861d60e7326e0ef25 Author: Adrian Chadd AuthorDate: 2025-03-24 01:14:21 +0000 Commit: Adrian Chadd CommitDate: 2025-04-04 03:23:47 +0000 ifconfig: decode 256 bit CCM/GCM ciphers and 256 bit 802.1x/none keymgmt * add AES-GCM-256 and AES-CCM-256 ciphers * add WPA-PSK-SHA256 and UNSPEC-SHA256 key management This allows them to show in ifconfig -v wlan0 list scan, eg RSN Differential Revision: https://reviews.freebsd.org/D49481 Reviewed by: thj --- sbin/ifconfig/ifieee80211.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index 656e71e325cd..80633e5e9ffc 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -3138,6 +3138,10 @@ rsn_cipher(const u_int8_t *sel) return "AES-OCB"; case RSN_SEL(RSN_CSE_GCMP_128): return "AES-GCMP"; + case RSN_SEL(RSN_CSE_CCMP_256): + return "AES-CCMP-256"; + case RSN_SEL(RSN_CSE_GCMP_256): + return "AES-GCMP-256"; } return "?"; #undef WPA_SEL @@ -3154,6 +3158,10 @@ rsn_keymgmt(const u_int8_t *sel) return "8021X-UNSPEC"; case RSN_SEL(RSN_ASE_8021X_PSK): return "8021X-PSK"; + case RSN_SEL(RSN_ASE_8021X_UNSPEC_SHA256): + return "8021X-UNSPEC-SHA256"; + case RSN_SEL(RSN_ASE_8021X_PSK_SHA256): + return "8021X-PSK-256"; case RSN_SEL(RSN_ASE_NONE): return "NONE"; }