Merge branch '4.next'

[users/heiko/exim.git] / test / confs / 2119

diff --git a/test/confs/2119 b/test/confs/2119
index c5182a14e6d67513a140844d8d3baae62cf46e8e..d55232d05dc51a8839b3058f22c1f5db982fc65c 100644 (file)
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,13 +1,8 @@
 # Exim test configuration 2119
 
-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -36,10 +31,16 @@ check_recipient:
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA:\
                       AES256-GCM-SHA384:\
+                      AES128-GCM-SHA256:\
                       IDEA-CBC-MD5:\
                       DES-CBC3-SHA:\
+                     DHE-RSA-AES256-SHA:\
+                     DHE-RSA-AES256-GCM-SHA384:\
                       DHE_RSA_AES_256_CBC_SHA1:\
-                      DHE_RSA_3DES_EDE_CBC_SHA
+                      DHE_RSA_3DES_EDE_CBC_SHA:\
+                      ECDHE-RSA-AES256-GCM-SHA384:\
+                      ECDHE-RSA-AES128-GCM-SHA256:\
+                     ECDHE-RSA-CHACHA20-POLY1305
   accept