From: Arran Cudbard-Bell Date: Mon, 16 Apr 2018 08:07:03 +0000 (+1200) Subject: Format dictionary files X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6964bd96b8bcd216ab8baa1e85a3cb2b146cce0f;p=thirdparty%2Ffreeradius-server.git Format dictionary files --- diff --git a/share/dictionary.cisco.vpn3000 b/share/dictionary.cisco.vpn3000 index e2dae38c900..251966a479f 100644 --- a/share/dictionary.cisco.vpn3000 +++ b/share/dictionary.cisco.vpn3000 @@ -103,7 +103,7 @@ ATTRIBUTE Cisco-VPN3000-WebVPN-File-Server-Entry-Enable 95 integer ATTRIBUTE Cisco-VPN3000-WebVPN-File-Server-Browsing-Enable 96 integer ATTRIBUTE Cisco-VPN3000-WebVPN-Port-Forwarding-Enable 97 integer ATTRIBUTE Cisco-VPN3000-WebVPN-Outlook-Exchange-Proxy-Enable 98 integer -ATTRIBUTE Cisco-VPN3000-WebVPN-HTTP-Proxy-Enable 99 integer +ATTRIBUTE Cisco-VPN3000-WebVPN-HTTP-Proxy-Enable 99 integer ATTRIBUTE Cisco-VPN3000-WebVPN-Auto-Applet-Download-Enable 100 integer ATTRIBUTE Cisco-VPN3000-WebVPN-Citrix-MetaFrame-Enable 101 integer ATTRIBUTE Cisco-VPN3000-WebVPN-Apply-ACL 102 integer diff --git a/share/dictionary.dhcpv6 b/share/dictionary.dhcpv6 index 2e24e13ee0e..88091dd3323 100644 --- a/share/dictionary.dhcpv6 +++ b/share/dictionary.dhcpv6 @@ -184,7 +184,7 @@ ATTRIBUTE DHCPv6-NTP-Server 56 tlv BEGIN-TLV DHCPv6-NTP-Server ATTRIBUTE DHCPv6-NTP-Server-Address 1 ipv6addr ATTRIBUTE DHCPv6-NTP-Server-Multicast-Address 2 ipv6addr -ATTRIBUTE DHCPv6-NTP-Server-FQDN 3 octets # Domain name +ATTRIBUTE DHCPv6-NTP-Server-FQDN 3 octets # Domain name END-TLV DHCPv6-NTP-Server # @@ -204,39 +204,39 @@ ATTRIBUTE DHCPv6-Bootfile-URL 59 string ATTRIBUTE DHCPv6-Bootfile-Param 60 string array ATTRIBUTE DHCPv6-Client-Arch-Type 61 uint16 array -VALUE DHCPv6-Client-Arch-Type x86-BIOS 0 -VALUE DHCPv6-Client-Arch-Type NEC-PC98 1 -VALUE DHCPv6-Client-Arch-Type Itanium 2 -VALUE DHCPv6-Client-Arch-Type DEC-Alpha 3 -VALUE DHCPv6-Client-Arch-Type Arc-x86 4 -VALUE DHCPv6-Client-Arch-Type Intel-Lean-Client 5 -VALUE DHCPv6-Client-Arch-Type x86-UEFI 6 -VALUE DHCPv6-Client-Arch-Type x64-UEFI 7 -VALUE DHCPv6-Client-Arch-Type EFI-Xscale 8 -VALUE DHCPv6-Client-Arch-Type EBC 9 -VALUE DHCPv6-Client-Arch-Type ARM-32-bit-UEFI 10 -VALUE DHCPv6-Client-Arch-Type ARM-64-bit-UEFI 11 -VALUE DHCPv6-Client-Arch-Type PowerPC-Open-Firmware 12 -VALUE DHCPv6-Client-Arch-Type PowerPC-ePAPR 13 -VALUE DHCPv6-Client-Arch-Type POWER-OPAL-v3 14 -VALUE DHCPv6-Client-Arch-Type x86-UEFI-Boot-From-HTTP 15 -VALUE DHCPv6-Client-Arch-Type x64-UEFI-Boot-From-HTTP 16 -VALUE DHCPv6-Client-Arch-Type EBC-Boot-From-HTTP 17 -VALUE DHCPv6-Client-Arch-Type ARM-UEFI-32-Boot-From-HTTP 18 -VALUE DHCPv6-Client-Arch-Type ARM-UEFI-64-Boot-From-HTTP 19 -VALUE DHCPv6-Client-Arch-Type PCAT-BIOS-Boot-From-HTTP 20 -VALUE DHCPv6-Client-Arch-Type ARM-32-Uboot 21 -VALUE DHCPv6-Client-Arch-Type ARM-64-Uboot 22 -VALUE DHCPv6-Client-Arch-Type ARM-Uboot-32-Boot-From-HTTP 23 -VALUE DHCPv6-Client-Arch-Type ARM-Uboot-64-Boot-From-HTTP 24 -VALUE DHCPv6-Client-Arch-Type RISC-V-32-Bit-UEFI 25 -VALUE DHCPv6-Client-Arch-Type RISC-V-32-Bit-UEFI-Boot-From-HTTP 26 -VALUE DHCPv6-Client-Arch-Type RISC-V-64-Bit-UEFI 27 -VALUE DHCPv6-Client-Arch-Type RISC-V-64-Bit-UEFI-Boot-From-HTTP 28 -VALUE DHCPv6-Client-Arch-Type RISC-V-128-Bit-UEFI 29 -VALUE DHCPv6-Client-Arch-Type RISC-V-128-Bit-UEFI-Boot-From-HTTP 30 -VALUE DHCPv6-Client-Arch-Type S390-Basic 31 -VALUE DHCPv6-Client-Arch-Type S390-Extended 32 +VALUE DHCPv6-Client-Arch-Type x86-BIOS 0 +VALUE DHCPv6-Client-Arch-Type NEC-PC98 1 +VALUE DHCPv6-Client-Arch-Type Itanium 2 +VALUE DHCPv6-Client-Arch-Type DEC-Alpha 3 +VALUE DHCPv6-Client-Arch-Type Arc-x86 4 +VALUE DHCPv6-Client-Arch-Type Intel-Lean-Client 5 +VALUE DHCPv6-Client-Arch-Type x86-UEFI 6 +VALUE DHCPv6-Client-Arch-Type x64-UEFI 7 +VALUE DHCPv6-Client-Arch-Type EFI-Xscale 8 +VALUE DHCPv6-Client-Arch-Type EBC 9 +VALUE DHCPv6-Client-Arch-Type ARM-32-bit-UEFI 10 +VALUE DHCPv6-Client-Arch-Type ARM-64-bit-UEFI 11 +VALUE DHCPv6-Client-Arch-Type PowerPC-Open-Firmware 12 +VALUE DHCPv6-Client-Arch-Type PowerPC-ePAPR 13 +VALUE DHCPv6-Client-Arch-Type POWER-OPAL-v3 14 +VALUE DHCPv6-Client-Arch-Type x86-UEFI-Boot-From-HTTP 15 +VALUE DHCPv6-Client-Arch-Type x64-UEFI-Boot-From-HTTP 16 +VALUE DHCPv6-Client-Arch-Type EBC-Boot-From-HTTP 17 +VALUE DHCPv6-Client-Arch-Type ARM-UEFI-32-Boot-From-HTTP 18 +VALUE DHCPv6-Client-Arch-Type ARM-UEFI-64-Boot-From-HTTP 19 +VALUE DHCPv6-Client-Arch-Type PCAT-BIOS-Boot-From-HTTP 20 +VALUE DHCPv6-Client-Arch-Type ARM-32-Uboot 21 +VALUE DHCPv6-Client-Arch-Type ARM-64-Uboot 22 +VALUE DHCPv6-Client-Arch-Type ARM-Uboot-32-Boot-From-HTTP 23 +VALUE DHCPv6-Client-Arch-Type ARM-Uboot-64-Boot-From-HTTP 24 +VALUE DHCPv6-Client-Arch-Type RISC-V-32-Bit-UEFI 25 +VALUE DHCPv6-Client-Arch-Type RISC-V-32-Bit-UEFI-Boot-From-HTTP 26 +VALUE DHCPv6-Client-Arch-Type RISC-V-64-Bit-UEFI 27 +VALUE DHCPv6-Client-Arch-Type RISC-V-64-Bit-UEFI-Boot-From-HTTP 28 +VALUE DHCPv6-Client-Arch-Type RISC-V-128-Bit-UEFI 29 +VALUE DHCPv6-Client-Arch-Type RISC-V-128-Bit-UEFI-Boot-From-HTTP 30 +VALUE DHCPv6-Client-Arch-Type S390-Basic 31 +VALUE DHCPv6-Client-Arch-Type S390-Extended 32 ATTRIBUTE DHCPv6-Client-Network-Interface-ID 62 octets # Complex struct see RFC 5970 @@ -320,7 +320,9 @@ ATTRIBUTE DHCPv6-PCP-Server 86 ipv6addr array # # RFC 7341 - DHCPv4-over-DHCPv6 (DHCP 4o6) Transport # -ATTRIBUTE DHCPv6-DHCPv4-Msg 87 octets # Foreign protocol (DHCPv4) +BEGIN-VENDOR DHCP + +ATTRIBUTE DHCPv6-DHCPv4-Msg 87 octets # Foreign protocol (v4) # # RFC 7598 - DHCPv6 Options for Configuration of Softwire Address @@ -340,11 +342,11 @@ ATTRIBUTE DHCPv6-S46-Cont-LW 96 octets # Complex struct see RFC 7598 # A DHCPv6-Based Prioritization Mechanism # ATTRIBUTE DHCPv6-S46-Priority 111 uint16 array -VALUE DHCPv6-S46-Priority DS-Lite 64 -VALUE DHCPv6-S46-Priority DHCPv4-Over-DHCPv6 88 -VALUE DHCPv6-S46-Priority MAP-E 94 -VALUE DHCPv6-S46-Priority MAP-T 95 -VALUE DHCPv6-S46-Priority Lightweight-4-Over-6 96 +VALUE DHCPv6-S46-Priority DS-Lite 64 +VALUE DHCPv6-S46-Priority DHCPv4-Over-DHCPv6 88 +VALUE DHCPv6-S46-Priority MAP-E 94 +VALUE DHCPv6-S46-Priority MAP-T 95 +VALUE DHCPv6-S46-Priority Lightweight-4-Over-6 96 # # RFC 7600 - IPv4 Residual Deployment via IPv6 - A Stateless Solution (4rd) @@ -376,19 +378,19 @@ ATTRIBUTE DHCPv6-MPL-Parameters 104 octets # Complex struct see RFC 7774 # ATTRIBUTE DHCPv6-ANI-Access-Technology-Type 105 uint16 -VALUE DHCPv6-ANI-Access-Technology-Type Virtual 1 -VALUE DHCPv6-ANI-Access-Technology-Type PPP 2 -VALUE DHCPv6-ANI-Access-Technology-Type IEEE802-3 3 -VALUE DHCPv6-ANI-Access-Technology-Type IEEE802-11abg 4 -VALUE DHCPv6-ANI-Access-Technology-Type IEEE802-16e 5 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-GERAN 6 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-UTRAN 7 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-E-UTRAN 8 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-eHRPD 9 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-HRPD 10 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-1xRTT 11 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-UMB 12 -VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-NB-IOT 13 +VALUE DHCPv6-ANI-Access-Technology-Type Virtual 1 +VALUE DHCPv6-ANI-Access-Technology-Type PPP 2 +VALUE DHCPv6-ANI-Access-Technology-Type IEEE802-3 3 +VALUE DHCPv6-ANI-Access-Technology-Type IEEE802-11abg 4 +VALUE DHCPv6-ANI-Access-Technology-Type IEEE802-16e 5 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-GERAN 6 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-UTRAN 7 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-E-UTRAN 8 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-eHRPD 9 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP-HRPD 10 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-1xRTT 11 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-UMB 12 +VALUE DHCPv6-ANI-Access-Technology-Type 3GPP2-NB-IOT 13 ATTRIBUTE DHCPv6-ANI-Network-Name 106 string ATTRIBUTE DHCPv6-ANI-Access-Point-Name 107 string @@ -405,17 +407,17 @@ ATTRIBUTE DHCPv6-Prefix64 113 octets # Complex (and stupid) struct # RFC 8156 - DHCPv6 Failover Protocol # ATTRIBUTE DHCPv6-Failover-Binding-Status 114 uint8 -VALUE DHCPv6-Failover-Binding-Status Active 1 -VALUE DHCPv6-Failover-Binding-Status Expired 2 -VALUE DHCPv6-Failover-Binding-Status Released 3 -VALUE DHCPv6-Failover-Binding-Status Pending-Free 4 -VALUE DHCPv6-Failover-Binding-Status Free 5 -VALUE DHCPv6-Failover-Binding-Status Free-Bakcup 6 -VALUE DHCPv6-Failover-Binding-Status Abandoned 7 -VALUE DHCPv6-Failover-Binding-Status Reset 8 +VALUE DHCPv6-Failover-Binding-Status Active 1 +VALUE DHCPv6-Failover-Binding-Status Expired 2 +VALUE DHCPv6-Failover-Binding-Status Released 3 +VALUE DHCPv6-Failover-Binding-Status Pending-Free 4 +VALUE DHCPv6-Failover-Binding-Status Free 5 +VALUE DHCPv6-Failover-Binding-Status Free-Bakcup 6 +VALUE DHCPv6-Failover-Binding-Status Abandoned 7 +VALUE DHCPv6-Failover-Binding-Status Reset 8 ATTRIBUTE DHCPv6-Failover-Connect-Flags 115 uint16 -VALUE DHCPv6-Failover-Connect-Flags Fixed-PD-Length 1 +VALUE DHCPv6-Failover-Connect-Flags Fixed-PD-Length 1 ATTRIBUTE DHCPv6-Failover-DNS-Removal-Info 116 tlv @@ -424,10 +426,10 @@ ATTRIBUTE DHCPv6-Failover-DNS-Host-Name 117 octets # Domain name ATTRIBUTE DHCPv6-Failover-DNS-Zone-Name 118 octets # Zone name ATTRIBUTE DHCPv6-Failover-DNS-Flags 119 uint16 -VALUE DHCPv6-Failover-DNS-Flags Fwd-Up-To-Date 0x01 -VALUE DHCPv6-Failover-DNS-Flags Rev-Up-To-Date 0x02 -VALUE DHCPv6-Failover-DNS-Flags Synthesized-Name 0x04 -VALUE DHCPv6-Failover-DNS-Flags Using-Requested-FQDN 0x08 +VALUE DHCPv6-Failover-DNS-Flags Fwd-Up-To-Date 0x01 +VALUE DHCPv6-Failover-DNS-Flags Rev-Up-To-Date 0x02 +VALUE DHCPv6-Failover-DNS-Flags Synthesized-Name 0x04 +VALUE DHCPv6-Failover-DNS-Flags Using-Requested-FQDN 0x08 END-TLV DHCPv6-Failover-DNS-Removal-Info ATTRIBUTE DHCPv6-Failover-Expiration-Time 120 date @@ -443,21 +445,21 @@ ATTRIBUTE DHCPv6-Failover-Reconfigure-Data 129 octets # Complex struct see RFC ATTRIBUTE DHCPv6-Failover-Relationship-Name 130 string ATTRIBUTE DHCPv6-Failover-Server-Flags 131 uint8 -VALUE DHCPv6-Failover-Server-Flags Communicated 0x01 -VALUE DHCPv6-Failover-Server-Flags Startup 0x02 -VALUE DHCPv6-Failover-Server-Flags ACK-Startup 0x04 +VALUE DHCPv6-Failover-Server-Flags Communicated 0x01 +VALUE DHCPv6-Failover-Server-Flags Startup 0x02 +VALUE DHCPv6-Failover-Server-Flags ACK-Startup 0x04 ATTRIBUTE DHCPv6-Failover-Server-State 132 uint8 -VALUE DHCPv6-Failover-Server-State Startup 1 -VALUE DHCPv6-Failover-Server-State Normal 2 -VALUE DHCPv6-Failover-Server-State Communications-Interrupted 3 -VALUE DHCPv6-Failover-Server-State Partner-Down 4 -VALUE DHCPv6-Failover-Server-State Potential-Conflict 5 -VALUE DHCPv6-Failover-Server-State Recover 6 -VALUE DHCPv6-Failover-Server-State Recover-Wait 7 -VALUE DHCPv6-Failover-Server-State Recover-Done 8 -VALUE DHCPv6-Failover-Server-State Resolution-Interrupted 9 -VALUE DHCPv6-Failover-Server-State Conflict-Done 10 +VALUE DHCPv6-Failover-Server-State Startup 1 +VALUE DHCPv6-Failover-Server-State Normal 2 +VALUE DHCPv6-Failover-Server-State Communications-Interrupted 3 +VALUE DHCPv6-Failover-Server-State Partner-Down 4 +VALUE DHCPv6-Failover-Server-State Potential-Conflict 5 +VALUE DHCPv6-Failover-Server-State Recover 6 +VALUE DHCPv6-Failover-Server-State Recover-Wait 7 +VALUE DHCPv6-Failover-Server-State Recover-Done 8 +VALUE DHCPv6-Failover-Server-State Resolution-Interrupted 9 +VALUE DHCPv6-Failover-Server-State Conflict-Done 10 ATTRIBUTE DHCPv6-Failover-Start-Time-Of-State 133 date ATTRIBUTE DHCPv6-Failover-State-Expiration-Time 134 uint32 @@ -474,40 +476,42 @@ ATTRIBUTE DHCPv6-ANDSF-Address 143 ipv6addr FLAGS internal ATTRIBUTE DHCPv6-Msg-Type 65536 uint8 -VALUE DHCPv6-Msg-Type Solicit 1 -VALUE DHCPv6-Msg-Type Advertise 2 -VALUE DHCPv6-Msg-Type Request 3 -VALUE DHCPv6-Msg-Type Confirm 4 -VALUE DHCPv6-Msg-Type Renew 5 -VALUE DHCPv6-Msg-Type Rebind 6 -VALUE DHCPv6-Msg-Type Reply 7 -VALUE DHCPv6-Msg-Type Release 8 -VALUE DHCPv6-Msg-Type Decline 9 -VALUE DHCPv6-Msg-Type Reconfigure 10 -VALUE DHCPv6-Msg-Type Information-Request 11 -VALUE DHCPv6-Msg-Type Relay-Forward 12 -VALUE DHCPv6-Msg-Type Relay-Reply 13 -VALUE DHCPv6-Msg-Type Lease-Query 14 -VALUE DHCPv6-Msg-Type Lease-Query-Reply 15 -VALUE DHCPv6-Msg-Type Lease-Query-Done 16 -VALUE DHCPv6-Msg-Type Lease-Query-Data 17 -VALUE DHCPv6-Msg-Type Reconfigure-Request 18 -VALUE DHCPv6-Msg-Type Reconfigure-Reply 19 -VALUE DHCPv6-Msg-Type DHCPv4-Query 20 -VALUE DHCPv6-Msg-Type DHCPv4-Response 21 -VALUE DHCPv6-Msg-Type Active-Lease-Query 22 -VALUE DHCPv6-Msg-Type Start-TLS 23 -VALUE DHCPv6-Msg-Type Bind-Update 24 -VALUE DHCPv6-Msg-Type Bind-Reply 25 -VALUE DHCPv6-Msg-Type Pool-Request 26 -VALUE DHCPv6-Msg-Type Pool-Response 27 -VALUE DHCPv6-Msg-Type Update-Request 28 -VALUE DHCPv6-Msg-Type Update-Request-All 29 -VALUE DHCPv6-Msg-Type Update-Done 30 -VALUE DHCPv6-Msg-Type Connect 31 -VALUE DHCPv6-Msg-Type Connect-Reply 32 -VALUE DHCPv6-Msg-Type Disconnect 33 -VALUE DHCPv6-Msg-Type State 34 -VALUE DHCPv6-Msg-Type Contact 35 +VALUE DHCPv6-Msg-Type Solicit 1 +VALUE DHCPv6-Msg-Type Advertise 2 +VALUE DHCPv6-Msg-Type Request 3 +VALUE DHCPv6-Msg-Type Confirm 4 +VALUE DHCPv6-Msg-Type Renew 5 +VALUE DHCPv6-Msg-Type Rebind 6 +VALUE DHCPv6-Msg-Type Reply 7 +VALUE DHCPv6-Msg-Type Release 8 +VALUE DHCPv6-Msg-Type Decline 9 +VALUE DHCPv6-Msg-Type Reconfigure 10 +VALUE DHCPv6-Msg-Type Information-Request 11 +VALUE DHCPv6-Msg-Type Relay-Forward 12 +VALUE DHCPv6-Msg-Type Relay-Reply 13 +VALUE DHCPv6-Msg-Type Lease-Query 14 +VALUE DHCPv6-Msg-Type Lease-Query-Reply 15 +VALUE DHCPv6-Msg-Type Lease-Query-Done 16 +VALUE DHCPv6-Msg-Type Lease-Query-Data 17 +VALUE DHCPv6-Msg-Type Reconfigure-Request 18 +VALUE DHCPv6-Msg-Type Reconfigure-Reply 19 +VALUE DHCPv6-Msg-Type DHCPv4-Query 20 +VALUE DHCPv6-Msg-Type DHCPv4-Response 21 +VALUE DHCPv6-Msg-Type Active-Lease-Query 22 +VALUE DHCPv6-Msg-Type Start-TLS 23 +VALUE DHCPv6-Msg-Type Bind-Update 24 +VALUE DHCPv6-Msg-Type Bind-Reply 25 +VALUE DHCPv6-Msg-Type Pool-Request 26 +VALUE DHCPv6-Msg-Type Pool-Response 27 +VALUE DHCPv6-Msg-Type Update-Request 28 +VALUE DHCPv6-Msg-Type Update-Request-All 29 +VALUE DHCPv6-Msg-Type Update-Done 30 +VALUE DHCPv6-Msg-Type Connect 31 +VALUE DHCPv6-Msg-Type Connect-Reply 32 +VALUE DHCPv6-Msg-Type Disconnect 33 +VALUE DHCPv6-Msg-Type State 34 +VALUE DHCPv6-Msg-Type Contact 35 ATTRIBUTE DHCPv6-Transaction-ID 65537 uint64 # Actually 48bits + +END-VENDOR DHCP diff --git a/share/dictionary.eap.aka b/share/dictionary.eap.aka index 8af39275271..5269caeaf9c 100644 --- a/share/dictionary.eap.aka +++ b/share/dictionary.eap.aka @@ -16,11 +16,11 @@ ATTRIBUTE EAP-AKA-Permanent-ID-Req 10 bool ATTRIBUTE EAP-AKA-MAC 11 octets[16] ATTRIBUTE EAP-AKA-Notification 12 short -VALUE EAP-AKA-Notification General-Failure-After-Authentication 0 -VALUE EAP-AKA-Notification Temporarily-Denied 1026 -VALUE EAP-AKA-Notification Not-Subscribed 1031 -VALUE EAP-AKA-Notification General-Failure 16384 -VALUE EAP-AKA-Notification Success 32768 +VALUE EAP-AKA-Notification General-Failure-After-Authentication 0 +VALUE EAP-AKA-Notification Temporarily-Denied 1026 +VALUE EAP-AKA-Notification Not-Subscribed 1031 +VALUE EAP-AKA-Notification General-Failure 16384 +VALUE EAP-AKA-Notification Success 32768 ATTRIBUTE EAP-AKA-Any-ID-Req 13 bool ATTRIBUTE EAP-AKA-Identity 14 string @@ -28,13 +28,13 @@ ATTRIBUTE EAP-AKA-Identity 14 string ATTRIBUTE EAP-AKA-Fullauth-ID-Req 17 bool ATTRIBUTE EAP-AKA-Client-Error-Code 22 short -VALUE EAP-AKA-Client-Error-Code Unable-To-Process-Packet 0 +VALUE EAP-AKA-Client-Error-Code Unable-To-Process-Packet 0 ATTRIBUTE EAP-AKA-KDF-Input 23 string ATTRIBUTE EAP-AKA-KDF 24 short -VALUE EAP-AKA-KDF EAP-AKA 0 -VALUE EAP-AKA-KDF EAP-AKA-Prime-With-CK-Prime-IK-Prime 1 +VALUE EAP-AKA-KDF EAP-AKA 0 +VALUE EAP-AKA-KDF EAP-AKA-Prime-With-CK-Prime-IK-Prime 1 # # Skippable-Attributes @@ -58,8 +58,8 @@ ATTRIBUTE EAP-AKA-Checkcode 134 octets # 0, 20 or 32 bytes ATTRIBUTE EAP-AKA-Bidding 136 short -VALUE EAP-AKA-Bidding Prefer-AKA 0 -VALUE EAP-AKA-Bidding Prefer-AKA-Prime 32768 # D Bit +VALUE EAP-AKA-Bidding Prefer-AKA 0 +VALUE EAP-AKA-Bidding Prefer-AKA-Prime 32768 # D Bit ATTRIBUTE EAP-AKA-Result-Ind 137 bool @@ -69,13 +69,13 @@ ATTRIBUTE EAP-AKA-Result-Ind 137 bool FLAGS internal ATTRIBUTE EAP-AKA-Subtype 256 integer -VALUE EAP-AKA-Subtype AKA-Challenge 1 -VALUE EAP-AKA-Subtype AKA-Authentication-Reject 2 -VALUE EAP-AKA-Subtype AKA-Synchronization-Failure 4 -VALUE EAP-AKA-Subtype AKA-Identity 5 -VALUE EAP-AKA-Subtype AKA-Notification 12 -VALUE EAP-AKA-Subtype AKA-Reauthentication 13 -VALUE EAP-AKA-Subtype AKA-Client-Error 14 +VALUE EAP-AKA-Subtype AKA-Challenge 1 +VALUE EAP-AKA-Subtype AKA-Authentication-Reject 2 +VALUE EAP-AKA-Subtype AKA-Synchronization-Failure 4 +VALUE EAP-AKA-Subtype AKA-Identity 5 +VALUE EAP-AKA-Subtype AKA-Notification 12 +VALUE EAP-AKA-Subtype AKA-Reauthentication 13 +VALUE EAP-AKA-Subtype AKA-Client-Error 14 ATTRIBUTE EAP-AKA-XRES 260 octets ATTRIBUTE EAP-AKA-CK 261 octets diff --git a/share/dictionary.eap.sim b/share/dictionary.eap.sim index 406b0c79eae..7dc615be228 100644 --- a/share/dictionary.eap.sim +++ b/share/dictionary.eap.sim @@ -14,11 +14,11 @@ ATTRIBUTE EAP-SIM-Permanent-ID-Req 10 bool ATTRIBUTE EAP-SIM-MAC 11 octets[16] ATTRIBUTE EAP-SIM-Notification 12 short -VALUE EAP-SIM-Notification General-Failure-After-Authentication 0 -VALUE EAP-SIM-Notification Temporarily-Denied 1026 -VALUE EAP-SIM-Notification Not-Subscribed 1031 -VALUE EAP-SIM-Notification General-Failure 16384 -VALUE EAP-SIM-Notification Success 32768 +VALUE EAP-SIM-Notification General-Failure-After-Authentication 0 +VALUE EAP-SIM-Notification Temporarily-Denied 1026 +VALUE EAP-SIM-Notification Not-Subscribed 1031 +VALUE EAP-SIM-Notification General-Failure 16384 +VALUE EAP-SIM-Notification Success 32768 ATTRIBUTE EAP-SIM-Any-ID-Req 13 bool ATTRIBUTE EAP-SIM-Identity 14 string @@ -28,10 +28,10 @@ ATTRIBUTE EAP-SIM-Selected-Version 16 short ATTRIBUTE EAP-SIM-Fullauth-ID-Req 17 bool ATTRIBUTE EAP-SIM-Client-Error-Code 22 short -VALUE EAP-SIM-Client-Error-Code Unable-To-Process-Packet 0 -VALUE EAP-SIM-Client-Error-Code Unsupported-Version 1 -VALUE EAP-SIM-Client-Error-Code Insufficient-Challenges 2 -VALUE EAP-SIM-Client-Error-Code RANDS-Not-Fresh 3 +VALUE EAP-SIM-Client-Error-Code Unable-To-Process-Packet 0 +VALUE EAP-SIM-Client-Error-Code Unsupported-Version 1 +VALUE EAP-SIM-Client-Error-Code Insufficient-Challenges 2 +VALUE EAP-SIM-Client-Error-Code RANDS-Not-Fresh 3 # # Skippable-Attributes @@ -59,11 +59,11 @@ ATTRIBUTE EAP-SIM-Result-Ind 137 bool FLAGS internal ATTRIBUTE EAP-SIM-Subtype 256 integer -VALUE EAP-SIM-Subtype SIM-Start 10 -VALUE EAP-SIM-Subtype SIM-Challenge 11 -VALUE EAP-SIM-Subtype SIM-Notification 12 -VALUE EAP-SIM-Subtype SIM-Reauthentication 13 -VALUE EAP-SIM-Subtype SIM-Client-Error 14 +VALUE EAP-SIM-Subtype SIM-Start 10 +VALUE EAP-SIM-Subtype SIM-Challenge 11 +VALUE EAP-SIM-Subtype SIM-Notification 12 +VALUE EAP-SIM-Subtype SIM-Reauthentication 13 +VALUE EAP-SIM-Subtype SIM-Client-Error 14 ATTRIBUTE EAP-SIM-SRES 1222 octets ATTRIBUTE EAP-SIM-KC 1223 octets diff --git a/share/dictionary.freeradius b/share/dictionary.freeradius index b2083712a02..43debe074c7 100644 --- a/share/dictionary.freeradius +++ b/share/dictionary.freeradius @@ -32,7 +32,6 @@ VALUE FreeRADIUS-Stats4-Type Global 1 VALUE FreeRADIUS-Stats4-Type Client 2 VALUE FreeRADIUS-Stats4-Type Listener 3 - # # All of the counters are in a sub-TLV # @@ -72,7 +71,6 @@ ATTRIBUTE FreeRADIUS-Stats4-CoA-ACK 15.9.44 integer64 ATTRIBUTE FreeRADIUS-Stats4-CoA-NAK 15.9.45 integer64 ATTRIBUTE FreeRADIUS-Stats4-Protocol-Error 15.9.52 integer64 - # # Attributes 127 through 187 are for statistics produced by # FreeRADIUS from version 2 to version 3. Version 4 produces diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal index 183b2e4e32e..3df96c68574 100644 --- a/share/dictionary.freeradius.internal +++ b/share/dictionary.freeradius.internal @@ -371,24 +371,24 @@ ATTRIBUTE SIM-IMSI 1205 string # The algorithm the SIM card uses (Milenage for UMTS, COMP128 for others) ATTRIBUTE SIM-Algo-Version 1206 integer -VALUE SIM-Algo-Version Comp128v1 0 -VALUE SIM-Algo-Version Comp128v2 1 -VALUE SIM-Algo-Version Comp128v3 2 -VALUE SIM-Algo-Version Milenage 3 +VALUE SIM-Algo-Version Comp128v1 0 +VALUE SIM-Algo-Version Comp128v2 1 +VALUE SIM-Algo-Version Comp128v3 2 +VALUE SIM-Algo-Version Milenage 3 ATTRIBUTE SIM-Method-Hint 1207 integer -VALUE SIM-Method-Hint Unknown 0 -VALUE SIM-Method-Hint SIM 1 -VALUE SIM-Method-Hint AKA 2 -VALUE SIM-Method-Hint AKA-Prime 3 +VALUE SIM-Method-Hint Unknown 0 +VALUE SIM-Method-Hint SIM 1 +VALUE SIM-Method-Hint AKA 2 +VALUE SIM-Method-Hint AKA-Prime 3 ATTRIBUTE SIM-Identity-Type 1208 integer -VALUE SIM-Identity-Type Unknown 0 -VALUE SIM-Identity-Type Permanent 1 -VALUE SIM-Identity-Type Pseudonym 2 -VALUE SIM-Identity-Type Fastauth 3 +VALUE SIM-Identity-Type Unknown 0 +VALUE SIM-Identity-Type Permanent 1 +VALUE SIM-Identity-Type Pseudonym 2 +VALUE SIM-Identity-Type Fastauth 3 # # AKA - Temporary root until we have protocol specific dictionaries. @@ -690,41 +690,41 @@ ATTRIBUTE TLS-OCSP-Response 1945 octets ATTRIBUTE TLS-Client-Error-Code 1946 uint8 -VALUE TLS-Client-Error-Code Close-Notify 0 -VALUE TLS-Client-Error-Code End-Of-Early-Data 1 -VALUE TLS-Client-Error-Code Unexpected-Message 10 -VALUE TLS-Client-Error-Code Bad-Record-Mac 20 -VALUE TLS-Client-Error-Code Decryption-Failed 21 -VALUE TLS-Client-Error-Code Record-Overflow 22 -VALUE TLS-Client-Error-Code Decompression-Failure 30 -VALUE TLS-Client-Error-Code Handshake-Failure 40 -VALUE TLS-Client-Error-Code No-Certificate 41 -VALUE TLS-Client-Error-Code Bad-Certificate 42 -VALUE TLS-Client-Error-Code Unsupported-Certificate 43 -VALUE TLS-Client-Error-Code Certificate-Revoked 44 -VALUE TLS-Client-Error-Code Certificate-Expired 45 -VALUE TLS-Client-Error-Code Certificate-Unknown 46 -VALUE TLS-Client-Error-Code Illegal-Parameter 47 -VALUE TLS-Client-Error-Code Unknown-CA 48 -VALUE TLS-Client-Error-Code Access-Denied 49 -VALUE TLS-Client-Error-Code Decode-Error 50 -VALUE TLS-Client-Error-Code Decrypt-Error 51 -VALUE TLS-Client-Error-Code Export-Restriction 60 -VALUE TLS-Client-Error-Code Protocol-Version 70 -VALUE TLS-Client-Error-Code Insufficient-Security 71 -VALUE TLS-Client-Error-Code Internal-Error 80 -VALUE TLS-Client-Error-Code Inappropriate-Fallback 86 -VALUE TLS-Client-Error-Code User-Cancelled 90 -VALUE TLS-Client-Error-Code No-Renegotiation 100 -VALUE TLS-Client-Error-Code Missing-Extension 109 -VALUE TLS-Client-Error-Code Unsupported-Extension 110 -VALUE TLS-Client-Error-Code Certificate-Unobtainable 111 -VALUE TLS-Client-Error-Code Unrecognized-Name 112 -VALUE TLS-Client-Error-Code Bad-Certificate-Status-Response 113 -VALUE TLS-Client-Error-Code Bad-Certificate-Hash-Value 114 -VALUE TLS-Client-Error-Code Unknown-PSK-Identity 115 -VALUE TLS-Client-Error-Code Certificate-Required 116 -VALUE TLS-Client-Error-Code No-Application-Protocol 120 +VALUE TLS-Client-Error-Code Close-Notify 0 +VALUE TLS-Client-Error-Code End-Of-Early-Data 1 +VALUE TLS-Client-Error-Code Unexpected-Message 10 +VALUE TLS-Client-Error-Code Bad-Record-Mac 20 +VALUE TLS-Client-Error-Code Decryption-Failed 21 +VALUE TLS-Client-Error-Code Record-Overflow 22 +VALUE TLS-Client-Error-Code Decompression-Failure 30 +VALUE TLS-Client-Error-Code Handshake-Failure 40 +VALUE TLS-Client-Error-Code No-Certificate 41 +VALUE TLS-Client-Error-Code Bad-Certificate 42 +VALUE TLS-Client-Error-Code Unsupported-Certificate 43 +VALUE TLS-Client-Error-Code Certificate-Revoked 44 +VALUE TLS-Client-Error-Code Certificate-Expired 45 +VALUE TLS-Client-Error-Code Certificate-Unknown 46 +VALUE TLS-Client-Error-Code Illegal-Parameter 47 +VALUE TLS-Client-Error-Code Unknown-CA 48 +VALUE TLS-Client-Error-Code Access-Denied 49 +VALUE TLS-Client-Error-Code Decode-Error 50 +VALUE TLS-Client-Error-Code Decrypt-Error 51 +VALUE TLS-Client-Error-Code Export-Restriction 60 +VALUE TLS-Client-Error-Code Protocol-Version 70 +VALUE TLS-Client-Error-Code Insufficient-Security 71 +VALUE TLS-Client-Error-Code Internal-Error 80 +VALUE TLS-Client-Error-Code Inappropriate-Fallback 86 +VALUE TLS-Client-Error-Code User-Cancelled 90 +VALUE TLS-Client-Error-Code No-Renegotiation 100 +VALUE TLS-Client-Error-Code Missing-Extension 109 +VALUE TLS-Client-Error-Code Unsupported-Extension 110 +VALUE TLS-Client-Error-Code Certificate-Unobtainable 111 +VALUE TLS-Client-Error-Code Unrecognized-Name 112 +VALUE TLS-Client-Error-Code Bad-Certificate-Status-Response 113 +VALUE TLS-Client-Error-Code Bad-Certificate-Hash-Value 114 +VALUE TLS-Client-Error-Code Unknown-PSK-Identity 115 +VALUE TLS-Client-Error-Code Certificate-Required 116 +VALUE TLS-Client-Error-Code No-Application-Protocol 120 ATTRIBUTE SoH-MS-Machine-OS-vendor 2100 integer VALUE SoH-MS-Machine-OS-vendor Microsoft 311 diff --git a/share/dictionary.mikrotik b/share/dictionary.mikrotik index 3b7242601fa..b6261874ba0 100644 --- a/share/dictionary.mikrotik +++ b/share/dictionary.mikrotik @@ -54,5 +54,4 @@ VALUE Mikrotik-Wireless-Enc-Algo TKIP 4 VALUE Mikrotik-Wireless-VLANID-Type 802.1q 0 VALUE Mikrotik-Wireless-VLANID-Type 802.1ad 1 - END-VENDOR Mikrotik diff --git a/share/dictionary.ruckus b/share/dictionary.ruckus index 40ca3c9087f..89fe1f0b5c0 100644 --- a/share/dictionary.ruckus +++ b/share/dictionary.ruckus @@ -63,11 +63,11 @@ ATTRIBUTE Ruckus-Eth-Profile-Id 133 integer ATTRIBUTE Ruckus-Zone-Name 134 string ATTRIBUTE Ruckus-Wlan-Name 135 string -ATTRIBUTE Ruckus-Read-Preference 137 octets -ATTRIBUTE Ruckus-Client-Host-Name 138 string -ATTRIBUTE Ruckus-Client-Os-Type 139 string -ATTRIBUTE Ruckus-Client-Os-Class 140 string -ATTRIBUTE Ruckus-Vlan-Pool 141 string +ATTRIBUTE Ruckus-Read-Preference 137 octets +ATTRIBUTE Ruckus-Client-Host-Name 138 string +ATTRIBUTE Ruckus-Client-Os-Type 139 string +ATTRIBUTE Ruckus-Client-Os-Class 140 string +ATTRIBUTE Ruckus-Vlan-Pool 141 string # # Integer Translations diff --git a/share/dictionary.sandy b/share/dictionary.sandy index ff37d883da8..bebc583ba58 100644 --- a/share/dictionary.sandy +++ b/share/dictionary.sandy @@ -8,47 +8,46 @@ # http://www.isi.edu/in-notes/iana/assignments/enterprise-numbers # -VENDOR Sandy 11406 - -BEGIN-VENDOR Sandy - -ATTRIBUTE Sandy-User-Id 1 integer -ATTRIBUTE Sandy-Group-Id 2 integer -ATTRIBUTE Sandy-GECOS 3 string -ATTRIBUTE Sandy-Shell 4 string -ATTRIBUTE Sandy-Home 5 string - -ATTRIBUTE Sandy-Mail-Service 100 integer -ATTRIBUTE Sandy-Mail-Authtype 101 integer -ATTRIBUTE Sandy-Mail-Challenge 102 string -ATTRIBUTE Sandy-Mail-Response 103 octets -ATTRIBUTE Sandy-Mail-Address 104 string -ATTRIBUTE Sandy-Mail-Spamcontrol 105 integer -ATTRIBUTE Sandy-Mail-Notification 106 octets -ATTRIBUTE Sandy-Mail-Box 107 string -ATTRIBUTE Sandy-Mail-Quota 108 integer -ATTRIBUTE Sandy-Mail-Filter 109 octets -ATTRIBUTE Sandy-Mail-Box-Control 110 integer -ATTRIBUTE Sandy-Mail-Client-IP 111 ipaddr -ATTRIBUTE Sandy-Mail-Client-Helo 110 string - - -VALUE Sandy-Mail-Service Transfer 1 -VALUE Sandy-Mail-Service Delivery 2 -VALUE Sandy-Mail-Service POP 3 -VALUE Sandy-Mail-Service IMAP 4 -VALUE Sandy-Mail-Service WEBMAIL 5 -VALUE Sandy-Mail-Service Control 6 - -VALUE Sandy-Mail-Authtype NONE 0 -VALUE Sandy-Mail-Authtype PLAIN 1 -VALUE Sandy-Mail-Authtype CRAM-MD5 2 -VALUE Sandy-Mail-Authtype APOP 3 -VALUE Sandy-Mail-Authtype KRB4 4 -VALUE Sandy-Mail-Authtype KRB5 5 -VALUE Sandy-Mail-Authtype NTLM 6 -VALUE Sandy-Mail-Authtype NTLM2 7 -VALUE Sandy-Mail-Authtype CRAM-MD4 8 -VALUE Sandy-Mail-Authtype CRAM-SHA1 9 - -END-VENDOR Sandy \ No newline at end of file +VENDOR Sandy 11406 + +BEGIN-VENDOR Sandy + +ATTRIBUTE Sandy-User-Id 1 integer +ATTRIBUTE Sandy-Group-Id 2 integer +ATTRIBUTE Sandy-GECOS 3 string +ATTRIBUTE Sandy-Shell 4 string +ATTRIBUTE Sandy-Home 5 string + +ATTRIBUTE Sandy-Mail-Service 100 integer +ATTRIBUTE Sandy-Mail-Authtype 101 integer +ATTRIBUTE Sandy-Mail-Challenge 102 string +ATTRIBUTE Sandy-Mail-Response 103 octets +ATTRIBUTE Sandy-Mail-Address 104 string +ATTRIBUTE Sandy-Mail-Spamcontrol 105 integer +ATTRIBUTE Sandy-Mail-Notification 106 octets +ATTRIBUTE Sandy-Mail-Box 107 string +ATTRIBUTE Sandy-Mail-Quota 108 integer +ATTRIBUTE Sandy-Mail-Filter 109 octets +ATTRIBUTE Sandy-Mail-Box-Control 110 integer +ATTRIBUTE Sandy-Mail-Client-IP 111 ipaddr +ATTRIBUTE Sandy-Mail-Client-Helo 110 string + +VALUE Sandy-Mail-Service Transfer 1 +VALUE Sandy-Mail-Service Delivery 2 +VALUE Sandy-Mail-Service POP 3 +VALUE Sandy-Mail-Service IMAP 4 +VALUE Sandy-Mail-Service WEBMAIL 5 +VALUE Sandy-Mail-Service Control 6 + +VALUE Sandy-Mail-Authtype NONE 0 +VALUE Sandy-Mail-Authtype PLAIN 1 +VALUE Sandy-Mail-Authtype CRAM-MD5 2 +VALUE Sandy-Mail-Authtype APOP 3 +VALUE Sandy-Mail-Authtype KRB4 4 +VALUE Sandy-Mail-Authtype KRB5 5 +VALUE Sandy-Mail-Authtype NTLM 6 +VALUE Sandy-Mail-Authtype NTLM2 7 +VALUE Sandy-Mail-Authtype CRAM-MD4 8 +VALUE Sandy-Mail-Authtype CRAM-SHA1 9 + +END-VENDOR Sandy diff --git a/share/dictionary.starent b/share/dictionary.starent index 9898cc0c7ce..aaa7decad1e 100644 --- a/share/dictionary.starent +++ b/share/dictionary.starent @@ -297,7 +297,6 @@ ATTRIBUTE SN-WSG-MIP-Simple-IP-Fallback 318 integer ATTRIBUTE SN-WLAN-AP-Identifier 319 octets ATTRIBUTE SN-WLAN-UE-Identifier 320 octets - ATTRIBUTE SNA-PPP-Ctrl-Input-Octets 1001 integer ATTRIBUTE SNA-PPP-Ctrl-Output-Octets 1002 integer ATTRIBUTE SNA-PPP-Ctrl-Input-Packets 1003 integer