Backport Aruba dictionary from v4 (#5164)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 66effc54c7058b4cc70230951b18aeca6e6ae5ad..929099056623c7bf7cc10013d0d0c9467fcca8f1 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -13,6 +13,7 @@ FreeRADIUS 3.2.4 Fri 26 May 2023 12:00:00 EDT urgency=low
        * Add auto_escape to sample SQL module config
        * Add 'if not exists' to mysql create table queries. ref #5032 (#5137)
        * Add lookback and more configuration to totp.  See mods-available/totp
+       * Update dictionary.aruba
 
        Bug fixes
        * Fix corner case with empty defaults in rlm_files.  Fixes #5035

diff --git a/share/dictionary.aruba b/share/dictionary.aruba
index f4a4a0391a495d6f826fc7d31e6a84fa83b5b28f..c2373ed64e2266eaee8f8611f3b0d4da1afc4710 100644 (file)
--- a/share/dictionary.aruba
+++ b/share/dictionary.aruba
@@ -67,14 +67,31 @@ ATTRIBUTE   Aruba-QoS-Trust-Mode                    52      integer
 ATTRIBUTE      Aruba-UBT-Gateway-Role                  53      string
 ATTRIBUTE      Aruba-Gateway-Zone                      54      string
 
+ATTRIBUTE      Aruba-DPP-Bootstrapping-Key-SHA256      55      string
+ATTRIBUTE      Aruba-DPP-Bootstrapping-Net-Access-Key-SHA256 56        string
+ATTRIBUTE      Aruba-DPP-Bootstrapping-Key-B64         57      string
+
 ATTRIBUTE      Aruba-STP-Admin-Edge-Port               58      integer
 
 ATTRIBUTE      Aruba-UBT-Gateway-CPPM-Role             59      string
 
-ATTRIBUTE      Aruba-AP-MAC-Address                    60      string
-ATTRIBUTE      Aruba-Device-MAC-Address                61      string
+ATTRIBUTE      Aruba-AP-MAC-Address                    60      string
+ATTRIBUTE      Aruba-Device-MAC-Address                61      string
+ATTRIBUTE      Aruba-MPSK-Key-Name                     62      string
 ATTRIBUTE      Aruba-Device-Traffic-Class              63      integer
 
+ATTRIBUTE      Aruba-PVLAN-Port-Type                   64      integer
+ATTRIBUTE      Aruba-Network-Test                      65      integer
+ATTRIBUTE      Aruba-MPSK-Lookup-Info                  66      string
+ATTRIBUTE      Aruba-AVPair                            67      string
+ATTRIBUTE      Aruba-DPP-Service-Type                  68      integer
+
+ATTRIBUTE      Aruba-User-Mgmt-Interface               69      string
+
+ATTRIBUTE      Aruba-Poe-Allocate-By-Method            70      integer
+
+ATTRIBUTE      Aruba-DPP-AKMs                          71      string
+ATTRIBUTE      Aruba-DPP-Passphrase                    72      string encrypt=2
 
 VALUE  Aruba-AirGroup-Device-Type      Personal-Device         1
 VALUE  Aruba-AirGroup-Device-Type      Shared-Device           2
@@ -98,4 +115,15 @@ VALUE       Aruba-QoS-Trust-Mode            None                    2
 VALUE  Aruba-STP-Admin-Edge-Port       Disable                 0
 VALUE  Aruba-STP-Admin-Edge-Port       Enable                  1
 
+VALUE  Aruba-PVLAN-Port-Type           None                    0
+VALUE  Aruba-PVLAN-Port-Type           Promiscuous             1
+VALUE  Aruba-PVLAN-Port-Type           Secondary               2
+
+VALUE  Aruba-DPP-Service-Type          DDP-Boostrap-Authorization 1
+VALUE  Aruba-DPP-Service-Type          DDP-Identity-Update     2
+VALUE  Aruba-DPP-Service-Type          DDP-Net-Access          3
+
+VALUE  Aruba-PoE-Allocate-By-Method    Class                   1
+VALUE  Aruba-PoE-Allocate-By-Method    Usage                   2
+
 END-VENDOR Aruba