Testsuite: TLS client testcase consolidation

[exim.git] / test / confs / 0900

diff --git a/test/confs/0900 b/test/confs/0900
index df1540cfb523dd6e336c64b30034b1580e684256..ffce9e8863b3f25517d60c1e687cc2c238661538 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -43,8 +43,7 @@ log_selector = +received_recipients
 .endif
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
 .endif
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE

-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

 .endif
 
 ALLOW
 .endif
 
 ALLOW


@@ -107,6 +106,8 @@ remote_smtp:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :

+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s


@@ -116,6 +117,8 @@ remote_smtp_dkim:
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :
   hosts =      127.0.0.1
   port =       PORT_S
   hosts_try_fastopen = :

+  tls_verify_certificates = DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =

   allow_localhost
   command_timeout = 2s
   final_timeout = 2s
   allow_localhost
   command_timeout = 2s
   final_timeout = 2s