Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 177 insertions, 6 deletions

diff --git a/resources/protocols/radius/dictionary.freeradius b/resources/protocols/radius/dictionary.freeradius
index 43f1f138..f2149195 100644
--- a/resources/protocols/radius/dictionary.freeradius
+++ b/resources/protocols/radius/dictionary.freeradius
@@ -1,13 +1,10 @@
 # -*- text -*-
-# Copyright (C) 2015 The FreeRADIUS Server project and contributors
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
 #
 #	The FreeRADIUS Vendor-Specific dictionary.
 #
-# Version:	$Id: 5de613e4ef863872ea86de2d31b2afabef485756 $
-#
-#	For a complete list of Private Enterprise Codes, see:
-#
-#	http://www.isi.edu/in-notes/iana/assignments/enterprise-numbers
+# Version:	$Id: 2d7bd9c213b96ffe81febad1d6efd1e9468ae91e $
 #
 
 VENDOR		FreeRADIUS			11344
@@ -110,6 +107,8 @@ VALUE	FreeRADIUS-Stats-Server-State	Alive			0
 VALUE	FreeRADIUS-Stats-Server-State	Zombie			1
 VALUE	FreeRADIUS-Stats-Server-State	Dead			2
 VALUE	FreeRADIUS-Stats-Server-State	Idle			3
+VALUE	FreeRADIUS-Stats-Server-State	Admin-Down		4
+VALUE	FreeRADIUS-Stats-Server-State	Connection-Fail		5
 
 #
 #  When a home server is marked "dead" or "alive"
