Release process: rename the scripts to be more generic

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

diff --git a/test/confs/2002 b/test/confs/2002
index 69fc749ff3d10409264e947f7a829453df8f9c02..535be91ebb52a5d39fd1f5a20fade4959626e686 100644 (file)
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -1,14 +1,9 @@
 # Exim test configuration 2002
 
 # Exim test configuration 2002
 

-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 = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/tls_conf_prefix
+

 timezone = UTC
 timezone = UTC

+primary_hostname = myhost.test.ex

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


@@ -41,7 +36,8 @@ check_recipient:
                       DES-CBC3-SHA : \
                       DHE_RSA_AES_256_CBC_SHA1 : \
                       DHE_RSA_3DES_EDE_CBC_SHA : \
                       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

   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}}


@@ -64,6 +60,7 @@ check_recipient:
          logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
          logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}
          logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}
          logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
          logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}
          logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}

+         logwrite =  der_b64 ${base64:$tls_in_peercert}

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----