Testsuite: 2091,5403 independent of calling user

[exim.git] / test / confs / 2102

diff --git a/test/confs/2102 b/test/confs/2102
index 88453ed662fb1d4bf0b1cbeced297f7a6449c2e5..4223430a36f6ec1ece73da13964eab8162fd0bec 100644 (file)
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -1,14 +1,9 @@
 # Exim test configuration 2102
 
 # Exim test configuration 2102
 

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


@@ -37,12 +32,15 @@ check_recipient:
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA : \
                       AES256-GCM-SHA384 : \
   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 : \
                       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
+                      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}}


@@ -66,6 +64,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 -----