wifi-scripts: ucode: iwinfo: expand AKM display

This exands the list of AKMs to display:
 - display the hash when larger than the default (loosely based on
   what hostapd uses in config).
   - renaming 'WPA PSK2' to 'WPA PSK-SHA256' as a result
 - separate FILS suites from plain 802.1x
 - add suites 3, 5, 9, 19, 20, 24, and 25

Signed-off-by: Eneas U de Queiroz <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20686
Signed-off-by: Robert Marko <[email protected]>

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/iwinfo.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/iwinfo.uc
index 73bd9515a0658c95c670e1766394271294c34b00..21244089ab84c37f4b26046febdb0594dc309805 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/iwinfo.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/iwinfo.uc
@@ -172,29 +172,59 @@ function format_rate(rate) {
 function format_mgmt_key(key) {
        switch(+key) {
        case 1:
-       case 11:
-       case 12:
-       case 13:
-       case 14:
-       case 15:
-       case 16:
-       case 17:
                return '802.1x';
 
        case 2:
                return 'WPA PSK';
 
+       case 3:
+               return 'FT 802.1x';
+
        case 4:
                return 'FT PSK';
 
+       case 5:
+       case 11: // deprecated 802.1x-suiteB-SHA256
+               return '802.1x-SHA256';
+
        case 6:
-               return 'WPA PSK2';
+               return 'WPA PSK-SHA256';
 
-       case 8: 
+       case 8: // SAE with SHA256
+       case 24: // SAE using group-dependent hash
                return 'SAE';
 
+       case 9: // FT SAE with SHA256
+       case 25: // FT SAE using group-dependent hash
+               return 'FT SAE';
+
+       case 12:
+               return '802.1x-192bit';
+
+       case 13:
+               return 'FT 802.1x-SHA384';
+
+       case 14:
+               return 'FILS-SHA256';
+
+       case 15:
+               return 'FILS-SHA384';
+
+       case 16:
+               return 'FT FILS-SHA256';
+
+       case 17:
+               return 'FT FILS-SHA384';
+
        case 18:
                return 'OWE';
+
+       case 19:
+               return 'FT PSK-SHA384';
+
+       case 20:
+               return 'WPA PSK-SHA384';
+
        }
 
        return null;