X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/24c83d149054570a727c6229adc611c9e9cf1064..e062f95e4bf597ed371ddfefe066831a6876bb94:/test/confs/2025?ds=inline

diff --git a/test/confs/2025 b/test/confs/2025
index c19f65e9d..5ddeb7573 100644
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -2,14 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -21,14 +16,8 @@ queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
-
-tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
-                      {NONE}{SECURE256}}
-
-# 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}
+tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA256
+tls_certificate =     DIR/aux-fixed/cert1
 
 
 # ----- Routers -----
@@ -50,9 +39,11 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
-
+  hosts_try_fastopen =	:
+  hosts_require_tls = HOSTIPV4
+  tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA\
+	 ${if eq{$host}{HOSTIPV4} {384} {256} }
 
 # ----- Retry -----