OpenSSL: Fix client-side tls_verify_cert_hostnames behaviour

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

diff --git a/test/confs/2117 b/test/confs/2117
index b6a5576675de2bd3663480b429e9aa2da2c98f69..16429f1a45c667a7218889364f5aa293dc264dc4 100644 (file)
--- a/test/confs/2117
+++ b/test/confs/2117
@@ -16,11 +16,7 @@ queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = DIR/aux-fixed/cert1
 
 
 # ----- Routers -----
@@ -45,7 +41,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
 
@@ -53,9 +49,11 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
-  hosts_nopass_tls = *
   port = PORT_D
-  tls_try_verify_hosts = :
+  hosts_try_fastopen = :
+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames = :
+  hosts_nopass_tls = *
 
 
 # ----- Retry -----