Merging upstream version 3.2.5+dfsg.

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

15 files changed, 362 insertions, 7 deletions

diff --git a/share/dictionary b/share/dictionary
index f91d6b8..aeb5c8f 100644
--- a/share/dictionary
+++ b/share/dictionary
@@ -151,6 +151,7 @@ $INCLUDE dictionary.alcatel
 $INCLUDE dictionary.alcatel-lucent.aaa
 $INCLUDE dictionary.alcatel.esam
 $INCLUDE dictionary.alcatel.sr
+$INCLUDE dictionary.alphion
 $INCLUDE dictionary.alteon
 $INCLUDE dictionary.altiga
 $INCLUDE dictionary.alvarion
@@ -196,6 +197,7 @@ $INCLUDE dictionary.cisco.asa
 $INCLUDE dictionary.cisco.bbsm
 $INCLUDE dictionary.cisco.vpn5000
 $INCLUDE dictionary.citrix
+$INCLUDE dictionary.ckey
 $INCLUDE dictionary.clavister
 $INCLUDE dictionary.cnergee
 $INCLUDE dictionary.colubris
@@ -271,6 +273,7 @@ $INCLUDE dictionary.nokia
 $INCLUDE dictionary.nomadix
 $INCLUDE dictionary.nortel
 $INCLUDE dictionary.ntua
+$INCLUDE dictionary.openwifi
 $INCLUDE dictionary.packeteer
 $INCLUDE dictionary.paloalto
 $INCLUDE dictionary.patton
@@ -296,6 +299,7 @@ $INCLUDE dictionary.shasta
 $INCLUDE dictionary.shiva
 $INCLUDE dictionary.siemens
 $INCLUDE dictionary.slipstream
+$INCLUDE dictionary.smartsharesystems
 $INCLUDE dictionary.sofaware
 $INCLUDE dictionary.softbank
 $INCLUDE dictionary.sonicwall
@@ -308,6 +312,7 @@ $INCLUDE dictionary.telebit
 $INCLUDE dictionary.telkom
 $INCLUDE dictionary.telrad
 $INCLUDE dictionary.terena
+$INCLUDE dictionary.tplink
 $INCLUDE dictionary.trapeze
 $INCLUDE dictionary.travelping
 $INCLUDE dictionary.tripplite
diff --git a/share/dictionary.3gpp2 b/share/dictionary.3gpp2
index 8fe3d6f..8085b95 100644
--- a/share/dictionary.3gpp2
+++ b/share/dictionary.3gpp2
@@ -85,7 +85,13 @@ ATTRIBUTE	3GPP2-Remote-IP-Address-Value		59.1	ipaddr
 ATTRIBUTE	3GPP2-Remote-IP-Address-Mask		59.2	integer
 ATTRIBUTE	3GPP2-Remote-IP-Qualifier		59.3	short
 
-# 60 - 69 are marked "reserved"
+ATTRIBUTE	3GPP2-HRPD-Access-Authorization		60	integer
+
+ATTRIBUTE	3GPP2-AT-Hardware-Identifier		61	tlv
+ATTRIBUTE	3GPP2-AT-Hardware-Identifier-Type	61.1	integer
+ATTRIBUTE	3GPP2-AT-Hardware-Identifier-Value	61.2	octets
+
+# 62 - 69 are marked "reserved"
 
 ATTRIBUTE	3GPP2-Remote-IPv6-Address		70	tlv
 ATTRIBUTE	3GPP2-Remote-IPv6-Address-Value		70.1	ipv6addr
