X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F2125;h=3591c86536e95c0c56901dbb26f34309abcc1a5b;hb=eb763a7aaf9ed36939193283153724eb2671c999;hp=95b3f0d2da1c7600e0dd401688643edde8688f68;hpb=bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0;p=exim.git diff --git a/test/confs/2125 b/test/confs/2125 index 95b3f0d2d..3591c8653 100644 --- a/test/confs/2125 +++ b/test/confs/2125 @@ -2,14 +2,9 @@ SERVER= -exim_path = EXIM_PATH -keep_environment = -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -23,13 +18,16 @@ queue_run_in_order tls_advertise_hosts = * tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\ - {AES}{!AES:3DES}} + {AES256}{AES128}} # Set certificate only if server tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +.ifdef _OPT_OPENSSL_NO_TLSV1_3_X +openssl_options = +no_tlsv1_3 +.endif # ----- Routers ----- @@ -50,9 +48,10 @@ send_to_server: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 - hosts_require_tls = HOSTIPV4 - tls_require_ciphers = DES-CBC3-SHA port = PORT_D + hosts_require_tls = HOSTIPV4 + tls_require_ciphers = AES128-SHA + hosts_try_fastopen = : tls_try_verify_hosts = :