diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2023-01-01 12:18:38 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2023-01-01 12:18:38 +0000 |
| commit | ca4014de81e6aa367aa0a54c49b4c3d4b137814c (patch) | |
| tree | 47c9a125b457e95b832faf4bbcb1a6b72fa6ff0a /test/confs | |
| parent | cbaecb979ad04aeb7eb2fce524facc862496b8b7 (diff) | |
| download | exim4-ca4014de81e6aa367aa0a54c49b4c3d4b137814c.tar.gz | |
OpenSSL: fix tls_eccurve setting explicit curve/group. Bug 2954
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/2148 | 54 | ||||
| -rw-r--r-- | test/confs/2149 | 39 |
2 files changed, 76 insertions, 17 deletions
diff --git a/test/confs/2148 b/test/confs/2148 new file mode 100644 index 000000000..01aa76cf8 --- /dev/null +++ b/test/confs/2148 @@ -0,0 +1,54 @@ +# Exim test configuration 2148 + +SERVER = + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept + +tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 +tls_dhparam = DATA + + +# ----- Routers ----- + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + retry_use_local_part + transport = send_to_server + +server: + driver = accept + retry_use_local_part + transport = local_delivery + + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + file = DIR/test-mail/$local_part + create_file = DIR/test-mail + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + user = CALLER + +send_to_server: + driver = smtp + allow_localhost + hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : + tls_verify_certificates = DIR/aux-fixed/cert1 + tls_verify_cert_hostnames = : + +# End diff --git a/test/confs/2149 b/test/confs/2149 index d70cd5c63..3369288bb 100644 --- a/test/confs/2149 +++ b/test/confs/2149 @@ -10,9 +10,12 @@ primary_hostname = myhost.test.ex acl_smtp_rcpt = accept -tls_advertise_hosts = * -tls_certificate = DIR/aux-fixed/cert1 -tls_dhparam = ${if eq {SERVER}{server}{DATA}fail} +tls_advertise_hosts = * +tls_certificate = DIR/aux-fixed/cert1 + +.ifdef DATA +tls_eccurve = DATA +.endif # ----- Routers ----- @@ -20,15 +23,16 @@ tls_dhparam = ${if eq {SERVER}{server}{DATA}fail} begin routers client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} retry_use_local_part - transport = send_to_server + transport = send_to_server + errors_to = "" server: - driver = accept + driver = accept retry_use_local_part - transport = local_delivery + transport = local_delivery # ----- Transports ----- @@ -36,19 +40,20 @@ server: begin transports local_delivery: - driver = appendfile - file = DIR/test-mail/$local_part - create_file = DIR/test-mail - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER + driver = appendfile + file = DIR/test-mail/$local_part + create_file = DIR/test-mail + headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn + user = CALLER send_to_server: - driver = smtp + driver = smtp allow_localhost - hosts = 127.0.0.1 - port = PORT_D - hosts_try_fastopen = : + hosts = 127.0.0.1 + port = PORT_D + hosts_try_fastopen = : tls_verify_certificates = DIR/aux-fixed/cert1 tls_verify_cert_hostnames = : + hosts_require_tls = * # End |