diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-05-06 16:19:15 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-05-07 22:45:51 +0100 |
| commit | f4e62a871680af98f14beb5f21dbe3b85c5c35ff (patch) | |
| tree | 45a11d0f4ca8c72acf8373c37f1c52f4a9d722f6 /test/confs/5890 | |
| parent | dea4b5684c694c41105215bdb25f8e91b7c35c5d (diff) | |
OpenSSL: fix tls_try_verify_hosts under resumption
Diffstat (limited to 'test/confs/5890')
| -rw-r--r-- | test/confs/5890 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/test/confs/5890 b/test/confs/5890 index ca205f621..a836802af 100644 --- a/test/confs/5890 +++ b/test/confs/5890 @@ -13,7 +13,7 @@ domainlist local_domains = test.ex : *.test.ex acl_smtp_helo = check_helo acl_smtp_rcpt = check_recipient -log_selector = +received_recipients +tls_resumption +log_selector = +received_recipients +tls_resumption +tls_peerdn tls_advertise_hosts = * @@ -31,7 +31,7 @@ begin acl check_helo: accept condition = ${if def:tls_in_cipher} - logwrite = tls_in_resumption ${listextract {$tls_in_resumption} {_RESUME_DECODE}} + logwrite = tls_in_resumption\t${listextract {$tls_in_resumption} {_RESUME_DECODE}} logwrite = our cert subject\t${certextract {subject}{$tls_in_ourcert}} logwrite = peer cert subject\t${certextract {subject}{$tls_in_peercert}} logwrite = peer cert verified\t${tls_in_certificate_verified} @@ -63,10 +63,9 @@ log_resumption: begin routers client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - retry_use_local_part - transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} server: driver = redirect @@ -77,19 +76,20 @@ server: begin transports send_to_server1: - driver = smtp + driver = smtp allow_localhost - hosts = 127.0.0.1 - port = PORT_D - helo_data = helo.data.changed + hosts = 127.0.0.1 + port = PORT_D + helo_data = helo.data.changed .ifdef VALUE - tls_resumption_hosts = * + tls_resumption_hosts = * .else - tls_resumption_hosts = : + tls_resumption_hosts = : .endif - tls_verify_certificates = DIR/aux-fixed/cert1 - tls_verify_cert_hostnames = : - event_action = ${acl {log_resumption}} + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = ${if match {$local_part}{^noverify} {*}{:}} + tls_try_verify_hosts = * + event_action = ${acl {log_resumption}} send_to_server2: driver = smtp |