Replace recv() by read() (Bug 2656)

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

diff --git a/test/confs/5891 b/test/confs/5891
index 165921d262087cdbfd190d33708915923d5d1bf3..89ee8fd53f439aefa414821584729a3324cde866 100644 (file)
--- a/test/confs/5891
+++ b/test/confs/5891
@@ -1,7 +1,7 @@
 # Exim test configuration 5891
 
 SERVER =
 # Exim test configuration 5891
 
 SERVER =

-OPTION =
+OPTION = NORMAL

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


@@ -15,13 +15,17 @@ acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient
 log_selector = +received_recipients +tls_resumption +tls_peerdn
 
 acl_smtp_rcpt = check_recipient
 log_selector = +received_recipients +tls_resumption +tls_peerdn
 

-openssl_options = +no_sslv2 +no_sslv3 +single_dh_use OPTION

 tls_advertise_hosts = *
 
 # Set certificate only if server
 
 tls_advertise_hosts = *
 
 # Set certificate only if server
 

-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+CDIR=DIR/aux-fixed/exim-ca/example.com

 
 

+tls_certificate = CDIR/server1.example.com/server1.example.com.chain.pem
+tls_privatekey =  CDIR/server1.example.com/server1.example.com.unlocked.key
+tls_ocsp_file =   CDIR/server1.example.com/server1.example.com.ocsp.good.resp
+
+tls_require_ciphers = OPTION

 tls_resumption_hosts = 127.0.0.1
 
 
 tls_resumption_hosts = 127.0.0.1
 
 


@@ -86,7 +90,7 @@ send_to_server1:
 .else
   tls_resumption_hosts =       :
 .endif
 .else
   tls_resumption_hosts =       :
 .endif

-  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_certificates =    CDIR/CA/CA.pem

   tls_verify_cert_hostnames =  ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =       *
   event_action =               ${acl {log_resumption}}
   tls_verify_cert_hostnames =  ${if match {$local_part}{^noverify} {*}{:}}
   tls_try_verify_hosts =       *
   event_action =               ${acl {log_resumption}}


@@ -96,9 +100,10 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

-  tls_verify_certificates = DIR/aux-fixed/cert1
-  tls_verify_cert_hostnames = :
-  event_action =       ${acl {log_resumption}}
+  hosts_try_fastopen = :
+  tls_verify_certificates =    CDIR/CA/CA.pem
+  tls_verify_cert_hostnames =  :
+  event_action =               ${acl {log_resumption}}

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----