X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0d2e392e281e96d9f9f2f3dd438affe3f2563c57..2382cd3e81838709abd3b0c1b410f65274d90e25:/test/confs/5670?ds=sidebyside diff --git a/test/confs/5670 b/test/confs/5670 index 325ac885b..f4252668e 100644 --- a/test/confs/5670 +++ b/test/confs/5670 @@ -32,11 +32,11 @@ tls_ocsp_file = PEM DIR/tmp/ocsp/double_r.ocsp.pem .ifdef _HAVE_GNUTLS -tls_require_ciphers = ${if eq {LIMIT}{TLS1.2} {NORMAL:!VERS-ALL:+VERS-TLS1.2} {}} +tls_require_ciphers = ${if eq {TRUSTED}{TLS1.2} {NORMAL:!VERS-ALL:+VERS-TLS1.2} {}} .endif .ifdef _HAVE_OPENSSL -.ifdef LIMIT -openssl_options = ${if eq {LIMIT}{TLS1.2} {+no_tlsv1_3} {}} +.ifdef TRUSTED +openssl_options = ${if eq {TRUSTED}{TLS1.2} {+no_tlsv1_3} {}} .endif .endif @@ -81,7 +81,7 @@ remote_delivery: hosts_require_tls = * .ifdef _HAVE_GNUTLS - tls_require_ciphers = ${if eq {LIMIT}{TLS1.2} \ + tls_require_ciphers = ${if eq {TRUSTED}{TLS1.2} \ {NONE:\ +SIGN-RSA-SHA256:+VERS-TLS-ALL:+ECDHE-RSA:+DHE-RSA:+RSA\ :+CIPHER-ALL:+MAC-ALL:+COMP-NULL:+CURVE-ALL:+CTYPE-X509} \ @@ -96,7 +96,8 @@ remote_delivery: local_delivery: driver = appendfile - file = DIR/test-mail/${bless:$local_part} + file = DIR/test-mail/$local_part + create_file = DIR/test-mail headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER