X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F2102;h=8b2083959934cce838c7c8e5fa7f796973fc49d0;hb=5e6d12accb0bdfa1cee9d8c9a1ecec3131b9f502;hp=293474a71d449129366b77247be0e3267dc5cc84;hpb=038597d295fa0ebd48ed4c00a6dfff0f30a2353a;p=exim.git

diff --git a/test/confs/2102 b/test/confs/2102
index 293474a71..8b2083959 100644
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,13 +1,9 @@
 # Exim test configuration 2102
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+
 timezone = UTC
+primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
@@ -43,6 +39,7 @@ check_recipient:
 		      DHE-RSA-AES256-GCM-SHA384 : \
                       DHE_RSA_AES_256_CBC_SHA1 : \
                       DHE_RSA_3DES_EDE_CBC_SHA : \
+                      ECDHE-RSA-AES256-GCM-SHA384 : \
                       ECDHE-RSA-AES128-GCM-SHA256
   warn    logwrite =  ${if def:tls_in_ourcert \
 		{Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
@@ -58,7 +55,8 @@ check_recipient:
           logwrite =  NB/r <${certextract {notbefore,raw}	{$tls_in_peercert}}>
           logwrite =  NB   <${certextract {notbefore}	{$tls_in_peercert}}>
           logwrite =  NB/i <${certextract {notbefore,int}{$tls_in_peercert}}>
-          logwrite =  NA  <${certextract {notafter}	{$tls_in_peercert}}>
+          logwrite =  NA/i <${certextract {notafter,int}	{$tls_in_peercert}}>
+          logwrite =  NA   <${certextract {notafter}	{$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}	{$tls_in_peercert}}>
 	  logwrite =       ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}}
@@ -67,6 +65,7 @@ check_recipient:
 	  logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
 	  logwrite =  sha1   fingerprint ${sha1:$tls_in_peercert}
 	  logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}
+	  logwrite =  der_b64 ${base64:$tls_in_peercert}
 
 
 # ----- Routers -----