diff --git a/share/dictionary.alphion b/share/dictionary.alphion
new file mode 100644
index 0000000..fe9403a
--- /dev/null
+++ b/share/dictionary.alphion
@@ -0,0 +1,74 @@
+# -*- text -*-
+# Copyright (C) 2024 The FreeRADIUS Server project and contributors
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
+#
+##############################################################################
+#
+#	$Id$
+#
+##############################################################################
+
+VENDOR		Alphion				8742
+BEGIN-VENDOR    Alphion
+
+ATTRIBUTE	Alphion-User-Role			1	string
+ATTRIBUTE	Alphion-User-Vlan			2	integer
+ATTRIBUTE	Alphion-Priv-Admin-User			3	integer
+ATTRIBUTE	Alphion-Admin-Role			4	string
+ATTRIBUTE	Alphion-Essid-Name			5	string
+ATTRIBUTE	Alphion-Location-Id			6	string
+ATTRIBUTE	Alphion-Port-Identifier			7	string
+ATTRIBUTE	Alphion-MMS-User-Template		8	string
+ATTRIBUTE	Alphion-Named-User-Vlan			9	string
+ATTRIBUTE	Alphion-AP-Group			10	string
+
+ATTRIBUTE	Alphion-Framed-IPv6-Address		11	string
+ATTRIBUTE	Alphion-Device-Type			12	string
+ATTRIBUTE	Alphion-No-DHCP-Fingerprint		14	integer
+ATTRIBUTE	Alphion-Mdps-Device-Udid		15	string
+ATTRIBUTE	Alphion-Mdps-Device-Imei		16	string
+ATTRIBUTE	Alphion-Mdps-Device-Iccid		17	string
+ATTRIBUTE	Alphion-Mdps-Max-Devices		18	integer
+ATTRIBUTE	Alphion-Mdps-Device-Name		19	string
+ATTRIBUTE	Alphion-Mdps-Device-Product		20	string
+
+ATTRIBUTE	Alphion-Mdps-Device-Version		21	string
+ATTRIBUTE	Alphion-Mdps-Device-Serial		22	string
+ATTRIBUTE	Alphion-CPPM-Role			23	string
+ATTRIBUTE	Alphion-AirGroup-User-Name		24	string
+ATTRIBUTE	Alphion-AirGroup-Shared-User		25	string
+ATTRIBUTE	Alphion-AirGroup-Shared-Role		26	string
+ATTRIBUTE	Alphion-AirGroup-Device-Type		27	integer
+ATTRIBUTE	Alphion-Auth-Survivability		28	string
+ATTRIBUTE	Alphion-AS-User-Name			29	string
+ATTRIBUTE	Alphion-AS-Credential-Hash		30	string
+
+ATTRIBUTE	Alphion-WorkSpace-App-Name		31	string
+ATTRIBUTE	Alphion-Mdps-Provisioning-Settings	32	string
+ATTRIBUTE	Alphion-Mdps-Device-Profile		33	string
+
+ATTRIBUTE	Alphion-AP-IP-Address			34	ipaddr
+
+ATTRIBUTE	Alphion-AirGroup-Shared-Group		35	string
+ATTRIBUTE	Alphion-User-Group			36	string
+ATTRIBUTE	Alphion-Network-SSO-Token		37	string
+ATTRIBUTE	Alphion-AirGroup-Version		38	integer
+
+ATTRIBUTE	Alphion-Port-Bounce-Host		40	integer
+
+ATTRIBUTE	Alphion-Calea-Server-Ip			41	ipaddr
+ATTRIBUTE	Alphion-Admin-Path			42	string
+ATTRIBUTE	Alphion-Captive-Portal-URL		43	string
+ATTRIBUTE	Alphion-MPSK-Passphrase			44	octets encrypt=2
+ATTRIBUTE	Alphion-ACL-Server-Query-Info		45	string
+ATTRIBUTE	Alphion-Command-String			46	string
+
+VALUE	Alphion-AirGroup-Device-Type	Personal-Device		1
+VALUE	Alphion-AirGroup-Device-Type	Shared-Device		2
+VALUE	Alphion-AirGroup-Device-Type	Deleted-Device		3
+
+VALUE	Alphion-AirGroup-Version	AirGroup-v1		1
+VALUE	Alphion-AirGroup-Version	AirGroup-v2		2
+
+END-VENDOR Alphion
+
diff --git a/share/dictionary.aruba b/share/dictionary.aruba
index f4a4a03..26bd82a 100644
--- a/share/dictionary.aruba
+++ b/share/dictionary.aruba
@@ -67,14 +67,31 @@ ATTRIBUTE	Aruba-QoS-Trust-Mode			52	integer
 ATTRIBUTE	Aruba-UBT-Gateway-Role			53	string
 ATTRIBUTE	Aruba-Gateway-Zone			54	string
 
+ATTRIBUTE	Aruba-DPP-Bootstrapping-Key-SHA256	55	string
+ATTRIBUTE	Aruba-DPP-Bootstrapping-Net-Access-Key-SHA256 56	string
+ATTRIBUTE	Aruba-DPP-Bootstrapping-Key-B64		57	string
+
 ATTRIBUTE	Aruba-STP-Admin-Edge-Port		58	integer
 
 ATTRIBUTE	Aruba-UBT-Gateway-CPPM-Role		59	string
 
