Move EAP TLV definitions to share/dictionary.freeradius

diff --git a/share/dictionary.freeradius b/share/dictionary.freeradius
index 5de613e..f142f94 100644 (file)
--- a/share/dictionary.freeradius
+++ b/share/dictionary.freeradius
@@ -143,4 +143,44 @@ 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
+
 END-VENDOR FreeRADIUS

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 38e802e..03a73fd 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -270,42 +270,6 @@ ATTRIBUTE  SSHA2-256-Password                      1178    octets
 ATTRIBUTE      SSHA2-384-Password                      1179    octets
 ATTRIBUTE      SSHA2-512-Password                      1180    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
 
 #