diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-03-24 18:25:27 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-03-24 18:25:27 +0000 |
| commit | 6c9ed72eaa948d340dba0ea0a878f9570852ab35 (patch) | |
| tree | 33afa3f0a53d1854ec1652642b2cc5c527625174 /test | |
| parent | 69cbeaec9d414796f70ab0a98b581895cae0be89 (diff) | |
Use TLS by default on callouts/cutthroughs
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/5840 | 4 | ||||
| -rw-r--r-- | test/stderr/5840 | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/test/confs/5840 b/test/confs/5840 index 0447ce36d..4f468a384 100644 --- a/test/confs/5840 +++ b/test/confs/5840 @@ -66,12 +66,8 @@ send_to_server: allow_localhost port = PORT_D - hosts_verify_avoid_tls = : hosts_try_dane = * hosts_require_dane = !thishost.test.ex - hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \ - {= {0}{$tls_out_tlsa_usage}} } \ - {*}{}} tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}} tls_try_verify_hosts = thishost.test.ex tls_verify_certificates = CDIR2/ca_chain.pem diff --git a/test/stderr/5840 b/test/stderr/5840 index eeffc1103..b2097c1d8 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -33,11 +33,10 @@ MUNGED: ::1 will be omitted in what follows >>> 250-STARTTLS >>> 250 HELP >>> ip4.ip4.ip4.ip4 in hosts_avoid_tls? no (option unset) ->>> ip4.ip4.ip4.ip4 in hosts_verify_avoid_tls? no (end of list) +>>> ip4.ip4.ip4.ip4 in hosts_verify_avoid_tls? no (option unset) >>> SMTP>> STARTTLS >>> SMTP<< 220 TLS go ahead >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset) ->>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? yes (matched "*") >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset) >>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? no (end of list) >>> SMTP>> EHLO myhost.test.ex |