-ATTRIBUTE  	Aruba-AP-MAC-Address        		60      string
-ATTRIBUTE  	Aruba-Device-MAC-Address    		61      string
+ATTRIBUTE	Aruba-AP-MAC-Address			60	string
+ATTRIBUTE	Aruba-Device-MAC-Address		61	string
+ATTRIBUTE	Aruba-MPSK-Key-Name			62	string
 ATTRIBUTE	Aruba-Device-Traffic-Class		63	integer
 
+ATTRIBUTE	Aruba-PVLAN-Port-Type			64	integer
+ATTRIBUTE	Aruba-Network-Test			65	integer
+ATTRIBUTE	Aruba-MPSK-Lookup-Info			66	string encrypt=1
+ATTRIBUTE	Aruba-AVPair				67	string
+ATTRIBUTE	Aruba-DPP-Service-Type			68	integer
+
+ATTRIBUTE	Aruba-User-Mgmt-Interface		69	string
+
+ATTRIBUTE	Aruba-Poe-Allocate-By-Method		70	integer
+
+ATTRIBUTE	Aruba-DPP-AKMs				71	string
+ATTRIBUTE	Aruba-DPP-Passphrase			72	string encrypt=2
 
 VALUE	Aruba-AirGroup-Device-Type	Personal-Device		1
 VALUE	Aruba-AirGroup-Device-Type	Shared-Device		2
@@ -98,4 +115,15 @@ VALUE	Aruba-QoS-Trust-Mode		None			2
 VALUE	Aruba-STP-Admin-Edge-Port	Disable			0
 VALUE	Aruba-STP-Admin-Edge-Port	Enable			1
 
+VALUE	Aruba-PVLAN-Port-Type		None			0
+VALUE	Aruba-PVLAN-Port-Type		Promiscuous		1
+VALUE	Aruba-PVLAN-Port-Type		Secondary		2
+
+VALUE	Aruba-DPP-Service-Type		DDP-Boostrap-Authorization 1
+VALUE	Aruba-DPP-Service-Type		DDP-Identity-Update	2
+VALUE	Aruba-DPP-Service-Type		DDP-Net-Access		3
+
+VALUE	Aruba-PoE-Allocate-By-Method	Class			1
+VALUE	Aruba-PoE-Allocate-By-Method	Usage			2
+
 END-VENDOR Aruba
diff --git a/share/dictionary.calix b/share/dictionary.calix
index 0a66326..4bcd1bf 100644
--- a/share/dictionary.calix
+++ b/share/dictionary.calix
@@ -12,6 +12,9 @@
 
 VENDOR		Calix				6321
 
+BEGIN-VENDOR	Calix
+
+ATTRIBUTE	Calix-Role				1	string
 ATTRIBUTE	Calix-CMS-User-Group			220	string
 ATTRIBUTE	Calix-CMS-Alarm-Filter			221	integer
 
@@ -27,3 +30,5 @@ ATTRIBUTE	Calix-CMS-Threshold-Event-Filter	223	integer
 
 VALUE	Calix-CMS-Threshold-Event-Filter Disabled		0
 VALUE	Calix-CMS-Threshold-Event-Filter Enabled		1
