Testsuite: handle OpenSSL 1.1.1

[exim.git] / test / confs / 2024

diff --git a/test/confs/2024 b/test/confs/2024
index a677c4c8661767b5ff77b61c30b22f56d21a3355..ea3b2820653801fcbf2578074626b3cadcca9868 100644 (file)
--- a/test/confs/2024
+++ b/test/confs/2024
@@ -3,14 +3,9 @@
 CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 
 CERT=DIR/aux-fixed/cert1
 TVC=/dev/null
 

-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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -24,6 +19,9 @@ tls_certificate = CERT
 tls_privatekey = CERT
 
 tls_verify_hosts = HOSTIPV4
 tls_privatekey = CERT
 
 tls_verify_hosts = HOSTIPV4

-tls_verify_certificates = TVC
+#tls_verify_certificates = TVC
+tls_verify_certificates = CERT

 
 

+# so we can decode in wireshark
+tls_require_ciphers = NORMAL:-KX-ALL:+RSA

 # End
 # End