Merge branch 'master'

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

diff --git a/test/confs/2102 b/test/confs/2102
index 3d5e51ae6010c6d2cd4644b4e38e2f1230199bd4..b7893de758e89cfc4d05e5a1b3bd0e0040975c6b 100644 (file)
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,13 +1,14 @@
 # Exim test configuration 2102
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 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
+timezone = UTC
 
 # ----- Main settings -----
 
@@ -36,12 +37,15 @@ 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
+                      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}}>} \
                {We did not present a cert}}
@@ -52,7 +56,10 @@ check_recipient:
          logwrite =  SR  <${certextract {serial_number}{$tls_in_peercert}}>
          logwrite =  SN  <${certextract {subject}      {$tls_in_peercert}}>
           logwrite =  IN  <${certextract {issuer}      {$tls_in_peercert}}>
-          logwrite =  NB  <${certextract {notbefore}   {$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  <${certextract {notafter}    {$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}   {$tls_in_peercert}}>
@@ -62,6 +69,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 -----