Hauke Mehrtens
164428d2d6
Backport upstream iw commit d90618809e06 ("iw: scan: print RSN
Element Override IEs") as 001-*.patch so `iw scan` decodes the
RSNOE (vendor WFA type 41) and RSNO2E (type 42) elements that
hostapd emits for WPA3 Compatibility / RSN Overriding APs.
Also refresh the hunk offsets in 200-reduce_size.patch.
Link: https://github.com/openwrt/openwrt/pull/23009
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From d90618809e06e123241f57efdb7039a7a8a43d58 Mon Sep 17 00:00:00 2001
|
|
From: Alex Gavin <a_gavin@icloud.com>
|
|
Date: Sun, 15 Mar 2026 22:16:46 -0700
|
|
Subject: iw: scan: print RSN Element Override IEs
|
|
|
|
Parse body of RSN Element Override IEs as RSN IEs
|
|
using existing code.
|
|
|
|
RSN IEs are a minimum size of 4 octets, as detailed
|
|
in IEEE802.11-2024, 9.4.2.23.1
|
|
|
|
Example output:
|
|
RSN Element Override:
|
|
* Version: 1
|
|
* Group cipher: CCMP
|
|
* Pairwise ciphers: CCMP
|
|
* Authentication suites: SAE
|
|
* Capabilities: 16-PTKSA-RC 1-GTKSA-RC MFP-required MFP-capable (0x00cc)
|
|
RSN Element Override 2:
|
|
* Version: 1
|
|
* Group cipher: CCMP
|
|
* Pairwise ciphers: GCMP-256
|
|
* Authentication suites: SAE-EXT-KEY
|
|
* Capabilities: 16-PTKSA-RC 1-GTKSA-RC MFP-required MFP-capable (0x00cc)
|
|
|
|
Signed-off-by: Alex Gavin <a_gavin@icloud.com>
|
|
Link: https://patch.msgid.link/20260316051646.18303-2-a_gavin@icloud.com
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
scan.c | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
--- a/scan.c
|
|
+++ b/scan.c
|
|
@@ -1893,6 +1893,14 @@ static void print_wifi_osen(const uint8_
|
|
print_osen_ie("OSEN", "OSEN", len, data);
|
|
}
|
|
|
|
+static void print_wifi_rsn_override(const uint8_t type, uint8_t len,
|
|
+ const uint8_t *data,
|
|
+ const struct ie_context *ctx)
|
|
+{
|
|
+ printf("\n\t");
|
|
+ print_rsn_ie("CCMP", "IEEE802.1X", len, data);
|
|
+}
|
|
+
|
|
static bool print_wifi_wmm_param(const uint8_t *data, uint8_t len)
|
|
{
|
|
int i;
|
|
@@ -2344,6 +2352,8 @@ static const struct ie_print wfa_printer
|
|
[16] = { "HotSpot 2.0 Indication", print_hs20_ind, 1, 255, BIT(PRINT_SCAN), },
|
|
[18] = { "HotSpot 2.0 OSEN", print_wifi_osen, 1, 255, BIT(PRINT_SCAN), },
|
|
[28] = { "OWE Transition Mode", print_wifi_owe_tarns, 7, 255, BIT(PRINT_SCAN), },
|
|
+ [41] = { "RSN Element Override", print_wifi_rsn_override, 4, 255, BIT(PRINT_SCAN), },
|
|
+ [42] = { "RSN Element Override 2", print_wifi_rsn_override, 4, 255, BIT(PRINT_SCAN), },
|
|
};
|
|
|
|
static void print_vendor(unsigned char len, unsigned char *data,
|