Debug: indentation

[exim.git] / test / confs / 2002

diff --git a/test/confs/2002 b/test/confs/2002
index ccbe6f19274f48c89f77f1ad8e387a92060b3295..6428ac61dbd6b8ad02a0728f0577d4935ab02020 100644 (file)
--- a/test/confs/2002
+++ b/test/confs/2002
@@ -16,11 +16,17 @@ queue_run_in_order
 
 tls_advertise_hosts = 127.0.0.1 : HOSTIPV4
 
 
 tls_advertise_hosts = 127.0.0.1 : HOSTIPV4
 

-tls_certificate = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
-tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+CA = DIR/aux-fixed/exim-ca
+DRSA = CA/example.com
+DECDSA = CA/example_ec.com
+
+tls_certificate = DRSA/server1.example.com/server1.example.com.pem \
+               : DECDSA/server1.example_ec.com/server1.example_ec.com.pem
+tls_privatekey =  DRSA/server1.example.com/server1.example.com.unlocked.key \
+               : DECDSA/server1.example_ec.com/server1.example_ec.com.unlocked.key

 
 tls_verify_hosts = HOSTIPV4
 
 tls_verify_hosts = HOSTIPV4

-tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
+tls_verify_certificates = DRSA/server2.example.com/ca_chain.pem

 
 
 # ------ ACL ------
 
 
 # ------ ACL ------


@@ -30,14 +36,7 @@ begin acl
 check_recipient:
   accept  hosts = :
   deny    hosts = HOSTIPV4
 check_recipient:
   accept  hosts = :
   deny    hosts = HOSTIPV4

-         !encrypted = AES256-SHA : \
-                      AES256-GCM-SHA384 : \
-                      IDEA-CBC-MD5 : \
-                      DES-CBC3-SHA : \
-                      DHE_RSA_AES_256_CBC_SHA1 : \
-                      DHE_RSA_3DES_EDE_CBC_SHA : \
-                      RSA_AES_256_CBC_SHA1 : \
-                     ECDHE_RSA_AES_256_GCM_SHA384
+         !encrypted = *

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


@@ -63,6 +62,9 @@ check_recipient:
          logwrite =  sha1   fingerprint ${sha1:$tls_in_peercert}
          logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}
          logwrite =  der_b64 ${base64:$tls_in_peercert}
          logwrite =  sha1   fingerprint ${sha1:$tls_in_peercert}
          logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}
          logwrite =  der_b64 ${base64:$tls_in_peercert}

+         logwrite = cipher: $tls_in_cipher
+         logwrite = cipher_ $tls_in_cipher_std
+         logwrite = ver:    $tls_in_ver

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


@@ -83,6 +85,7 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER