s/TLS-Session-Data/Session-Data/ s/TLS-Session-ID/Session-ID/

wide-camp-1909 · Sep 3, 2019 · 1ca0113 · 1ca0113
1 parent d1552cc
commit 1ca0113
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/raddb/mods-available/cache_tls b/raddb/mods-available/cache_tls
@@ -43,7 +43,7 @@ cache cache_tls_session {
 	#
 	#  key:: The `cache` key.
 	#
-	key = &TLS-Session-Id
+	key = &Session-Id
 
 	#
 	#  ttl:: TTL for `cache` entries.
@@ -54,15 +54,15 @@ cache cache_tls_session {
 	#  update <section> { ... }::
 	#
 	update {
-		&session-state:TLS-Session-Data := &session-state:TLS-Session-Data
+		&session-state:Session-Data := &session-state:Session-Data
 
 		#
 		#  NOTE: If you want to store authorization attributes too, consider
 		#  performing LDAP/SQL lookups in the tls-cache virtual server and
 		#  storing the results in `&session-state`.
 		#
 		#  The complete list can then be restored along with the
-		#  `TLS-Session-Data` using the entry below.
+		#  `Session-Data` using the entry below.
 		#
 		#  Policies run in `post-auth` then have access to the same data
 		#  irrespective of whether the session is being resumed.

diff --git a/share/dictionary/freeradius/dictionary.freeradius.internal b/share/dictionary/freeradius/dictionary.freeradius.internal
@@ -484,9 +484,9 @@ ATTRIBUTE	TLS-Session-Cert-File			1934	string
 
 # 1936 - 1939: reserved for future cert attributes
 
-# 1940 - 1949: reserved for TLS session caching
-ATTRIBUTE	TLS-Session-Id				1940	octets
-ATTRIBUTE	TLS-Session-Data			1942	octets
+# 1940 - 1949: reserved for session caching
+ATTRIBUTE	Session-Id				1940	octets
+ATTRIBUTE	Session-Data				1942	octets
 
 # Set and retrieved by EAP-TLS code
 ATTRIBUTE	TLS-OCSP-Cert-Valid			1943	integer

diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c
@@ -118,8 +118,8 @@ fr_dict_attr_autoload_t tls_dict_attr[] = {
 	{ .out = &attr_tls_ocsp_response, .name = "TLS-OCSP-Response", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
 	{ .out = &attr_tls_psk_identity, .name = "TLS-PSK-Identity", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
 	{ .out = &attr_tls_session_cert_file, .name = "TLS-Session-Cert-File", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
-	{ .out = &attr_tls_session_data, .name = "TLS-Session-Data", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
-	{ .out = &attr_tls_session_id, .name = "TLS-Session-Id", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+	{ .out = &attr_tls_session_data, .name = "Session-Data", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
+	{ .out = &attr_tls_session_id, .name = "Session-Id", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
 
 	{ .out = &attr_framed_mtu, .name = "Framed-MTU", .type = FR_TYPE_UINT32, .dict = &dict_radius },
 	{ NULL }

diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
@@ -41,7 +41,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
  *
  * Adds the following attributes to the request:
  *
- *	- &request:TLS-Session-Id
+ *	- &request:Session-Id
  *
  * Session identity will contain the binary session key used to create, retrieve
  * and delete cache entries related to the SSL session.
@@ -284,7 +284,7 @@ int tls_cache_write(REQUEST *request, tls_session_t *tls_session)
 	 */
 	vp = fr_pair_afrom_da(request->state_ctx, attr_tls_session_data);
 	if (!vp) {
-		RPEDEBUG("Failed allocating &TLS-Session-Data");
+		RPEDEBUG("Failed allocating &Session-Data");
 		return -1;
 	}