X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e9477a08d2d1f528b1f127f1d563d77e2cf24a22..fa58f4a826406d77c1f9166a0766b1ea99589aad:/test/confs/2002?ds=inline diff --git a/test/confs/2002 b/test/confs/2002 index 69fc749ff..ccbe6f192 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -1,14 +1,9 @@ # Exim test configuration 2002 -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 +.include DIR/aux-var/tls_conf_prefix + timezone = UTC +primary_hostname = myhost.test.ex # ----- Main settings ----- @@ -41,7 +36,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}} @@ -53,17 +49,20 @@ 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 = 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 = sha1 fingerprint ${sha1:$tls_in_peercert} logwrite = sha256 fingerprint ${sha256:$tls_in_peercert} + logwrite = der_b64 ${base64:$tls_in_peercert} # ----- Routers -----