Testsuite: separate cases for TLS resumption with/out OCSP

[users/jgh/exim.git] / test / confs / 5820

diff --git a/test/confs/5820 b/test/confs/5820
index d4dce2f85fb4dc6dfddce4cf4c0fa5e1cd54b41a..76dc75efef42f6590469f14de7d903c82ed92647 100644 (file)
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -2,6 +2,7 @@
 # DANE/GnuTLS
 
 SERVER=
 # DANE/GnuTLS
 
 SERVER=

+CONTROL= *

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


@@ -64,13 +65,14 @@ begin transports
 send_to_server:
   driver = smtp
   allow_localhost
 send_to_server:
   driver = smtp
   allow_localhost

-  port = ${if match {$host}{\Ntest.ex$\N} {PORT_D}{25}}
+  port = PORT_D
+  hosts_try_fastopen = :

 
 

-  hosts_try_dane =     *
+  hosts_try_dane =     CONTROL

   hosts_require_dane = HOSTIPV4
   tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
   tls_try_verify_hosts = thishost.test.ex
   hosts_require_dane = HOSTIPV4
   tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
   tls_try_verify_hosts = thishost.test.ex

-  tls_verify_certificates = CDIR2/ca_chain.pem
+  tls_verify_certificates = ${if eq {DETAILS}{ca} {CDIR2/ca_chain.pem} {}}