From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 18 Dec 2023 11:20:24 +0000 (+0000)
Subject: Complete 3gpp_pseudonym -> 3gpp_temporary_id
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6636d491ffa36dbe2ab9007e5ffb127f24acc5e6;p=thirdparty%2Ffreeradius-server.git

Complete 3gpp_pseudonym -> 3gpp_temporary_id
---

diff --git a/doc/antora/modules/raddb/pages/mods-available/eap.adoc b/doc/antora/modules/raddb/pages/mods-available/eap.adoc
index 0c7b37b22cf..5991397200e 100644
--- a/doc/antora/modules/raddb/pages/mods-available/eap.adoc
+++ b/doc/antora/modules/raddb/pages/mods-available/eap.adoc
@@ -1180,7 +1180,7 @@ require user configuration.
 
 The rlm_eap module provides the below functions to interact with the `3GPP` and `SIM` protocols.
 
-### %3gpp_pseudonym_decrypt('...)
+### %3gpp_temporary_id_decrypt('...)
 
 TODO
 
@@ -1199,7 +1199,7 @@ TODO
 TODO
 ```
 
-### %3gpp_pseudonym_encrypt(...)
+### %3gpp_temporary_id_encrypt(...)
 
 TODO
 
@@ -1218,7 +1218,7 @@ TODO
 TODO
 ```
 
-### %3gpp_pseudonym_key_index(...)
+### %3gpp_temporary_id_key_index(...)
 
 TODO
 
diff --git a/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc b/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc
index e4bb0c0ff7b..354c3bd0b2f 100644
--- a/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/eap-aka-sim.adoc
@@ -484,7 +484,7 @@ The following facilitates may be useful when generating pseudonym
 values:
 
 - The encrypt expansions of the `rlm_cipher` module.
-- The `%3gpp_pseudonym_encrypt()` expansion.
+- The `%3gpp_temporary_id_encrypt()` expansion.
 - The `%randstr()` expansion.
 
 NOTE: Add a `&reply.Next-Pseudonym-Id` attribute in this section to
diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
index c9a11bfa5e4..5f5982c1cd5 100644
--- a/raddb/mods-available/eap
+++ b/raddb/mods-available/eap
@@ -1298,7 +1298,7 @@ eap {
 #
 #  The rlm_eap module provides the below functions to interact with the `3GPP` and `SIM` protocols.
 #
-#  ### %3gpp_pseudonym_decrypt('...)
+#  ### %3gpp_temporary_id_decrypt('...)
 #
 #  TODO
 #
@@ -1317,7 +1317,7 @@ eap {
 #  TODO
 #  ```
 #
-#  ### %3gpp_pseudonym_encrypt(...)
+#  ### %3gpp_temporary_id_encrypt(...)
 #
 #  TODO
 #
@@ -1336,7 +1336,7 @@ eap {
 #  TODO
 #  ```
 #
-#  ### %3gpp_pseudonym_key_index(...)
+#  ### %3gpp_temporary_id_key_index(...)
 #
 #  TODO
 #
diff --git a/raddb/sites-available/eap-aka-sim b/raddb/sites-available/eap-aka-sim
index 0a82460e72f..52703e5b787 100644
--- a/raddb/sites-available/eap-aka-sim
+++ b/raddb/sites-available/eap-aka-sim
@@ -529,7 +529,7 @@ server eap-aka-sim {
 	#  values:
 	#
 	#  - The encrypt expansions of the `rlm_cipher` module.
-	#  - The `%3gpp_pseudonym_encrypt()` expansion.
+	#  - The `%3gpp_temporary_id_encrypt()` expansion.
 	#  - The `%randstr()` expansion.
 	#
 	#  NOTE: Add a `&reply.Next-Pseudonym-Id` attribute in this section to
diff --git a/src/lib/eap_aka_sim/xlat.c b/src/lib/eap_aka_sim/xlat.c
index 79070b05c56..ffd966ed73f 100644
--- a/src/lib/eap_aka_sim/xlat.c
+++ b/src/lib/eap_aka_sim/xlat.c
@@ -529,8 +529,8 @@ void fr_aka_sim_xlat_func_unregister(void)
 
 	xlat_func_unregister("aka_sim_id_method");
 	xlat_func_unregister("aka_sim_id_type");
-	xlat_func_unregister("3gpp_pseudonym_key_index");
-	xlat_func_unregister("3gpp_pseudonym_decrypt");
-	xlat_func_unregister("3gpp_pseudonym_encrypt");
+	xlat_func_unregister("3gpp_temporary_id_key_index");
+	xlat_func_unregister("3gpp_temporary_id_decrypt");
+	xlat_func_unregister("3gpp_temporary_id_encrypt");
 	aka_sim_xlat_refs = 0;
 }