LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 3461

diff --git a/test/confs/3461 b/test/confs/3461
index b4843b488fa0d17e598831deafa274d9a52c8a6e..b793a4f36aeb9f9e83161217672c1ccc89c03352 100644 (file)
--- a/test/confs/3461
+++ b/test/confs/3461
@@ -1,6 +1,7 @@
 # Exim test configuration 3461
 
 SERVER =
 # Exim test configuration 3461
 
 SERVER =

+PEX = :

 
 .include DIR/aux-var/tls_conf_prefix
 
 
 .include DIR/aux-var/tls_conf_prefix
 


@@ -18,11 +19,7 @@ queue_run_in_order
 smtp_accept_max_nonmail = 0
 
 tls_advertise_hosts = *
 smtp_accept_max_nonmail = 0
 
 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

 
 
 # ----- Authenticators -----
 
 
 # ----- Authenticators -----


@@ -61,6 +58,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
 


@@ -68,8 +66,11 @@ send_to_server:
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1
   driver = smtp
   allow_localhost
   hosts = 127.0.0.1

-  hosts_try_auth = *

   port = PORT_D
   port = PORT_D

-  tls_try_verify_hosts = :
+  hosts_try_fastopen = :
+  hosts_try_auth = *
+  hosts_noproxy_tls = PEX
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :

 
 # End
 
 # End