Move the regression test for CVE-2019-15846 to 1100-Basic-TLS/1100

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

diff --git a/test/confs/2132 b/test/confs/2132
index f2d67d9a732813e364ee16ada253cdfc81109eaf..4d90a9cd7a949e9eba6d8cd4f1ce17ff38de5513 100644 (file)
--- a/test/confs/2132
+++ b/test/confs/2132
@@ -1,12 +1,8 @@
 # Exim test configuration 2132 (close copy of 2102)
 
-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -33,16 +29,7 @@ begin acl
 check_recipient:
   accept  hosts = :
   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 : \
-                      ECDHE-RSA-AES128-GCM-SHA256
+         !encrypted = *
   warn    logwrite =  ${if def:tls_in_ourcert \
                {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
                {We did not present a cert}}