Testsuite: Move 2040 to 1101 (hanging pipelining connections)

[exim.git] / test / confs / 2125

diff --git a/test/confs/2125 b/test/confs/2125
index 20f8e1dfaac0ea31def6c7423f4137d3026c7206..3591c86536e95c0c56901dbb26f34309abcc1a5b 100644 (file)
--- a/test/confs/2125
+++ b/test/confs/2125
@@ -2,13 +2,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-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 -----
 
@@ -22,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 -----
 
@@ -49,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 = :