@@ -143,4 +142,176 @@ 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
+BEGIN-TLV	FreeRADIUS-EAP-FAST-TLV
+ATTRIBUTE	FreeRADIUS-EAP-FAST-Result		3	short
+ATTRIBUTE	FreeRADIUS-EAP-FAST-NAK			4	octets
+ATTRIBUTE	FreeRADIUS-EAP-FAST-Error		5	integer
+ATTRIBUTE	FreeRADIUS-EAP-FAST-Vendor-Specific	7	octets
+ATTRIBUTE	FreeRADIUS-EAP-FAST-EAP-Payload		9	octets
+ATTRIBUTE	FreeRADIUS-EAP-FAST-Intermediate-Result	10	octets
+
+ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC			11	tlv
+BEGIN-TLV	FreeRADIUS-EAP-FAST-PAC
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Key		1	octets
+
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Opaque-TLV	2	tlv
+	BEGIN-TLV	FreeRADIUS-EAP-FAST-PAC-Opaque-TLV
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Key	1	octets
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Lifetime 3	integer
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Opaque-I-ID	5	octets
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Opaque-PAC-Type	10	short
+	END-TLV	FreeRADIUS-EAP-FAST-PAC-Opaque-TLV
+
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Lifetime	3	integer
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-A-ID		4	octets
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-I-ID		5	octets
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-A-ID-Info	7	octets
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Acknowledge	8	short
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Info-TLV	9	tlv
+	BEGIN-TLV	FreeRADIUS-EAP-FAST-PAC-Info-TLV
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Info-PAC-Lifetime 3	integer
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Info-A-ID	4	octets
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Info-I-ID	5	octets
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Info-A-ID-Info	7	octets
+		ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Info-PAC-Type	10	short
+	END-TLV	FreeRADIUS-EAP-FAST-PAC-Info-TLV
+
+	ATTRIBUTE	FreeRADIUS-EAP-FAST-PAC-Type		10	short
+END-TLV	FreeRADIUS-EAP-FAST-PAC
+
+ATTRIBUTE	FreeRADIUS-EAP-FAST-Crypto-Binding	12	octets
+
+ATTRIBUTE	FreeRADIUS-EAP-FAST-Trusted-Root	18	octets
+ATTRIBUTE	FreeRADIUS-EAP-FAST-Request-Action	19	short
+ATTRIBUTE	FreeRADIUS-EAP-FAST-PKCS		20	octets
+END-TLV	FreeRADIUS-EAP-FAST-TLV
+
+ATTRIBUTE	FreeRADIUS-Stats-Error			187	string
+
+ATTRIBUTE	FreeRADIUS-Stats-Client-IPv6-Address	188	ipv6addr
+ATTRIBUTE	FreeRADIUS-Stats-Server-IPv6-Address	189	ipv6addr
+
+######################################################################
+#
+#  EAP-TEAP TLVs.  Some are the same as EAP-FAST. some are unnecessarily different.
+#
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-TLV			190	tlv
+BEGIN-TLV	FreeRADIUS-EAP-TEAP-TLV
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Authority-ID	1	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Identity-Type	2	uint16
+VALUE	FreeRADIUS-EAP-TEAP-Identity-Type User			1
+VALUE	FreeRADIUS-EAP-TEAP-Identity-Type Machine		2
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Result		3	short
+VALUE	FreeRADIUS-EAP-TEAP-Result	Success			1
+VALUE	FreeRADIUS-EAP-TEAP-Result	Failure			2
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-NAK			4	octets	# 4 octet Vendor-Id + 1 octet NAK type + TLVs
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Error		5	integer
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Expires-Soon 1
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Credential-Expires-Soon 2
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Authorizations-Change-Soon 3
+VALUE	FreeRADIUS-EAP-TEAP-Error	Clock-Skew-Detected	4
+VALUE	FreeRADIUS-EAP-TEAP-Error	Contact-Administrator	5
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Credentials-Change-Requires 6
+VALUE	FreeRADIUS-EAP-TEAP-Error	Inner-Method-Error	1001
+VALUE	FreeRADIUS-EAP-TEAP-Error	Unspecified-Authentication-Infrastructure-Problem 1002
+VALUE	FreeRADIUS-EAP-TEAP-Error	Unspecified-Authentication-Failure 1003
+VALUE	FreeRADIUS-EAP-TEAP-Error	Unspecified-Authorization-Failure 1004
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Credentials-Unavailable 1005
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Expired	1006
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Locked-Try-Again-Later 1007
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Locked-Admin-Intervention-Required 1008
+VALUE	FreeRADIUS-EAP-TEAP-Error	Authentication-Infrastructure-Unavailable 1009
+VALUE	FreeRADIUS-EAP-TEAP-Error	Authentication-Infrastructure-Not-Trusted 1010
+VALUE	FreeRADIUS-EAP-TEAP-Error	Clock-Skew-Too-Great	1011
+VALUE	FreeRADIUS-EAP-TEAP-Error	Invalid-Inner-Realm	1012
+VALUE	FreeRADIUS-EAP-TEAP-Error	Token-Out-of-Sync-Admin-Intervention-Required 1013
+VALUE	FreeRADIUS-EAP-TEAP-Error	Token-Out-of-Sync-PIN-Change-Required 1014
+VALUE	FreeRADIUS-EAP-TEAP-Error	Token-Revoked		1015
+VALUE	FreeRADIUS-EAP-TEAP-Error	Tokens-Exhausted	1016
+VALUE	FreeRADIUS-EAP-TEAP-Error	Challenge-Expired	1017
+VALUE	FreeRADIUS-EAP-TEAP-Error	Challenge-Algorithm-Mismatch 1018
+VALUE	FreeRADIUS-EAP-TEAP-Error	Client-Certificate-Not-Supplied 1019
+VALUE	FreeRADIUS-EAP-TEAP-Error	Client-Certificate-Rejected 1020
+VALUE	FreeRADIUS-EAP-TEAP-Error	Realm-Mismatch-Inner-Outer-Identity 1021
+VALUE	FreeRADIUS-EAP-TEAP-Error	Unsupported-Algorithm-in-CSR 1022
+VALUE	FreeRADIUS-EAP-TEAP-Error	Unsupported-Extension-in-CSR 1023
+VALUE	FreeRADIUS-EAP-TEAP-Error	Bad-Identity-in-CSR	1024
+VALUE	FreeRADIUS-EAP-TEAP-Error	Bad-CSR			1025
+VALUE	FreeRADIUS-EAP-TEAP-Error	Internal-CA-Error	1026
+VALUE	FreeRADIUS-EAP-TEAP-Error	General-PKI-Error	1027
+VALUE	FreeRADIUS-EAP-TEAP-Error	Inner-Method-Channel-Binding-Not-Supplied 1028
+VALUE	FreeRADIUS-EAP-TEAP-Error	Inner-Method-Channel-Binding-Missing-Info 1029
+VALUE	FreeRADIUS-EAP-TEAP-Error	Inner-Method-Channel-Binding-Data-Failed 1030
+VALUE	FreeRADIUS-EAP-TEAP-Error	User-Account-Credentials-Incorrect 1031
+VALUE	FreeRADIUS-EAP-TEAP-Error	Tunnel-Compromise-Error	2001
+VALUE	FreeRADIUS-EAP-TEAP-Error	Unexpected-TLVs		2002
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Channel-Binding	6	octets # complex format
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Vendor-Specific	7	octets # 4-octet vendor ID + TLVs
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Request-Action	8	octets # 1 octet + sub TLVs
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-EAP-Payload		9	octets # EAP packet + TLVs
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Intermediate-Result	10	short
+VALUE	FreeRADIUS-EAP-TEAP-Intermediate-Result		Success	1
+VALUE	FreeRADIUS-EAP-TEAP-Intermediate-Result		Failure 2
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC			11	tlv
+BEGIN-TLV	FreeRADIUS-EAP-TEAP-PAC
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Key		1	octets
+
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Opaque		2	octets
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Lifetime	3	integer
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-A-ID		4	octets
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-I-ID		5	octets
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-A-ID-Info	7	octets
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Acknowledgement	8	short
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-TLV	9	tlv
+	#
+	#  Sub-TLVs with the same numbers as the similar ones above.
+	#
+	BEGIN-TLV	FreeRADIUS-EAP-TEAP-PAC-Info-TLV
+		ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-PAC-Lifetime 3	integer
+		ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-A-ID	4	octets
+		ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-I-ID	5	octets
+		ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-A-ID-Info	7	octets
+		ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-PAC-Type	10	short
+	END-TLV	FreeRADIUS-EAP-TEAP-PAC-Info-TLV
+
+	ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Type		10	short
+END-TLV	FreeRADIUS-EAP-TEAP-PAC
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Crypto-Binding	12	octets # complex struct
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Basic-Password-Auth-Req 13	string
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Basic-Password-Auth-Resp 14	octets # complex struct
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PKCS7		15	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PKCS10		16	octets
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Trusted-Server-Root	17	octets # 1 octet + sub TLVs
+END-TLV	FreeRADIUS-EAP-TEAP-TLV
+
+#
+# End of EAP-TEAP
+#
+######################################################################
+
+# 190 is reserved
+
+ATTRIBUTE	FreeRADIUS-Total-Auth-Conflicts		191	integer
+ATTRIBUTE	FreeRADIUS-Total-Acct-Conflicts		192	integer
+
+#
+#  Worker thread activity
+#
+ATTRIBUTE	FreeRADIUS-Stats-Threads-Active		193	integer
+ATTRIBUTE	FreeRADIUS-Stats-Threads-Total		194	integer
+ATTRIBUTE	FreeRADIUS-Stats-Threads-Max		195	integer
+
 END-VENDOR FreeRADIUS