X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/25ba25448b55c2fd5ea9b1aeed82e02d59816a07..f4d091fbe1f4:/test/confs/2102 diff --git a/test/confs/2102 b/test/confs/2102 index 7d5d13a5a..804a846bf 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -3,11 +3,11 @@ exim_path = EXIM_PATH 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 +36,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}} @@ -53,7 +56,8 @@ check_recipient: 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 <${certextract {notbefore} {$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}}>