Revert "Move EAP TLV definitions to share/dictionary.freeradius"

This reverts commit e340f7ee5de20de907ac4f406993e5fc386add68.

diff --git a/share/dictionary.freeradius b/share/dictionary.freeradius
index f6ead2eb09e66607b6567ffe584b916e47144a7c..0c108e51a41bef698fd2b365a58c7d7be2be84c9 100644 (file)
--- a/share/dictionary.freeradius
+++ b/share/dictionary.freeradius
@@ -140,49 +140,4 @@ ATTRIBUTE  FreeRADIUS-Queue-Use-Percentage         183     integer
 ATTRIBUTE      FreeRADIUS-Stats-Last-Packet-Recv       184     date
 ATTRIBUTE      FreeRADIUS-Stats-Last-Packet-Sent       185     date
 
-#
-# EAP-FAST TLVs
-#
-ATTRIBUTE      FreeRADIUS-EAP-FAST-TLV                 186     tlv
-ATTRIBUTE      FreeRADIUS-EAP-FAST-Result              186.3   short
-ATTRIBUTE      FreeRADIUS-EAP-FAST-NAK                 186.4   octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-Error               186.5   integer
-ATTRIBUTE      FreeRADIUS-EAP-FAST-Vendor-Specific     186.7   octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-EAP-Payload         186.9   octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-Intermediate-Result 186.10  octets
-
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC                 186.11  tlv
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Key             186.11.1        octets
-
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Opaque-TLV      186.11.2        tlv
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Key  186.11.2.1      octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Lifetime 186.11.2.3  integer
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Opaque-I-ID     186.11.2.5      octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Type 186.11.2.10     short
-
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Lifetime        186.11.3        integer
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-A-ID            186.11.4        octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-I-ID            186.11.5        octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-A-ID-Info       186.11.7        octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Acknowledge     186.11.8        short
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Info-TLV        186.11.9        tlv
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Info-PAC-Lifetime 186.11.9.3    integer
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Info-A-ID       186.11.9.4      octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Info-I-ID       186.11.9.5      octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Info-A-ID-Info  186.11.9.7      octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Info-PAC-Type   186.11.9.10     short
-
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PAC-Type            186.11.10       short
-
-ATTRIBUTE      FreeRADIUS-EAP-FAST-Crypto-Binding      186.12  octets
-
-ATTRIBUTE      FreeRADIUS-EAP-FAST-Trusted-Root        186.18  octets
-ATTRIBUTE      FreeRADIUS-EAP-FAST-Request-Action      186.19  short
-ATTRIBUTE      FreeRADIUS-EAP-FAST-PKCS                186.20  octets
-
-ATTRIBUTE      FreeRADIUS-Stats-Error                  187     string
-
-ATTRIBUTE      FreeRADIUS-Stats-Client-IPv6-Address    188     ipv6addr
-ATTRIBUTE      FreeRADIUS-Stats-Server-IPv6-Address    189     ipv6addr
-
 END-VENDOR FreeRADIUS

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 347e3e59f35e88cb194d582be4aebb542002f063..9e1b568572831c39f82afff2299822f2f9515232 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -284,6 +284,43 @@ ATTRIBUTE  SSHA3-256-Password                      1183    octets
 ATTRIBUTE      SSHA3-384-Password                      1184    octets
 ATTRIBUTE      SSHA3-512-Password                      1185    octets
 
+ATTRIBUTE      EAP-FAST-TLV                            1191    tlv
+ATTRIBUTE      EAP-FAST-Result                         1191.3  short
+ATTRIBUTE      EAP-FAST-NAK                            1191.4  octets
+ATTRIBUTE      EAP-FAST-Error                          1191.5  integer
+ATTRIBUTE      EAP-FAST-Vendor-Specific                1191.7  octets
+ATTRIBUTE      EAP-FAST-EAP-Payload                    1191.9  octets
+ATTRIBUTE      EAP-FAST-Intermediate-Result            1191.10 octets
+
+ATTRIBUTE      EAP-FAST-PAC                    1191.11 tlv
+ATTRIBUTE      EAP-FAST-PAC-Key                        1191.11.1 octets
+
+ATTRIBUTE      EAP-FAST-PAC-Opaque-TLV                 1191.11.2 tlv
+ATTRIBUTE      EAP-FAST-PAC-Opaque-PAC-Key             1191.11.2.1 octets
+ATTRIBUTE      EAP-FAST-PAC-Opaque-PAC-Lifetime        1191.11.2.3 integer
+ATTRIBUTE      EAP-FAST-PAC-Opaque-I-ID                1191.11.2.5 octets
+ATTRIBUTE      EAP-FAST-PAC-Opaque-PAC-Type            1191.11.2.10 short
+
+ATTRIBUTE      EAP-FAST-PAC-Lifetime                   1191.11.3 integer
+ATTRIBUTE      EAP-FAST-PAC-A-ID                       1191.11.4 octets
+ATTRIBUTE      EAP-FAST-PAC-I-ID                       1191.11.5 octets
+ATTRIBUTE      EAP-FAST-PAC-A-ID-Info                  1191.11.7 octets
+ATTRIBUTE      EAP-FAST-PAC-Acknowledge                1191.11.8 short
+ATTRIBUTE      EAP-FAST-PAC-Info-TLV                   1191.11.9 tlv
+ATTRIBUTE      EAP-FAST-PAC-Info-PAC-Lifetime          1191.11.9.3 integer
+ATTRIBUTE      EAP-FAST-PAC-Info-A-ID                  1191.11.9.4 octets
+ATTRIBUTE      EAP-FAST-PAC-Info-I-ID                  1191.11.9.5 octets
+ATTRIBUTE      EAP-FAST-PAC-Info-A-ID-Info             1191.11.9.7 octets
+ATTRIBUTE      EAP-FAST-PAC-Info-PAC-Type              1191.11.9.10 short
+
+ATTRIBUTE      EAP-FAST-PAC-Type                       1191.11.10 short
+
+ATTRIBUTE      EAP-FAST-Crypto-Binding                 1191.12 octets
+
+ATTRIBUTE      EAP-FAST-Trusted-Root                   1191.18 octets
+ATTRIBUTE      EAP-FAST-Request-Action                 1191.19 short
+ATTRIBUTE      EAP-FAST-PKCS                           1191.20 octets
+
 ATTRIBUTE      MS-CHAP-Peer-Challenge                  1192    octets
 ATTRIBUTE      Home-Server-Name                        1193    string
 ATTRIBUTE      Originating-Realm-Key                   1194    string