Fix tests and references

diff --git a/doc/antora/modules/raddb/pages/sites-available/default.adoc b/doc/antora/modules/raddb/pages/sites-available/default.adoc
index 852a71462d6b67b9a45eab361c01fec465dbabae..9b0b73f14984729aef0e1885375a69aee849bc60 100644 (file)
--- a/doc/antora/modules/raddb/pages/sites-available/default.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/default.adoc
@@ -1412,17 +1412,11 @@ send Access-Accept {
 #      wimax
 #      update reply {
 #              &Reply-Message += "%{session-state.TLS-Cert-Serial}"
-#              &Reply-Message += "%{session-state.TLS-Cert-Expiration}"
+#              &Reply-Message += "%{session-state.TLS-Cert-Not-After}"
 #              &Reply-Message += "%{session-state.TLS-Cert-Subject}"
 #              &Reply-Message += "%{session-state.TLS-Cert-Issuer}"
 #              &Reply-Message += "%{session-state.TLS-Cert-Common-Name}"
 #              &Reply-Message += "%{session-state.TLS-Cert-Subject-Alt-Name-Email}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Serial}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Expiration}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Subject}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Issuer}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Common-Name}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Subject-Alt-Name-Email}"
 #      }
 #      insert_acct_class
 #      if (&reply.EAP-Session-Id) {

diff --git a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc
index ea7a7873b07ba296b0ff819ce7c80ed6c33e2429..f3488a01d35c21598c85e7c26ab6bcce16d5ae3e 100644 (file)
--- a/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc
+++ b/doc/antora/modules/raddb/pages/sites-available/tls-cache.adoc
@@ -77,18 +77,12 @@ and will just cause the server to emit a warning.
 == Default Configuration
 
 ```
-#             TLS-Cert-Serial
-#             TLS-Cert-Expiration
-#             TLS-Cert-Subject
-#             TLS-Cert-Issuer
-#             TLS-Cert-Common-Name
-#             TLS-Cert-Subject-Alt-Name-Email
-#             TLS-Client-Cert-Serial
-#             TLS-Client-Cert-Expiration
-#             TLS-Client-Cert-Subject
-#             TLS-Client-Cert-Issuer
-#             TLS-Client-Cert-Common-Name
-#             TLS-Client-Cert-Subject-Alt-Name-Email
+#             TLS-Cert.Serial
+#             TLS-Cert.Expiration
+#             TLS-Cert.Subject
+#             TLS-Cert.Issuer
+#             TLS-Cert.Common-Name
+#             TLS-Cert.Subject-Alt-Name-Email
 server tls-cache {
        namespace = tls_cache
        load tls-session {

diff --git a/raddb/sites-available/default b/raddb/sites-available/default
index 0ad510f9ed80d5283984ed16d71235504b62b0de..7be883313d18cb9b8034230f0801a2909c5dfadb 100644 (file)
--- a/raddb/sites-available/default
+++ b/raddb/sites-available/default
@@ -1176,19 +1176,12 @@ send Access-Accept {
        #  available).
        #
 #      update reply {
-#              &Reply-Message += "%{session-state.TLS-Cert-Serial}"
-#              &Reply-Message += "%{session-state.TLS-Cert-Expiration}"
-#              &Reply-Message += "%{session-state.TLS-Cert-Subject}"
-#              &Reply-Message += "%{session-state.TLS-Cert-Issuer}"
-#              &Reply-Message += "%{session-state.TLS-Cert-Common-Name}"
-#              &Reply-Message += "%{session-state.TLS-Cert-Subject-Alt-Name-Email}"
-#
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Serial}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Expiration}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Subject}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Issuer}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Common-Name}"
-#              &Reply-Message += "%{session-state.TLS-Client-Cert-Subject-Alt-Name-Email}"
+#              &Reply-Message += "%{session-state.TLS-Cert.Serial}"
+#              &Reply-Message += "%{session-state.TLS-Cert.Not-After}"
+#              &Reply-Message += "%{session-state.TLS-Cert.Subject}"
+#              &Reply-Message += "%{session-state.TLS-Cert.Issuer}"
+#              &Reply-Message += "%{session-state.TLS-Cert.Common-Name}"
+#              &Reply-Message += "%{session-state.TLS-Cert.Subject-Alt-Name-Email}"
 #      }
 
        #

diff --git a/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang b/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang
index 4367dc22423666713a1a7e55ef74eafb9095d136..34265cc55b57e62f55c762b4ebdcb0e9692d5f4a 100644 (file)
--- a/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang
+++ b/src/tests/modules/imap/imap_opt_tls/auth_try_tls.unlang
@@ -17,7 +17,7 @@ else {
     reject
 }
 
-if (&request.TLS-Cert-Issuer =~ /@example\.org/) {
+if (&request.TLS-Cert.Issuer =~ /@example\.org/) {
         test_pass
 } else {
        test_fail

diff --git a/src/tests/modules/imap/imap_tls/auth_tls.unlang b/src/tests/modules/imap/imap_tls/auth_tls.unlang
index 3c02953c8547df263492b84b3b772df5a5ef7bde..94dad9cc7aef468b1e2c1376725698636aa1d236 100644 (file)
--- a/src/tests/modules/imap/imap_tls/auth_tls.unlang
+++ b/src/tests/modules/imap/imap_tls/auth_tls.unlang
@@ -9,7 +9,7 @@ else {
     reject
 }
 
-if (&request.TLS-Cert-Issuer =~ /@example\.org/) {
+if (&request.TLS-Cert.Issuer =~ /@example\.org/) {
         test_pass
 } else {
        test_fail

diff --git a/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang b/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang
index 505de6f474128a31fbdf38b737948d4857a79eb2..17acd8468f1054ae24f8a952241ebbfafaf5c276 100644 (file)
--- a/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang
+++ b/src/tests/modules/smtp/smtp_authenticate/tls_authenticate.unlang
@@ -18,7 +18,7 @@ else {
        reject
 }
 
-if (&request.TLS-Cert-Issuer =~ /@example\.org/) {
+if (&request.TLS-Cert.Issuer =~ /@example\.org/) {
         test_pass
 } else {
        test_fail

diff --git a/src/tests/modules/smtp/smtp_crln/tls_crln.unlang b/src/tests/modules/smtp/smtp_crln/tls_crln.unlang
index 2eb5e7c2f6a9e3229f5b0fdbdd9007e115df0da7..8e3156123dfad5248563d226103ba65254c6f555 100644 (file)
--- a/src/tests/modules/smtp/smtp_crln/tls_crln.unlang
+++ b/src/tests/modules/smtp/smtp_crln/tls_crln.unlang
@@ -36,7 +36,7 @@ else {
        reject
 }
 
-if (&request.TLS-Cert-Issuer =~ /@example\.org/) {
+if (&request.TLS-Cert.Issuer =~ /@example\.org/) {
         test_pass
 } else {
        test_fail

diff --git a/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang b/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang
index eaa2223c4033eb66e24b098644e62e05fe8c17eb..89ae070f39f9aa6650763ccfd5f446ce68e9e09e 100644 (file)
--- a/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang
+++ b/src/tests/modules/smtp/smtp_stringparse/tls_stringparse.unlang
@@ -33,7 +33,7 @@ else {
        reject
 }
 
-if (&request.TLS-Cert-Issuer =~ /@example\.org/) {
+if (&request.TLS-Cert.Issuer =~ /@example\.org/) {
         test_pass
 } else {
        test_fail