String handling: refactor the expanding-string routines and users to use a descriptor...

[users/jgh/exim.git] / test / confs / 2102

diff --git a/test/confs/2102 b/test/confs/2102
index 7f5771c0ed01babe0a19f3e14ad86158e666f427..58ff6fbaa8df2c949447ed3b96e7b2cec57d7c3f 100644 (file)
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,13 +1,9 @@
 # Exim test configuration 2102
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
+timezone = UTC
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -20,11 +16,11 @@ queue_run_in_order
 
 tls_advertise_hosts = 127.0.0.1 : HOSTIPV4
 
-tls_certificate = DIR/aux-fixed/cert1
-tls_privatekey = DIR/aux-fixed/cert1
+tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 
 tls_verify_hosts = HOSTIPV4
-tls_verify_certificates = DIR/aux-fixed/cert2
+tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
 
 
 # ------ ACL ------
@@ -36,13 +32,42 @@ check_recipient:
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA : \
                       AES256-GCM-SHA384 : \
+                      AES128-GCM-SHA256 : \
                       IDEA-CBC-MD5 : \
                       DES-CBC3-SHA : \
                      DHE-RSA-AES256-SHA : \
                      DHE-RSA-AES256-GCM-SHA384 : \
                       DHE_RSA_AES_256_CBC_SHA1 : \
-                      DHE_RSA_3DES_EDE_CBC_SHA
-  accept
+                      DHE_RSA_3DES_EDE_CBC_SHA : \
+                      ECDHE-RSA-AES256-GCM-SHA384 : \
+                      ECDHE-RSA-AES128-GCM-SHA256 : \
+                     ECDHE-RSA-CHACHA20-POLY1305
+         logwrite = cipher: $tls_in_cipher
+  warn    logwrite =  ${if def:tls_in_ourcert \
+               {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
+               {We did not present a cert}}
+  accept  condition = ${if !def:tls_in_peercert}
+         logwrite =  Peer did not present a cert
+  accept  logwrite =  Peer cert:
+          logwrite =  ver ${certextract {version}{$tls_in_peercert}}
+         logwrite =  SR  <${certextract {serial_number}{$tls_in_peercert}}>
+         logwrite =  SN  <${certextract {subject}      {$tls_in_peercert}}>
+          logwrite =  IN  <${certextract {issuer}      {$tls_in_peercert}}>
+          logwrite =  IN/O <${certextract {issuer,O}   {$tls_in_peercert}}>
+          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/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)}}
+         logwrite =       ${certextract {ocsp_uri}     {$tls_in_peercert} {OCU <$value>}{(no OCU)}}
+         logwrite =       ${certextract {crl_uri}      {$tls_in_peercert} {CRU <$value>}{(no CRU)}}
+         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 -----