Merge remote-tracking branch 'github/pr/50'

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

diff --git a/test/confs/2132 b/test/confs/2132
index 29822fab84ee8b40baecba3b913198527a185475..7fb561bdc68e7dbcab021470817fd3e5bb8b3c1c 100644 (file)
--- a/test/confs/2132
+++ b/test/confs/2132
@@ -1,13 +1,8 @@
 # Exim test configuration 2132 (close copy of 2102)
 
 # 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
 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 -----
 


@@ -42,7 +37,9 @@ check_recipient:
                      DHE-RSA-AES256-SHA : \
                      DHE-RSA-AES256-GCM-SHA384 : \
                       DHE_RSA_AES_256_CBC_SHA1 : \
                      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

   warn    logwrite =  ${if def:tls_in_ourcert \
                {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
                {We did not present a cert}}
   warn    logwrite =  ${if def:tls_in_ourcert \
                {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
                {We did not present a cert}}