Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / test / confs / 2025

diff --git a/test/confs/2025 b/test/confs/2025
index ccb56dcb29cb7b5d1d4fdf6315fed7878955649e..8c08abebe05c3baa767613c42c375902c20dbf30 100644 (file)
--- a/test/confs/2025
+++ b/test/confs/2025
@@ -2,13 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----
 


@@ -21,8 +17,7 @@ queue_run_in_order
 
 tls_advertise_hosts = *
 
 
 tls_advertise_hosts = *
 

-tls_require_ciphers = ${if eq{$sender_host_address}{HOSTIPV4}\
-                      {NONE}{SECURE256}}
+tls_require_ciphers = NORMAL:-VERS-ALL:+VERS-TLS1.2:-MAC-ALL:+SHA256

 
 # Set certificate only if server
 
 
 # Set certificate only if server
 


@@ -49,9 +44,11 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1

-  hosts_require_tls = HOSTIPV4

   port = PORT_D
   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 -----
 
 
 # ----- Retry -----