X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/9aa512a1898155484e00ee089057d28f2432b30e..b4b3528b6ffe0a1bd405893052f9ce0788e8d46b:/test/confs/2002?ds=sidebyside diff --git a/test/confs/2002 b/test/confs/2002 index 178265d65..679dccf96 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -1,13 +1,14 @@ # Exim test configuration 2002 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 ----- @@ -40,7 +41,8 @@ check_recipient: DES-CBC3-SHA : \ DHE_RSA_AES_256_CBC_SHA1 : \ DHE_RSA_3DES_EDE_CBC_SHA : \ - RSA_AES_256_CBC_SHA1 + RSA_AES_256_CBC_SHA1 : \ + ECDHE_RSA_AES_256_GCM_SHA384 warn logwrite = ${if def:tls_in_ourcert \ {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \ {We did not present a cert}} @@ -51,7 +53,9 @@ 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 = IN/O <${certextract {issuer,O} {$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}}> @@ -61,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 -----