Merge tag 'release_3_0_4_rc1' into tr-upgrade

[freeradius.git] / share / dictionary.freeradius.internal

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index ee0db34..ccdf43d 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -120,6 +120,7 @@ ATTRIBUTE   Packet-Dst-Port                         1087    integer
 ATTRIBUTE      Packet-Authentication-Vector            1088    octets
 ATTRIBUTE      Time-Of-Day                             1089    string
 ATTRIBUTE      Request-Processing-Stage                1090    string
+ATTRIBUTE      SHA2-Password                           1092    octets
 ATTRIBUTE      SHA-Password                            1093    octets
 ATTRIBUTE      SSHA-Password                           1094    octets
 ATTRIBUTE      SHA1-Password                           1093    octets
@@ -178,6 +179,7 @@ ATTRIBUTE   Home-Server-Pool                        1111    string
 
 ATTRIBUTE      FreeRADIUS-Client-IP-Address            1120    ipaddr
 ATTRIBUTE      FreeRADIUS-Client-IPv6-Address          1121    ipv6addr
+# The rest of the FreeRADIUS-Client-* attributes are at 1150...
 
 ATTRIBUTE      FreeRADIUS-Client-Require-MA            1122    integer
 
@@ -226,6 +228,7 @@ ATTRIBUTE   Cache-TTL                               1140    integer
 ATTRIBUTE      Cache-Status-Only                       1141    integer
 ATTRIBUTE      Cache-Merge                             1142    integer
 ATTRIBUTE      Cache-Entry-Hits                        1143    integer
+ATTRIBUTE      Cache-Read-Only                         1144    integer
 
 VALUE  Cache-Status-Only               no                      0
 VALUE  Cache-Status-Only               yes                     1
@@ -233,10 +236,8 @@ VALUE      Cache-Status-Only               yes                     1
 VALUE  Cache-Merge                     no                      0
 VALUE  Cache-Merge                     yes                     1
 
-#      More dynamic client attributes
-
-ATTRIBUTE      FreeRADIUS-Client-Src-IP-Address        1143    ipaddr
-ATTRIBUTE      FreeRADIUS-Client-Src-IPv6-Address      1144    ipv6addr
+VALUE  Cache-Read-Only                 no                      0
+VALUE  Cache-Read-Only                 yes                     1
 
 ATTRIBUTE      OTP-Challenge                           1145    string
 ATTRIBUTE      EAP-Session-Id                          1146    octets
@@ -251,6 +252,12 @@ VALUE      Chbind-Response-Code            failure                 3
 ATTRIBUTE      Acct-Input-Octets64                     1148    integer64
 ATTRIBUTE      Acct-Output-Octets64                    1149    integer64
 
+ATTRIBUTE      FreeRADIUS-Client-IP-Prefix             1150    ipv4prefix
+ATTRIBUTE      FreeRADIUS-Client-IPv6-Prefix           1151    ipv6prefix
+ATTRIBUTE      FreeRADIUS-Response-Delay               1152    integer
+ATTRIBUTE      FreeRADIUS-Client-Src-IP-Address        1153    ipaddr
+ATTRIBUTE      FreeRADIUS-Client-Src-IPv6-Address      1154    ipv6addr
+
 #
 #      Range:  1200-1279
 #              EAP-SIM (and other EAP type) weirdness.
@@ -284,6 +291,9 @@ ATTRIBUTE   EAP-Sim-KC1                             1212    octets
 ATTRIBUTE      EAP-Sim-KC2                             1213    octets
 ATTRIBUTE      EAP-Sim-KC3                             1214    octets
 
+ATTRIBUTE      EAP-Sim-Ki                              1215    octets
+ATTRIBUTE      EAP-Sim-Algo-Version                    1216    integer
+
 #
 #      Range:  1280 - 1535
 #              EAP-type specific attributes
@@ -357,6 +367,7 @@ ATTRIBUTE   EAP-Type-MS-CHAP-V2                     1306    octets
 #
 
 # these are PW_EAP_SIM_X + 1536
+ATTRIBUTE      EAP_Sim-Base                            1536    octets
 ATTRIBUTE      EAP-Sim-RAND                            1537    octets
 ATTRIBUTE      EAP-Sim-PADDING                         1542    octets
 ATTRIBUTE      EAP-Sim-NONCE_MT                        1543    octets
@@ -435,6 +446,17 @@ ATTRIBUTE  Tmp-Date-6                              1846    date
 ATTRIBUTE      Tmp-Date-7                              1847    date
 ATTRIBUTE      Tmp-Date-8                              1848    date
 ATTRIBUTE      Tmp-Date-9                              1849    date
+
+ATTRIBUTE      Tmp-Integer64-0                         1871    integer64
+ATTRIBUTE      Tmp-Integer64-1                         1872    integer64
+ATTRIBUTE      Tmp-Integer64-2                         1873    integer64
+ATTRIBUTE      Tmp-Integer64-3                         1874    integer64
+ATTRIBUTE      Tmp-Integer64-4                         1875    integer64
+ATTRIBUTE      Tmp-Integer64-5                         1876    integer64
+ATTRIBUTE      Tmp-Integer64-6                         1877    integer64
+ATTRIBUTE      Tmp-Integer64-7                         1878    integer64
+ATTRIBUTE      Tmp-Integer64-8                         1879    integer64
+ATTRIBUTE      Tmp-Integer64-9                         1880    integer64
 #
 #  These attributes shouldn't be used anywhere.  They are defined here
 #  only for casting of values in conditional expressions.
@@ -476,7 +498,9 @@ ATTRIBUTE   TLS-Cert-Issuer                         1912    string
 ATTRIBUTE      TLS-Cert-Subject                        1913    string
 ATTRIBUTE      TLS-Cert-Common-Name                    1914    string
 ATTRIBUTE      TLS-Cert-Subject-Alt-Name-Email         1915    string
-# 1916 - 1919: reserved for future cert attributes
+ATTRIBUTE      TLS-Cert-Subject-Alt-Name-Dns           1916    string
+ATTRIBUTE      TLS-Cert-Subject-Alt-Name-Upn           1917    string
+# 1918 - 1919: reserved for future cert attributes
 ATTRIBUTE      TLS-Client-Cert-Serial                  1920    string
 ATTRIBUTE      TLS-Client-Cert-Expiration              1921    string
 ATTRIBUTE      TLS-Client-Cert-Issuer                  1922    string
@@ -488,9 +512,11 @@ ATTRIBUTE  TLS-Client-Cert-X509v3-Extended-Key-Usage 1927  string
 ATTRIBUTE      TLS-Client-Cert-X509v3-Subject-Key-Identifier 1928      string
 ATTRIBUTE      TLS-Client-Cert-X509v3-Authority-Key-Identifier 1929    string
 ATTRIBUTE      TLS-Client-Cert-X509v3-Basic-Constraints 1930   string
-ATTRIBUTE      TLS-PSK-Identity                        1931    string
+ATTRIBUTE      TLS-Client-Cert-Subject-Alt-Name-Dns    1931    string
+ATTRIBUTE      TLS-Client-Cert-Subject-Alt-Name-Upn    1932    string
+ATTRIBUTE      TLS-PSK-Identity                        1933    string
 
-# 1932 - 1939: reserved for future cert attributes
+# 1934 - 1939: reserved for future cert attributes
 
 #
 #      Range:  1940-2099