Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / confs / 2019

diff --git a/test/confs/2019 b/test/confs/2019
index 993c8e0935b0d3c8b4d41581e1b56a8d5347f362..798eb73d7d138b2a02e9b495d7f9409c80bed6bf 100644 (file)
--- a/test/confs/2019
+++ b/test/confs/2019
@@ -3,7 +3,6 @@
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
@@ -35,11 +34,13 @@ check_recipient:
   accept  hosts = :
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA:\
+                      AES256-GCM-SHA384:\
                       IDEA-CBC-MD5:\
                       DES-CBC3-SHA:\
                       DHE_RSA_AES_256_CBC_SHA1:\
                       DHE_RSA_3DES_EDE_CBC_SHA:\
-                      RSA_AES_256_CBC_SHA1
+                      RSA_AES_256_CBC_SHA1 :\
+                     ECDHE_RSA_AES_256_GCM_SHA384
   accept