diff options
Diffstat (limited to 'test/confs')
| -rw-r--r-- | test/confs/1103 (renamed from test/confs/2003) | 2 | ||||
| -rw-r--r-- | test/confs/1104 (renamed from test/confs/2104) | 2 | ||||
| -rw-r--r-- | test/confs/1105 (renamed from test/confs/2005) | 2 | ||||
| -rw-r--r-- | test/confs/1106 (renamed from test/confs/2106) | 2 | ||||
| -rw-r--r-- | test/confs/1107 (renamed from test/confs/2015) | 2 | ||||
| -rw-r--r-- | test/confs/1108 (renamed from test/confs/2118) | 2 | ||||
| -rw-r--r-- | test/confs/1109 (renamed from test/confs/2123) | 2 | ||||
| -rw-r--r-- | test/confs/1110 (renamed from test/confs/2119) | 11 | ||||
| -rw-r--r-- | test/confs/1111 (renamed from test/confs/2122) | 2 | ||||
| -rw-r--r-- | test/confs/1112 (renamed from test/confs/2128) | 2 | ||||
| -rw-r--r-- | test/confs/1113 (renamed from test/confs/2130) | 4 | ||||
| l--------- | test/confs/1114 (renamed from test/confs/2090) | 0 | ||||
| -rw-r--r-- | test/confs/1149 (renamed from test/confs/2099) | 2 | ||||
| -rw-r--r-- | test/confs/2004 | 51 | ||||
| -rw-r--r-- | test/confs/2006 | 16 | ||||
| -rw-r--r-- | test/confs/2018 | 26 | ||||
| -rw-r--r-- | test/confs/2019 | 56 | ||||
| -rw-r--r-- | test/confs/2022 | 14 | ||||
| -rw-r--r-- | test/confs/2023 | 24 | ||||
| -rw-r--r-- | test/confs/2028 | 19 | ||||
| -rw-r--r-- | test/confs/2030 | 75 | ||||
| -rw-r--r--[l---------] | test/confs/2034 | 17 | ||||
| -rw-r--r-- | test/confs/2103 | 59 | ||||
| -rw-r--r-- | test/confs/2105 | 60 | ||||
| -rw-r--r-- | test/confs/2115 | 17 | ||||
| l--------- | test/confs/2190 | 1 | ||||
| -rw-r--r-- | test/confs/2199 | 16 |
27 files changed, 35 insertions, 451 deletions
diff --git a/test/confs/2003 b/test/confs/1103 index 0ce5fdb98..f2b49c721 100644 --- a/test/confs/2003 +++ b/test/confs/1103 @@ -1,4 +1,4 @@ -# Exim test configuration 2003 +# Exim test configuration 1103 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2104 b/test/confs/1104 index d37523c8b..cdb3d0fc2 100644 --- a/test/confs/2104 +++ b/test/confs/1104 @@ -1,4 +1,4 @@ -# Exim test configuration 2104 +# Exim test configuration 1104 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2005 b/test/confs/1105 index 442f0509c..47f88e865 100644 --- a/test/confs/2005 +++ b/test/confs/1105 @@ -1,4 +1,4 @@ -# Exim test configuration 2005 +# Exim test configuration 1105 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2106 b/test/confs/1106 index 56d8d6a3d..ffb826c7d 100644 --- a/test/confs/2106 +++ b/test/confs/1106 @@ -1,4 +1,4 @@ -# Exim test configuration 2106 +# Exim test configuration 1106 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2015 b/test/confs/1107 index e17fc29e9..04ba363db 100644 --- a/test/confs/2015 +++ b/test/confs/1107 @@ -1,4 +1,4 @@ -# Exim test configuration 2015 +# Exim test configuration 1107 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2118 b/test/confs/1108 index d3e77201d..9e6f9f1cc 100644 --- a/test/confs/2118 +++ b/test/confs/1108 @@ -1,4 +1,4 @@ -# Exim test configuration 2118 +# Exim test configuration 1108 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2123 b/test/confs/1109 index 8c89e9aae..2c87586b9 100644 --- a/test/confs/2123 +++ b/test/confs/1109 @@ -1,4 +1,4 @@ -# Exim test configuration 2123 +# Exim test configuration 1109 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2119 b/test/confs/1110 index 64987c8c0..64309442e 100644 --- a/test/confs/2119 +++ b/test/confs/1110 @@ -1,4 +1,4 @@ -# Exim test configuration 2119 +# Exim test configuration 1110 .include DIR/aux-var/tls_conf_prefix @@ -8,8 +8,6 @@ primary_hostname = myhost.test.ex acl_smtp_rcpt = check_recipient -log_selector = +tls_peerdn - queue_only queue_run_in_order @@ -50,7 +48,12 @@ begin transports local_delivery: driver = appendfile file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn +.ifdef _HAVE_GNUTLS + headers_add = TLS: cipher=$tls_cipher peerdn/cn '${listextract {-1} {<, $tls_in_peerdn}}' +.endif +.ifdef _HAVE_OPENSSL + headers_add = TLS: cipher=$tls_cipher peerdn/cn '${listextract {-1} {</ $tls_in_peerdn}}' +.endif user = CALLER # End diff --git a/test/confs/2122 b/test/confs/1111 index 154603d5d..77007ea44 100644 --- a/test/confs/2122 +++ b/test/confs/1111 @@ -1,4 +1,4 @@ -# Exim test configuration 2122 +# Exim test configuration 1111 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2128 b/test/confs/1112 index ecdb68be0..fd8617698 100644 --- a/test/confs/2128 +++ b/test/confs/1112 @@ -1,4 +1,4 @@ -# Exim test configuration 2128 +# Exim test configuration 1112 SERVER= diff --git a/test/confs/2130 b/test/confs/1113 index 0559bba53..67ef97bd9 100644 --- a/test/confs/2130 +++ b/test/confs/1113 @@ -1,4 +1,4 @@ -# Exim test configuration 2130 +# Exim test configuration 1113 # SNI SERVER = @@ -12,7 +12,7 @@ primary_hostname = myhost.test.ex domainlist local_domains = test.ex : *.test.ex acl_smtp_rcpt = acl_log_sni -log_selector = +tls_peerdn +tls_sni +log_selector = +tls_sni remote_max_parallel = 1 tls_advertise_hosts = * diff --git a/test/confs/2090 b/test/confs/1114 index 1bb987150..1bb987150 120000 --- a/test/confs/2090 +++ b/test/confs/1114 diff --git a/test/confs/2099 b/test/confs/1149 index ce24e0967..737753109 100644 --- a/test/confs/2099 +++ b/test/confs/1149 @@ -1,4 +1,4 @@ -# Exim test configuration 2019 +# Exim test configuration 1149 .include DIR/aux-var/tls_conf_prefix diff --git a/test/confs/2004 b/test/confs/2004 deleted file mode 100644 index f40e8ba83..000000000 --- a/test/confs/2004 +++ /dev/null @@ -1,51 +0,0 @@ -# Exim test configuration 2004 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = check_recipient -hostlist tls_hosts = 127.0.0.1 - -queue_only -queue_run_in_order - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -tls_advertise_hosts = 127.0.0.1 : HOSTIPV4 - -# ----- ACL ----- - -begin acl - -check_recipient: - deny hosts = +tls_hosts - message = encryption required - !encrypted = * - accept - - -# ----- Routers ----- - -begin routers - -abc: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -# End diff --git a/test/confs/2006 b/test/confs/2006 deleted file mode 100644 index 63ed36a4e..000000000 --- a/test/confs/2006 +++ /dev/null @@ -1,16 +0,0 @@ -# Exim test configuration 2006 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -smtp_receive_timeout = 1s - -# End diff --git a/test/confs/2018 b/test/confs/2018 deleted file mode 100644 index 58c1219e5..000000000 --- a/test/confs/2018 +++ /dev/null @@ -1,26 +0,0 @@ -# Exim test configuration 2018 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -queue_only - -tls_advertise_hosts = * -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -acl_smtp_rcpt = acl_tls - -# ------ ACLs ------ - -begin acl - -acl_tls: - accept endpass - message = "You must encrypt" - encrypted = * - -# End diff --git a/test/confs/2019 b/test/confs/2019 deleted file mode 100644 index 5d26fd033..000000000 --- a/test/confs/2019 +++ /dev/null @@ -1,56 +0,0 @@ -# Exim test configuration 2019 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = check_recipient - -log_selector = +tls_peerdn - -queue_only -queue_run_in_order - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -tls_verify_hosts = HOSTIPV4 -tls_verify_certificates = DIR/aux-fixed/cert2 - - -# ------ ACL ------ - -begin acl - -check_recipient: - accept hosts = : - deny hosts = HOSTIPV4 - !encrypted = * - accept - - -# ----- Routers ----- - -begin routers - -abc: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -# End diff --git a/test/confs/2022 b/test/confs/2022 deleted file mode 100644 index 47892ceb5..000000000 --- a/test/confs/2022 +++ /dev/null @@ -1,14 +0,0 @@ -# Exim test configuration 2022 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -# End diff --git a/test/confs/2023 b/test/confs/2023 deleted file mode 100644 index 9f1630929..000000000 --- a/test/confs/2023 +++ /dev/null @@ -1,24 +0,0 @@ -# Exim test configuration 2023 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_starttls = starttls - -qualify_domain = test.ex -tls_advertise_hosts = * -tls_certificate = DIR/aux-fixed/cert1 -trusted_users = CALLER - - -# ----- ACLs ----- - -begin acl - -starttls: - accept hosts = 10.9.8.8 - -# End diff --git a/test/confs/2028 b/test/confs/2028 deleted file mode 100644 index 68ca077be..000000000 --- a/test/confs/2028 +++ /dev/null @@ -1,19 +0,0 @@ -# Exim test configuration 2028 - -SERVER= - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -tls_on_connect_ports = PORT_D2 : PORT_D3 - - -# End diff --git a/test/confs/2030 b/test/confs/2030 deleted file mode 100644 index 490b35f60..000000000 --- a/test/confs/2030 +++ /dev/null @@ -1,75 +0,0 @@ -# Exim test configuration 2030 -# SNI - -SERVER = - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -domainlist local_domains = test.ex : *.test.ex - -acl_smtp_rcpt = acl_log_sni -log_selector = +tls_peerdn +tls_sni -remote_max_parallel = 1 - -tls_advertise_hosts = * - -# Set certificate only if server - -tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} - - -# ------ ACL ------ - -begin acl - -acl_log_sni: - accept - logwrite = SNI <$tls_in_sni> - -# ----- Routers ----- - -begin routers - -client: - driver = accept - condition = ${if !eq {SERVER}{server}} - transport = send_to_server${if eq{$local_part}{abcd}{2}{1}} - -server: - driver = redirect - data = :blackhole: - - -# ----- Transports ----- - -begin transports - -send_to_server1: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - tls_sni = fred - -send_to_server2: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - hosts_try_fastopen = : - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2034 b/test/confs/2034 index 6d0f5c2f1..ffb826c7d 120000..100644 --- a/test/confs/2034 +++ b/test/confs/2034 @@ -1 +1,16 @@ -2006
\ No newline at end of file +# Exim test configuration 1106 + +.include DIR/aux-var/tls_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +tls_advertise_hosts = * + +tls_certificate = DIR/aux-fixed/cert1 +tls_privatekey = DIR/aux-fixed/cert1 + +smtp_receive_timeout = 1s + +# End diff --git a/test/confs/2103 b/test/confs/2103 deleted file mode 100644 index 5a8571f09..000000000 --- a/test/confs/2103 +++ /dev/null @@ -1,59 +0,0 @@ -# Exim test configuration 2103 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = check_recipient - -queue_only -queue_run_in_order - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -tls_advertise_hosts = * - - -# ------ ACL ------ - -begin acl - -check_recipient: - deny message = unacceptable cipher $tls_cipher - !encrypted = ${if eq {$sender_host_address}{HOSTIPV4}{IDEA-CBC-MD5}{*}} - accept - - -# ----- Routers ----- - -begin routers - -abc: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - - -# ----- Retry ----- - - -begin retry - -* * F,5d,10s - - -# End diff --git a/test/confs/2105 b/test/confs/2105 deleted file mode 100644 index 7cbbdf017..000000000 --- a/test/confs/2105 +++ /dev/null @@ -1,60 +0,0 @@ -# Exim test configuration 2105 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = check_recipient - -domainlist local_domains = test.ex -hostlist tls_relay_hosts = 127.0.0.1 - -queue_only -queue_run_in_order - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -# ----- ACL ----- - -begin acl - -check_recipient: - accept domains = +local_domains - accept hosts = +tls_relay_hosts - endpass - message = encryption required - encrypted = * - deny message = relay not permitted - - -# ----- Routers ----- - -begin routers - -fail_remote_domains: - driver = redirect - domains = ! +local_domains - data = :fail: unrouteable mail domain "$domain" - -abc: - driver = accept - retry_use_local_part - transport = local_delivery - - -# ----- Transports ----- - -begin transports - -local_delivery: - driver = appendfile - file = DIR/test-mail/${bless:$local_part} - headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn - user = CALLER - -# End diff --git a/test/confs/2115 b/test/confs/2115 deleted file mode 100644 index ab1f6dcdd..000000000 --- a/test/confs/2115 +++ /dev/null @@ -1,17 +0,0 @@ -# Exim test configuration 2115 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -log_selector = +smtp_connection - -smtp_receive_timeout = 1s - -tls_advertise_hosts = * -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -# End diff --git a/test/confs/2190 b/test/confs/2190 deleted file mode 120000 index 1bb987150..000000000 --- a/test/confs/2190 +++ /dev/null @@ -1 +0,0 @@ -0900
\ No newline at end of file diff --git a/test/confs/2199 b/test/confs/2199 deleted file mode 100644 index db3fbb0f0..000000000 --- a/test/confs/2199 +++ /dev/null @@ -1,16 +0,0 @@ -# Exim test configuration 2119 - -.include DIR/aux-var/tls_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -log_selector = +tls_peerdn - -tls_advertise_hosts = * - -tls_certificate = DIR/aux-fixed/cert1 -tls_privatekey = DIR/aux-fixed/cert1 - -# End |