+
+END-VENDOR	Calix
\ No newline at end of file
diff --git a/share/dictionary.ckey b/share/dictionary.ckey
new file mode 100644
index 0000000..5ff8533
--- /dev/null
+++ b/share/dictionary.ckey
@@ -0,0 +1,39 @@
+# -*- text -*-
+# 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
+#
+##############################################################################
+#
+#	$Id$
+#
+##############################################################################
+
+VENDOR		Ckey				61349
+
+BEGIN-VENDOR	Ckey
+
+ATTRIBUTE	CKey-Auth-Info				10	integer
+
+VALUE	CKey-Auth-Info			Role-Reject		2
+VALUE	CKey-Auth-Info			Static-Reject		3
+VALUE	CKey-Auth-Info			Challenge-Dyna-Reject	7
+VALUE	CKey-Auth-Info			RADIUS-Key-Parse-Error	8
+VALUE	CKey-Auth-Info			Account-Does-Not-Exist	9
+VALUE	CKey-Auth-Info			Token-Expired		16
+VALUE	CKey-Auth-Info			Push-Check-Code-Error	20
+VALUE	CKey-Auth-Info			Push-Code-Error		21
+VALUE	CKey-Auth-Info			Single-Only-Dyna-Reject	22
+VALUE	CKey-Auth-Info			Static-PWD-Error	23
+VALUE	CKey-Auth-Info			PIN-Word-Error		24
+VALUE	CKey-Auth-Info			Source-IP-Error		25
+VALUE	CKey-Auth-Info			Msg-PWD-Reject		28
+VALUE	CKey-Auth-Info			Static-PWD-Expired	28
+VALUE	CKey-Auth-Info			Strategy-Config-Error	30
+VALUE	CKey-Auth-Info			EQP-Expiration-Error	31
+VALUE	CKey-Auth-Info			Account-EQP-Token-Mismatch 32
+VALUE	CKey-Auth-Info			Cannot-Login-Time	33
+VALUE	CKey-Auth-Info			Org-Reject		34
+VALUE	CKey-Auth-Info			Static-PWD-Or-PIN-Error	2324
+VALUE	CKey-Auth-Info			Unknown-Error		0xffffffff
+
+END-VENDOR	Ckey
diff --git a/share/dictionary.eleven b/share/dictionary.eleven
index 93dabcb..de3921e 100644
--- a/share/dictionary.eleven
+++ b/share/dictionary.eleven
@@ -50,3 +50,4 @@ ATTRIBUTE	Eleven-EAPOL-APMAC			4	octets
 #
 ATTRIBUTE	Eleven-EAPOL-STMAC			5	octets
 
+END-VENDOR Eleven
diff --git a/share/dictionary.freeradius b/share/dictionary.freeradius
index 0ac6182..2d7bd9c 100644
--- a/share/dictionary.freeradius
+++ b/share/dictionary.freeradius
@@ -187,6 +187,108 @@ 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
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Authority-ID	190.1	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Identity-Type	190.2	uint16
+VALUE	FreeRADIUS-EAP-TEAP-Identity-Type User			1
+VALUE	FreeRADIUS-EAP-TEAP-Identity-Type Machine		2
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Result		190.3	short
+VALUE	FreeRADIUS-EAP-TEAP-Result	Success			1
+VALUE	FreeRADIUS-EAP-TEAP-Result	Failure			2
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-NAK			190.4	octets	# 4 octet Vendor-Id + 1 octet NAK type + TLVs
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Error		190.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	190.6	octets # complex format
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Vendor-Specific	190.7	octets # 4-octet vendor ID + TLVs
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Request-Action	190.8	octets # 1 octet + sub TLVs
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-EAP-Payload		190.9	octets # EAP packet + TLVs
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Intermediate-Result	190.10	short
+VALUE	FreeRADIUS-EAP-TEAP-Intermediate-Result		Success	1
+VALUE	FreeRADIUS-EAP-TEAP-Intermediate-Result		Failure 2
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC			190.11	tlv
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Key		190.11.1	octets
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Opaque		190.11.2	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Lifetime	190.11.3	integer
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-A-ID		190.11.4	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-I-ID		190.11.5	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-A-ID-Info	190.11.7	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Acknowledgement	190.11.8	short
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-TLV	190.11.9	tlv
+ATTRIBUTE	FreeRADIUS-EAP-TRAP-PAC-Type		186.11.10	short
+#
+#  Sub-TLVs with the same numbers as the similar ones above.
+#
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-PAC-Lifetime 190.11.9.3	integer
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-A-ID	190.11.9.4	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-I-ID	190.11.9.5	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-A-ID-Info	190.11.9.7	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Info-PAC-Type	190.11.9.10	short
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PAC-Type		190.11.10	short
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Crypto-Binding	190.12	octets # complex struct
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Basic-Password-Auth-Req 190.13	string
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Basic-Password-Auth-Resp 190.14	octets # complex struct
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PKCS7		190.15	octets
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-PKCS10		190.16	octets
+
+ATTRIBUTE	FreeRADIUS-EAP-TEAP-Trusted-Server-Root	190.17	octets # 1 octet + sub TLVs
+
+#
+# End of EAP-TEAP
+#
+######################################################################
+
 # 190 is reserved
 
 ATTRIBUTE	FreeRADIUS-Total-Auth-Conflicts		191	integer
diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index bc6008c..52b9bb8 100644
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -235,6 +235,10 @@ ATTRIBUTE	MS-CHAP-New-NT-Password			1137	octets
 
 ATTRIBUTE	Stripped-User-Domain			1138	string
 ATTRIBUTE	Called-Station-SSID			1139	string
+ATTRIBUTE	Called-Station-MAC			1140	octets
+ATTRIBUTE	Pre-Shared-Key				1141	string
+ATTRIBUTE	Pairwise-Master-Key			1142	octets
+ATTRIBUTE	PSK-Identity				1143	string
 
 ATTRIBUTE	OTP-Challenge				1145	string
 ATTRIBUTE	EAP-Session-Id				1146	octets
@@ -299,6 +303,8 @@ VALUE	Proxy-Tunneled-Request-As-EAP	No			0
 VALUE	Proxy-Tunneled-Request-As-EAP	Yes			1
 ATTRIBUTE	Temp-Home-Server-String			1198	string
 
+ATTRIBUTE	TOTP-Time-Offset			1199	signed
+
 #
 #	Range:	1200-1279
 #		EAP-SIM (and other EAP type) weirdness.
@@ -405,6 +411,8 @@ ATTRIBUTE	EAP-Type-EAP-AKA2			1330	octets
 ATTRIBUTE	EAP-Type-EAP-GPSK			1331	octets
 ATTRIBUTE	EAP-Type-EAP-PWD			1332	octets
 ATTRIBUTE	EAP-Type-EAP-EVEv1			1333	octets
+ATTRIBUTE	EAP-Type-EAP-PT-EAP			1334	octets
+ATTRIBUTE	EAP-Type-EAP-TEAP			1335	octets
 
 ATTRIBUTE	EAP-Type-Microsoft-MS-CHAPv2		1306	octets
 ATTRIBUTE	EAP-Type-Cisco-MS-CHAPv2		1309	octets
@@ -651,7 +659,7 @@ ATTRIBUTE	Radclient-Test-Name			2200	string
 #		Free
 #
 #	Range:	3000-3999
-#		Site-local attributes (see raddb/dictionary.in)
+#		Site-local attributes (see raddb/dictionary)
 #		Do NOT define attributes in this range!
 #
 #	Range:	4000-65535
@@ -861,6 +869,8 @@ VALUE	EAP-Type			AKA2			50
 VALUE	EAP-Type			GPSK			51
 VALUE	EAP-Type			PWD			52
 VALUE	EAP-Type			EKEv1			53
+VALUE	EAP-Type			PT-EAP			54
+VALUE	EAP-Type			TEAP			55
 
 #
 #	And this is what most people mean by MS-CHAPv2
diff --git a/share/dictionary.openwifi b/share/dictionary.openwifi
new file mode 100644
index 0000000..794ad66
--- /dev/null
+++ b/share/dictionary.openwifi
@@ -0,0 +1,25 @@
+# -*- text -*-
+# 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
+#
+##############################################################################
+#
+#	OpenWiFi
+#
+#	$Id$
+#
+##############################################################################
+
+#
+#  Assigned to the Telecom Infra project, but used for OpenWifi
+#
+VENDOR		OpenWiFi			58888
+
+BEGIN-VENDOR	OpenWiFi
+
+#
+#  As lowercase hex, with dashes between bytes.
+#
+ATTRIBUTE	OpenWiFi-AP-MAC-Address		1	string
+
+END-VENDOR	OpenWiFi
diff --git a/share/dictionary.rfc8559 b/share/dictionary.rfc8559
index 4d3659c..196b19d 100644
--- a/share/dictionary.rfc8559
+++ b/share/dictionary.rfc8559
@@ -2,8 +2,8 @@
 # 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
 #
-#        Attributes and values defined in RFC 8859
-#        http://www.ietf.org/rfc/rfc8859
+#        Attributes and values defined in RFC 8559
+#        http://www.ietf.org/rfc/rfc8559.txt
 #
 
 ATTRIBUTE	Operator-NAS-Identifier			241.8	octets
diff --git a/share/dictionary.ruckus b/share/dictionary.ruckus
index 41e8959..882eb80 100644
--- a/share/dictionary.ruckus
+++ b/share/dictionary.ruckus
@@ -71,7 +71,10 @@ 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-Dpsk				142	octets
+
+# 0x00 + (PBKDF2(HMAC−SHA1, passphrase, ssid, 4096, 256))
+# for a length of 33 octets.
+ATTRIBUTE	Ruckus-DPSK				142	octets
 ATTRIBUTE	Ruckus-CP-Token				143	string
 ATTRIBUTE	Ruckus-Max-DL-UL-Quota			144	integer
 ATTRIBUTE	Ruckus-Traffic-Class-Attribute-Ids	145	string
