Docs: typoes

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

diff --git a/test/confs/2102 b/test/confs/2102
index 8b2083959934cce838c7c8e5fa7f796973fc49d0..6ae1514e9ec3848e74620c1c99157b519f275232 100644 (file)
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -16,13 +16,26 @@ queue_run_in_order
 
 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
+.ifdef ORDER
+tls_require_ciphers = ORDER
+.endif
+
+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_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
+tls_verify_certificates = DRSA/server2.example.com/ca_chain.pem
 
 
+.ifdef _OPT_OPENSSL_NO_TLSV1_3_X
+openssl_options = +no_tlsv1_3
+.endif
 # ------ ACL ------
 
 begin acl
@@ -30,17 +43,10 @@ begin acl
 check_recipient:
   accept  hosts = :
   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 : \
-                      DHE_RSA_3DES_EDE_CBC_SHA : \
-                      ECDHE-RSA-AES256-GCM-SHA384 : \
-                      ECDHE-RSA-AES128-GCM-SHA256
+         !encrypted = *
+         logwrite = cipher: $tls_in_cipher
+# This appears to lie. Despite what's on the wire, it returns the last cert loaded.
+# Fixed in OpenSSL 1.1.1 ?  Testcase golden logfile has the incorrect value.
   warn    logwrite =  ${if def:tls_in_ourcert \
                {Our cert SN: <${certextract{subject}{$tls_in_ourcert}}>} \
                {We did not present a cert}}
@@ -66,6 +72,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 = cipher: $tls_in_cipher
+         logwrite = cipher_ $tls_in_cipher_std
+         logwrite = ver:    $tls_in_ver
 
 
 # ----- Routers -----
@@ -85,7 +94,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER