Make smtp transport try server cert verify by default

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

diff --git a/test/confs/5651 b/test/confs/5651
index 4a1989f4379ecad2720ff5edec953103f899cb94..f09df575b02decd9ad12ccaa84eb5004e723a112 100644 (file)
--- a/test/confs/5651
+++ b/test/confs/5651
@@ -88,9 +88,12 @@ send_to_server1:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_verify_cert_hostnames =

   hosts_require_tls = *
   hosts_request_ocsp = :
   hosts_require_tls = *
   hosts_request_ocsp = :

-  headers_add = X-TLS-out: OCSP status $tls_out_ocsp
+  headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})

 
 send_to_server2:
   driver = smtp
 
 send_to_server2:
   driver = smtp


@@ -98,9 +101,12 @@ send_to_server2:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_verify_cert_hostnames =

   hosts_require_tls = *
 # note no ocsp mention here
   hosts_require_tls = *
 # note no ocsp mention here

-  headers_add = X-TLS-out: OCSP status $tls_out_ocsp
+  headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})

 
 send_to_server3:
   driver = smtp
 
 send_to_server3:
   driver = smtp


@@ -110,9 +116,13 @@ send_to_server3:
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_try_verify_hosts =
+  tls_verify_cert_hostnames =

   hosts_require_tls =  *
   hosts_require_ocsp = *
   hosts_require_tls =  *
   hosts_require_ocsp = *

-  headers_add = X-TLS-out: OCSP status $tls_out_ocsp
+  headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})

 
 send_to_server4:
   driver = smtp
 
 send_to_server4:
   driver = smtp


@@ -122,10 +132,13 @@ send_to_server4:
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_verify_cert_hostnames =

   protocol =           smtps
   hosts_require_tls =  *
   hosts_require_ocsp = *
   protocol =           smtps
   hosts_require_tls =  *
   hosts_require_ocsp = *

-  headers_add = X-TLS-out: OCSP status $tls_out_ocsp
+  headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
+    (${listextract {${eval:$tls_out_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})

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