@@ -94,6 +97,10 @@ ATTRIBUTE	Ruckus-DPSK-AKM-Suite			153.1	octets
 ATTRIBUTE	Ruckus-DPSK-Cipher			153.2	byte
 ATTRIBUTE	Ruckus-DPSK-Anonce			153.3	octets
 ATTRIBUTE	Ruckus-DPSK-EAPOL-Key-Frame		153.4	octets
+ATTRIBUTE	Ruckus-Cluster-Name			154	string
+ATTRIBUTE	Ruckus-Domain-Name			155	string
+ATTRIBUTE	Ruckus-Client-Device-Type		156	string
+ATTRIBUTE	Ruckus-Vlan-Name			157	string
 
 # Ruckus SmartCell Insight Attributes
 ATTRIBUTE Ruckus-SCI-Role		200 string
diff --git a/share/dictionary.smartsharesystems b/share/dictionary.smartsharesystems
new file mode 100644
index 0000000..f955337
--- /dev/null
+++ b/share/dictionary.smartsharesystems
@@ -0,0 +1,33 @@
+# -*- text -*-
+# SPDX-License-Identifier: CC-BY-4.0
+# Copyright (C) 2023 SmartShare Systems
+#
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
+#
+# Please contact SmartShare Systems directly if you need a copy under a different license.
+#
+# Version $Id$
+
+##############################################################################
+#
+#	SmartShare Systems Vendor-Specific Attributes
+#	dictionary.smartsharesystems
+#	https://www.smartsharesystems.com/
+#
+##############################################################################
+
+VENDOR		SmartShareSystems		30585
+
+BEGIN-VENDOR	SmartShareSystems
+
+# The globally unique identity (e.g. hardware serial number) of the Proxy (instance) forwarding the packet,
+# in ASCII format (upper case only).
+ATTRIBUTE	SSS-Proxy-Id				2	string
+
+# The FQDN (Fully Qualified Domain Name) of the Proxy (cluster) forwarding the packet.
+ATTRIBUTE	SSS-Proxy-Identifier			3	string
+
+# Location of the Proxy (cluster) forwarding the packet, in free form UTF-8 format.
+ATTRIBUTE	SSS-Proxy-Location			4	string
+
+END-VENDOR	SmartShareSystems
diff --git a/share/dictionary.tplink b/share/dictionary.tplink
new file mode 100644
index 0000000..f4a83a5
--- /dev/null
+++ b/share/dictionary.tplink
@@ -0,0 +1,19 @@
+# -*- text -*-
+# Copyright (C) 2023 The FreeRADIUS Server project and contributors
+# This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
+# Version $Id$
+VENDOR		TPLink				11863
+
+BEGIN-VENDOR	TPLink
+
+ATTRIBUTE	TPLink-Recv-limit			1	integer
+ATTRIBUTE	TPLink-Xmit-limit			2	integer
+ATTRIBUTE	TPLink-Authentication-FindKey		3	octets
+ATTRIBUTE	TPLink-Authentication-FoundKey		4	octets
+ATTRIBUTE	TPLink-User-Command			5	string
+ATTRIBUTE	TPLink-Site				6	string
+ATTRIBUTE	TPLink-Omada				7	string
+ATTRIBUTE	TPLink-Redirect-Url			8	string
+ATTRIBUTE	TPLink-Portal-Access-Status		9	integer
+
+END-VENDOR TPLink
diff --git a/share/dictionary.wispr b/share/dictionary.wispr
index 42f3707..8ac0b83 100644
--- a/share/dictionary.wispr
+++ b/share/dictionary.wispr
@@ -37,5 +37,6 @@ ATTRIBUTE	WBA-Financial-Clearing-Provider		13	string
 ATTRIBUTE	WBA-Data-Clearing-Provider		14	string
 ATTRIBUTE	WBA-Linear-Volume-Rate			15	octets
 ATTRIBUTE	WBA-Identity-Provider			16	string
+ATTRIBUTE	WBA-Custom-SLA			17	string
 
 END-VENDOR	WISPr