From 0240e7a160721a53365aaa3bd10bb6f3de3f9f15 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 21 Jan 2021 13:06:31 +0000 Subject: [PATCH] Testsuite: TLS server testcase consolidation --- test/confs/{2003 => 1103} | 2 +- test/confs/{2104 => 1104} | 2 +- test/confs/{2005 => 1105} | 2 +- test/confs/{2106 => 1106} | 2 +- test/confs/{2015 => 1107} | 2 +- test/confs/{2118 => 1108} | 2 +- test/confs/{2123 => 1109} | 2 +- test/confs/{2119 => 1110} | 11 +- test/confs/{2122 => 1111} | 2 +- test/confs/{2128 => 1112} | 2 +- test/confs/{2130 => 1113} | 4 +- test/confs/{2090 => 1114} | 0 test/confs/{2099 => 1149} | 2 +- test/confs/2004 | 51 --------- test/confs/2006 | 16 --- test/confs/2018 | 26 ----- test/confs/2019 | 56 ---------- test/confs/2022 | 14 --- test/confs/2023 | 24 ---- test/confs/2028 | 19 ---- test/confs/2030 | 75 ------------- test/confs/2034 | 17 ++- test/confs/2103 | 59 ---------- test/confs/2105 | 60 ---------- test/confs/2115 | 17 --- test/confs/2190 | 1 - test/confs/2199 | 16 --- test/log/{2003 => 1103} | 0 test/log/{2004 => 1104} | 0 test/log/{2005 => 1105} | 0 test/log/{2006 => 1106} | 0 test/log/{2015 => 1107} | 4 +- test/log/{2018 => 1108} | 0 test/log/{2023 => 1109} | 0 test/log/{2019 => 1110} | 2 +- test/log/{2022 => 1111} | 0 test/log/{2028 => 1112} | 0 test/log/{2030 => 1113} | 2 +- test/log/{2090 => 1114} | 0 test/log/{2099 => 1149} | 0 test/log/2034 | 2 +- test/log/2103 | 9 -- test/log/2104 | 9 -- test/log/2105 | 6 - test/log/2106 | 4 - test/log/2111 | 2 +- test/log/2115 | 6 - test/log/2118 | 5 - test/log/2119 | 11 -- test/log/2122 | 3 - test/log/2128 | 3 - test/log/2130 | 10 -- test/log/2190 | 5 - test/log/2199 | 3 - test/mail/{2003.userx => 1103.userx} | 0 test/mail/{2004.userx => 1104.userx} | 0 test/mail/{2019.userx => 1110.userx} | 4 +- test/mail/2103.userx | 11 -- test/mail/2104.userx | 10 -- test/mail/2119.userx | 22 ---- test/rejectlog/{2003 => 1103} | 0 test/rejectlog/{2004 => 1104} | 0 test/rejectlog/{2005 => 1105} | 0 test/rejectlog/{2018 => 1108} | 0 test/{log/2123 => rejectlog/1109} | 0 test/rejectlog/2023 | 1 - test/rejectlog/2103 | 3 - test/rejectlog/2104 | 3 - test/rejectlog/2105 | 3 - test/rejectlog/2118 | 3 - test/rejectlog/2123 | 1 - test/runtest | 5 +- .../{2000-GnuTLS/2003 => 1100-Basic-TLS/1103} | 4 +- .../{2000-GnuTLS/2004 => 1100-Basic-TLS/1104} | 4 +- .../{2000-GnuTLS/2005 => 1100-Basic-TLS/1105} | 2 +- .../{2000-GnuTLS/2006 => 1100-Basic-TLS/1106} | 2 +- .../{2000-GnuTLS/2015 => 1100-Basic-TLS/1107} | 4 +- .../{2000-GnuTLS/2018 => 1100-Basic-TLS/1108} | 4 +- .../{2000-GnuTLS/2023 => 1100-Basic-TLS/1109} | 0 .../{2000-GnuTLS/2019 => 1100-Basic-TLS/1110} | 4 +- .../{2000-GnuTLS/2022 => 1100-Basic-TLS/1111} | 2 +- .../{2000-GnuTLS/2028 => 1100-Basic-TLS/1112} | 4 +- .../{2000-GnuTLS/2030 => 1100-Basic-TLS/1113} | 0 .../{2000-GnuTLS/2090 => 1100-Basic-TLS/1114} | 4 +- .../{2000-GnuTLS/2099 => 1100-Basic-TLS/1149} | 1 + test/scripts/2100-OpenSSL/2103 | 49 --------- test/scripts/2100-OpenSSL/2104 | 43 -------- test/scripts/2100-OpenSSL/2105 | 28 ----- test/scripts/2100-OpenSSL/2106 | 17 --- test/scripts/2100-OpenSSL/2115 | 18 --- test/scripts/2100-OpenSSL/2118 | 44 -------- test/scripts/2100-OpenSSL/2119 | 40 ------- test/scripts/2100-OpenSSL/2122 | 21 ---- test/scripts/2100-OpenSSL/2123 | 6 - test/scripts/2100-OpenSSL/2128 | 32 ------ test/scripts/2100-OpenSSL/2130 | 11 -- test/scripts/2100-OpenSSL/2190 | 71 ------------ test/scripts/2100-OpenSSL/2199 | 14 --- test/stderr/2199 | 4 - test/stdout/{2003 => 1103} | 0 test/stdout/{2004 => 1104} | 0 test/stdout/{2005 => 1105} | 0 test/stdout/{2006 => 1106} | 0 test/stdout/{2015 => 1107} | 0 test/stdout/{2018 => 1108} | 0 test/stdout/{2023 => 1109} | 0 test/stdout/{2019 => 1110} | 0 test/stdout/{2022 => 1111} | 0 test/stdout/{2028 => 1112} | 0 test/stdout/{2090 => 1114} | 0 test/stdout/{2099 => 1149} | 0 test/stdout/2103 | 72 ------------ test/stdout/2104 | 59 ---------- test/stdout/2105 | 37 ------- test/stdout/2106 | 23 ---- test/stdout/2115 | 23 ---- test/stdout/2118 | 64 ----------- test/stdout/2119 | 57 ---------- test/stdout/2122 | 30 ----- test/stdout/2123 | 9 -- test/stdout/2128 | 45 -------- test/stdout/2190 | 104 ------------------ test/stdout/2199 | 4 - 123 files changed, 65 insertions(+), 1533 deletions(-) rename test/confs/{2003 => 1103} (96%) rename test/confs/{2104 => 1104} (96%) rename test/confs/{2005 => 1105} (97%) rename test/confs/{2106 => 1106} (88%) rename test/confs/{2015 => 1107} (89%) rename test/confs/{2118 => 1108} (92%) rename test/confs/{2123 => 1109} (91%) rename test/confs/{2119 => 1110} (73%) rename test/confs/{2122 => 1111} (87%) rename test/confs/{2128 => 1112} (89%) rename test/confs/{2130 => 1113} (94%) rename test/confs/{2090 => 1114} (100%) rename test/confs/{2099 => 1149} (88%) delete mode 100644 test/confs/2004 delete mode 100644 test/confs/2006 delete mode 100644 test/confs/2018 delete mode 100644 test/confs/2019 delete mode 100644 test/confs/2022 delete mode 100644 test/confs/2023 delete mode 100644 test/confs/2028 delete mode 100644 test/confs/2030 mode change 120000 => 100644 test/confs/2034 delete mode 100644 test/confs/2103 delete mode 100644 test/confs/2105 delete mode 100644 test/confs/2115 delete mode 120000 test/confs/2190 delete mode 100644 test/confs/2199 rename test/log/{2003 => 1103} (100%) rename test/log/{2004 => 1104} (100%) rename test/log/{2005 => 1105} (100%) rename test/log/{2006 => 1106} (100%) rename test/log/{2015 => 1107} (82%) rename test/log/{2018 => 1108} (100%) rename test/log/{2023 => 1109} (100%) rename test/log/{2019 => 1110} (84%) rename test/log/{2022 => 1111} (100%) rename test/log/{2028 => 1112} (100%) rename test/log/{2030 => 1113} (86%) rename test/log/{2090 => 1114} (100%) rename test/log/{2099 => 1149} (100%) delete mode 100644 test/log/2103 delete mode 100644 test/log/2104 delete mode 100644 test/log/2105 delete mode 100644 test/log/2106 delete mode 100644 test/log/2115 delete mode 100644 test/log/2118 delete mode 100644 test/log/2119 delete mode 100644 test/log/2122 delete mode 100644 test/log/2128 delete mode 100644 test/log/2130 delete mode 100644 test/log/2190 delete mode 100644 test/log/2199 rename test/mail/{2003.userx => 1103.userx} (100%) rename test/mail/{2004.userx => 1104.userx} (100%) rename test/mail/{2019.userx => 1110.userx} (79%) delete mode 100644 test/mail/2103.userx delete mode 100644 test/mail/2104.userx delete mode 100644 test/mail/2119.userx rename test/rejectlog/{2003 => 1103} (100%) rename test/rejectlog/{2004 => 1104} (100%) rename test/rejectlog/{2005 => 1105} (100%) rename test/rejectlog/{2018 => 1108} (100%) rename test/{log/2123 => rejectlog/1109} (100%) delete mode 100644 test/rejectlog/2023 delete mode 100644 test/rejectlog/2103 delete mode 100644 test/rejectlog/2104 delete mode 100644 test/rejectlog/2105 delete mode 100644 test/rejectlog/2118 delete mode 100644 test/rejectlog/2123 rename test/scripts/{2000-GnuTLS/2003 => 1100-Basic-TLS/1103} (89%) rename test/scripts/{2000-GnuTLS/2004 => 1100-Basic-TLS/1104} (88%) rename test/scripts/{2000-GnuTLS/2005 => 1100-Basic-TLS/1105} (92%) rename test/scripts/{2000-GnuTLS/2006 => 1100-Basic-TLS/1106} (86%) rename test/scripts/{2000-GnuTLS/2015 => 1100-Basic-TLS/1107} (85%) rename test/scripts/{2000-GnuTLS/2018 => 1100-Basic-TLS/1108} (88%) rename test/scripts/{2000-GnuTLS/2023 => 1100-Basic-TLS/1109} (100%) rename test/scripts/{2000-GnuTLS/2019 => 1100-Basic-TLS/1110} (82%) rename test/scripts/{2000-GnuTLS/2022 => 1100-Basic-TLS/1111} (88%) rename test/scripts/{2000-GnuTLS/2028 => 1100-Basic-TLS/1112} (80%) rename test/scripts/{2000-GnuTLS/2030 => 1100-Basic-TLS/1113} (100%) rename test/scripts/{2000-GnuTLS/2090 => 1100-Basic-TLS/1114} (94%) rename test/scripts/{2000-GnuTLS/2099 => 1100-Basic-TLS/1149} (93%) delete mode 100644 test/scripts/2100-OpenSSL/2103 delete mode 100644 test/scripts/2100-OpenSSL/2104 delete mode 100644 test/scripts/2100-OpenSSL/2105 delete mode 100644 test/scripts/2100-OpenSSL/2106 delete mode 100644 test/scripts/2100-OpenSSL/2115 delete mode 100644 test/scripts/2100-OpenSSL/2118 delete mode 100644 test/scripts/2100-OpenSSL/2119 delete mode 100644 test/scripts/2100-OpenSSL/2122 delete mode 100644 test/scripts/2100-OpenSSL/2123 delete mode 100644 test/scripts/2100-OpenSSL/2128 delete mode 100644 test/scripts/2100-OpenSSL/2130 delete mode 100644 test/scripts/2100-OpenSSL/2190 delete mode 100644 test/scripts/2100-OpenSSL/2199 delete mode 100644 test/stderr/2199 rename test/stdout/{2003 => 1103} (100%) rename test/stdout/{2004 => 1104} (100%) rename test/stdout/{2005 => 1105} (100%) rename test/stdout/{2006 => 1106} (100%) rename test/stdout/{2015 => 1107} (100%) rename test/stdout/{2018 => 1108} (100%) rename test/stdout/{2023 => 1109} (100%) rename test/stdout/{2019 => 1110} (100%) rename test/stdout/{2022 => 1111} (100%) rename test/stdout/{2028 => 1112} (100%) rename test/stdout/{2090 => 1114} (100%) rename test/stdout/{2099 => 1149} (100%) delete mode 100644 test/stdout/2103 delete mode 100644 test/stdout/2104 delete mode 100644 test/stdout/2105 delete mode 100644 test/stdout/2106 delete mode 100644 test/stdout/2115 delete mode 100644 test/stdout/2118 delete mode 100644 test/stdout/2119 delete mode 100644 test/stdout/2122 delete mode 100644 test/stdout/2123 delete mode 100644 test/stdout/2128 delete mode 100644 test/stdout/2190 delete mode 100644 test/stdout/2199 diff --git a/test/confs/2003 b/test/confs/1103 similarity index 96% rename from test/confs/2003 rename to 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 similarity index 96% rename from test/confs/2104 rename to 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 similarity index 97% rename from test/confs/2005 rename to 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 similarity index 88% rename from test/confs/2106 rename to 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 similarity index 89% rename from test/confs/2015 rename to 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 similarity index 92% rename from test/confs/2118 rename to 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 similarity index 91% rename from test/confs/2123 rename to 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 similarity index 73% rename from test/confs/2119 rename to 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} { - -# ----- 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 deleted file mode 120000 index 6d0f5c2f1..000000000 --- a/test/confs/2034 +++ /dev/null @@ -1 +0,0 @@ -2006 \ No newline at end of file diff --git a/test/confs/2034 b/test/confs/2034 new file mode 100644 index 000000000..ffb826c7d --- /dev/null +++ b/test/confs/2034 @@ -0,0 +1,16 @@ +# 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 diff --git a/test/log/2003 b/test/log/1103 similarity index 100% rename from test/log/2003 rename to test/log/1103 diff --git a/test/log/2004 b/test/log/1104 similarity index 100% rename from test/log/2004 rename to test/log/1104 diff --git a/test/log/2005 b/test/log/1105 similarity index 100% rename from test/log/2005 rename to test/log/1105 diff --git a/test/log/2006 b/test/log/1106 similarity index 100% rename from test/log/2006 rename to test/log/1106 diff --git a/test/log/2015 b/test/log/1107 similarity index 82% rename from test/log/2015 rename to test/log/1107 index eedf12e52..56ccf3579 100644 --- a/test/log/2015 +++ b/test/log/1107 @@ -2,8 +2,8 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) -1999-03-02 09:44:33 TLS error on connection from (timeout.rhu.barb) [127.0.0.1] (gnutls_handshake): timed out +1999-03-02 09:44:33 TLS error on connection from (timeout.rhu.barb) [127.0.0.1] (tls lib accept fn): timed out 1999-03-02 09:44:33 SMTP command timeout on connection from (timeout.rhu.barb) [127.0.0.1] 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) -1999-03-02 09:44:33 TLS error on connection from (close.rhu.barb) [127.0.0.1] (gnutls_handshake): The TLS connection was non-properly terminated. +1999-03-02 09:44:33 TLS error on connection from (close.rhu.barb) [127.0.0.1] (tls lib accept fn): TCP connection closed by peer 1999-03-02 09:44:33 SMTP connection from (close.rhu.barb) [127.0.0.1] closed by EOF diff --git a/test/log/2018 b/test/log/1108 similarity index 100% rename from test/log/2018 rename to test/log/1108 diff --git a/test/log/2023 b/test/log/1109 similarity index 100% rename from test/log/2023 rename to test/log/1109 diff --git a/test/log/2019 b/test/log/1110 similarity index 84% rename from test/log/2019 rename to test/log/1110 index cc5d14649..fc4b59e3c 100644 --- a/test/log/2019 +++ b/test/log/1110 @@ -8,4 +8,4 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss diff --git a/test/log/2022 b/test/log/1111 similarity index 100% rename from test/log/2022 rename to test/log/1111 diff --git a/test/log/2028 b/test/log/1112 similarity index 100% rename from test/log/2028 rename to test/log/1112 diff --git a/test/log/2030 b/test/log/1113 similarity index 86% rename from test/log/2030 rename to test/log/1113 index 9c926fd6e..a23e6ce57 100644 --- a/test/log/2030 +++ b/test/log/1113 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed ******** SERVER ******** diff --git a/test/log/2090 b/test/log/1114 similarity index 100% rename from test/log/2090 rename to test/log/1114 diff --git a/test/log/2099 b/test/log/1149 similarity index 100% rename from test/log/2099 rename to test/log/1149 diff --git a/test/log/2034 b/test/log/2034 index 9f17fed12..bcc3bb493 100644 --- a/test/log/2034 +++ b/test/log/2034 @@ -1,6 +1,6 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [127.0.0.1] (gnutls_handshake): timed out +1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [127.0.0.1] (tls lib accept fn): timed out 1999-03-02 09:44:33 SMTP command timeout on connection from (rhu1.barb) [127.0.0.1] 1999-03-02 09:44:33 TLS error on connection from (rhu2.barb) [127.0.0.1] (gnutls_handshake): An unexpected TLS packet was received. diff --git a/test/log/2103 b/test/log/2103 deleted file mode 100644 index fb09e79fc..000000000 --- a/test/log/2103 +++ /dev/null @@ -1,9 +0,0 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx R=abc T=local_delivery -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F= rejected RCPT : unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx -1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss diff --git a/test/log/2104 b/test/log/2104 deleted file mode 100644 index c32814637..000000000 --- a/test/log/2104 +++ /dev/null @@ -1,9 +0,0 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx R=abc T=local_delivery -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F= rejected RCPT : encryption required -1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtp S=sss diff --git a/test/log/2105 b/test/log/2105 deleted file mode 100644 index cfe8981bd..000000000 --- a/test/log/2105 +++ /dev/null @@ -1,6 +0,0 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 H=[127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/log/2106 b/test/log/2106 deleted file mode 100644 index ccbc80fcb..000000000 --- a/test/log/2106 +++ /dev/null @@ -1,4 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP command timeout on TLS connection from [127.0.0.1] diff --git a/test/log/2111 b/test/log/2111 index d642c0435..fe68f5af0 100644 --- a/test/log/2111 +++ b/test/log/2111 @@ -8,5 +8,5 @@ ******** SERVER ******** 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] SSL_accept: TCP connection closed by peer +1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (tls lib accept fn): TCP connection closed by peer 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:AES256-SHA:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaX-0005vi-00@myhost.test.ex diff --git a/test/log/2115 b/test/log/2115 deleted file mode 100644 index c49e4922b..000000000 --- a/test/log/2115 +++ /dev/null @@ -1,6 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1) -1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [127.0.0.1] (SSL_accept): timed out -1999-03-02 09:44:33 SMTP command timeout on connection from (rhu.barb) [127.0.0.1] diff --git a/test/log/2118 b/test/log/2118 deleted file mode 100644 index f45aba391..000000000 --- a/test/log/2118 +++ /dev/null @@ -1,5 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss -1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F= rejected RCPT : "You must encrypt" diff --git a/test/log/2119 b/test/log/2119 deleted file mode 100644 index 02e430d72..000000000 --- a/test/log/2119 +++ /dev/null @@ -1,11 +0,0 @@ -1999-03-02 09:44:33 Start queue run: pid=pppp -qf -1999-03-02 09:44:33 10HmaX-0005vi-00 => userx R=abc T=local_delivery -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 => userx R=abc T=local_delivery -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 End queue run: pid=pppp -qf - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D -1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss diff --git a/test/log/2122 b/test/log/2122 deleted file mode 100644 index 6161c31ba..000000000 --- a/test/log/2122 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D diff --git a/test/log/2128 b/test/log/2128 deleted file mode 100644 index e6311910e..000000000 --- a/test/log/2128 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D and for SMTPS on port PORT_D2 port PORT_D3 diff --git a/test/log/2130 b/test/log/2130 deleted file mode 100644 index 09c83a972..000000000 --- a/test/log/2130 +++ /dev/null @@ -1,10 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00" -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 SNI -1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no SNI=fred S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=server -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/2190 b/test/log/2190 deleted file mode 100644 index f3e5e78ab..000000000 --- a/test/log/2190 +++ /dev/null @@ -1,5 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D -1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss for CALLER@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no K S=sss for CALLER@test.ex diff --git a/test/log/2199 b/test/log/2199 deleted file mode 100644 index c0f8a663a..000000000 --- a/test/log/2199 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D diff --git a/test/mail/2003.userx b/test/mail/1103.userx similarity index 100% rename from test/mail/2003.userx rename to test/mail/1103.userx diff --git a/test/mail/2004.userx b/test/mail/1104.userx similarity index 100% rename from test/mail/2004.userx rename to test/mail/1104.userx diff --git a/test/mail/2019.userx b/test/mail/1110.userx similarity index 79% rename from test/mail/2019.userx rename to test/mail/1110.userx index 3b38f9a48..b0fce8611 100644 --- a/test/mail/2019.userx +++ b/test/mail/1110.userx @@ -5,7 +5,7 @@ Received: from [127.0.0.1] (helo=rhu.barb) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn '' This is a test encrypted message. @@ -16,7 +16,7 @@ Received: from [ip4.ip4.ip4.ip4] (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn 'CN=Phil Pennock' This is a test encrypted message from a verified host. diff --git a/test/mail/2103.userx b/test/mail/2103.userx deleted file mode 100644 index 66c128b68..000000000 --- a/test/mail/2103.userx +++ /dev/null @@ -1,11 +0,0 @@ -From userx@test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=rhu.barb) - by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -This is a test encrypted message. - diff --git a/test/mail/2104.userx b/test/mail/2104.userx deleted file mode 100644 index 232d7a7d6..000000000 --- a/test/mail/2104.userx +++ /dev/null @@ -1,10 +0,0 @@ -From userx@test.ex Tue Mar 02 09:44:33 1999 -Received: from [ip4.ip4.ip4.ip4] (helo=rhu.barb) - by myhost.test.ex with esmtp (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher= peerdn= - -This is a test unencrypted message. - diff --git a/test/mail/2119.userx b/test/mail/2119.userx deleted file mode 100644 index e79ed70b4..000000000 --- a/test/mail/2119.userx +++ /dev/null @@ -1,22 +0,0 @@ -From userx@test.ex Tue Mar 02 09:44:33 1999 -Received: from [127.0.0.1] (helo=rhu.barb) - by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= - -This is a test encrypted message. - -From userx@test.ex Tue Mar 02 09:44:33 1999 -Received: from [ip4.ip4.ip4.ip4] - by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) - (Exim x.yz) - (envelope-from ) - id 10HmaY-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock - -This is a test encrypted message from a verified host. - diff --git a/test/rejectlog/2003 b/test/rejectlog/1103 similarity index 100% rename from test/rejectlog/2003 rename to test/rejectlog/1103 diff --git a/test/rejectlog/2004 b/test/rejectlog/1104 similarity index 100% rename from test/rejectlog/2004 rename to test/rejectlog/1104 diff --git a/test/rejectlog/2005 b/test/rejectlog/1105 similarity index 100% rename from test/rejectlog/2005 rename to test/rejectlog/1105 diff --git a/test/rejectlog/2018 b/test/rejectlog/1108 similarity index 100% rename from test/rejectlog/2018 rename to test/rejectlog/1108 diff --git a/test/log/2123 b/test/rejectlog/1109 similarity index 100% rename from test/log/2123 rename to test/rejectlog/1109 diff --git a/test/rejectlog/2023 b/test/rejectlog/2023 deleted file mode 100644 index 29f12c94a..000000000 --- a/test/rejectlog/2023 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 H=(a.b.c) [10.9.8.10] U=CALLER rejected STARTTLS diff --git a/test/rejectlog/2103 b/test/rejectlog/2103 deleted file mode 100644 index da1a81fce..000000000 --- a/test/rejectlog/2103 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F= rejected RCPT : unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx diff --git a/test/rejectlog/2104 b/test/rejectlog/2104 deleted file mode 100644 index b5d5dd8f9..000000000 --- a/test/rejectlog/2104 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/rejectlog/2105 b/test/rejectlog/2105 deleted file mode 100644 index f6ad104da..000000000 --- a/test/rejectlog/2105 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 H=[127.0.0.1] F= rejected RCPT : encryption required diff --git a/test/rejectlog/2118 b/test/rejectlog/2118 deleted file mode 100644 index 55415be9a..000000000 --- a/test/rejectlog/2118 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F= rejected RCPT : "You must encrypt" diff --git a/test/rejectlog/2123 b/test/rejectlog/2123 deleted file mode 100644 index 29f12c94a..000000000 --- a/test/rejectlog/2123 +++ /dev/null @@ -1 +0,0 @@ -1999-03-02 09:44:33 H=(a.b.c) [10.9.8.10] U=CALLER rejected STARTTLS diff --git a/test/runtest b/test/runtest index 323472634..ba2450c45 100755 --- a/test/runtest +++ b/test/runtest @@ -1490,7 +1490,10 @@ RESET_AFTER_EXTRA_LINE_READ: # Platform differences in errno strings s/Arg list too long/Argument list too long/; - s/session: \((SSL_connect|gnutls_handshake)\): timed out/session: (tls lib connect fn): timed out/; + # OpenSSL vs. GnuTLS + s/session: \K\((SSL_connect|gnutls_handshake)\): timed out/(tls lib connect fn): timed out/; + s/TLS error on connection from .*\K\((SSL_accept|gnutls_handshake)\): timed out/(tls lib accept fn): timed out/; + s/TLS error on connection from .*\K(SSL_accept: TCP connection closed by peer|\(gnutls_handshake\): The TLS connection was non-properly terminated.)/(tls lib accept fn): TCP connection closed by peer/; } # ======== mail ======== diff --git a/test/scripts/2000-GnuTLS/2003 b/test/scripts/1100-Basic-TLS/1103 similarity index 89% rename from test/scripts/2000-GnuTLS/2003 rename to test/scripts/1100-Basic-TLS/1103 index d4bcedd67..d8441dc40 100644 --- a/test/scripts/2000-GnuTLS/2003 +++ b/test/scripts/1100-Basic-TLS/1103 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** -client-gnutls HOSTIPV4 PORT_D +client-anytls HOSTIPV4 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -20,7 +20,7 @@ rcpt to: quit ??? 221 **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2004 b/test/scripts/1100-Basic-TLS/1104 similarity index 88% rename from test/scripts/2000-GnuTLS/2004 rename to test/scripts/1100-Basic-TLS/1104 index a310bb6ec..4a3af17ee 100644 --- a/test/scripts/2000-GnuTLS/2004 +++ b/test/scripts/1100-Basic-TLS/1104 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -18,7 +18,7 @@ rcpt to: quit ??? 221 **** -client-gnutls HOSTIPV4 PORT_D +client-anytls HOSTIPV4 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2005 b/test/scripts/1100-Basic-TLS/1105 similarity index 92% rename from test/scripts/2000-GnuTLS/2005 rename to test/scripts/1100-Basic-TLS/1105 index a2164b327..fe06d2cab 100644 --- a/test/scripts/2000-GnuTLS/2005 +++ b/test/scripts/1100-Basic-TLS/1105 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 mail from: ??? 250 diff --git a/test/scripts/2000-GnuTLS/2006 b/test/scripts/1100-Basic-TLS/1106 similarity index 86% rename from test/scripts/2000-GnuTLS/2006 rename to test/scripts/1100-Basic-TLS/1106 index 1da0f7ddc..1b8438f7e 100644 --- a/test/scripts/2000-GnuTLS/2006 +++ b/test/scripts/1100-Basic-TLS/1106 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2015 b/test/scripts/1100-Basic-TLS/1107 similarity index 85% rename from test/scripts/2000-GnuTLS/2015 rename to test/scripts/1100-Basic-TLS/1107 index 07fda35b3..79d412d70 100644 --- a/test/scripts/2000-GnuTLS/2015 +++ b/test/scripts/1100-Basic-TLS/1107 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo timeout.rhu.barb ??? 250- @@ -16,7 +16,7 @@ starttls_wait +++ 2 ??? 421 **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo close.rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2018 b/test/scripts/1100-Basic-TLS/1108 similarity index 88% rename from test/scripts/2000-GnuTLS/2018 rename to test/scripts/1100-Basic-TLS/1108 index 3f06e59e8..7da4f444b 100644 --- a/test/scripts/2000-GnuTLS/2018 +++ b/test/scripts/1100-Basic-TLS/1108 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -25,7 +25,7 @@ This is a test encrypted message. quit ??? 221 **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2023 b/test/scripts/1100-Basic-TLS/1109 similarity index 100% rename from test/scripts/2000-GnuTLS/2023 rename to test/scripts/1100-Basic-TLS/1109 diff --git a/test/scripts/2000-GnuTLS/2019 b/test/scripts/1100-Basic-TLS/1110 similarity index 82% rename from test/scripts/2000-GnuTLS/2019 rename to test/scripts/1100-Basic-TLS/1110 index d59f42ea2..865b2202f 100644 --- a/test/scripts/2000-GnuTLS/2019 +++ b/test/scripts/1100-Basic-TLS/1110 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -tls-on-connect -bd -oX PORT_D **** -client-gnutls -tls-on-connect 127.0.0.1 PORT_D +client-anytls -tls-on-connect 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -22,7 +22,7 @@ This is a test encrypted message. quit ??? 221 **** -client-gnutls -tls-on-connect HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2 +client-anytls -tls-on-connect HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2 ??? 220 mail from: ??? 250 diff --git a/test/scripts/2000-GnuTLS/2022 b/test/scripts/1100-Basic-TLS/1111 similarity index 88% rename from test/scripts/2000-GnuTLS/2022 rename to test/scripts/1100-Basic-TLS/1111 index b90361982..f36360d8f 100644 --- a/test/scripts/2000-GnuTLS/2022 +++ b/test/scripts/1100-Basic-TLS/1111 @@ -2,7 +2,7 @@ gnutls exim -DSERVER=server -bd -oX PORT_D **** -client-gnutls HOSTIPV4 PORT_D +client-anytls HOSTIPV4 PORT_D ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2028 b/test/scripts/1100-Basic-TLS/1112 similarity index 80% rename from test/scripts/2000-GnuTLS/2028 rename to test/scripts/1100-Basic-TLS/1112 index e5bb97b72..396ee3fef 100644 --- a/test/scripts/2000-GnuTLS/2028 +++ b/test/scripts/1100-Basic-TLS/1112 @@ -4,7 +4,7 @@ need_ipv4 gnutls exim -DSERVER=server -bd -oX PORT_D:PORT_D2:PORT_D3 **** -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 ehlo rhu.barb ??? 250- @@ -18,7 +18,7 @@ starttls quit ??? 221 **** -client-gnutls -tls-on-connect 127.0.0.1 PORT_D2 +client-anytls -tls-on-connect 127.0.0.1 PORT_D2 ??? 220 ehlo rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2030 b/test/scripts/1100-Basic-TLS/1113 similarity index 100% rename from test/scripts/2000-GnuTLS/2030 rename to test/scripts/1100-Basic-TLS/1113 diff --git a/test/scripts/2000-GnuTLS/2090 b/test/scripts/1100-Basic-TLS/1114 similarity index 94% rename from test/scripts/2000-GnuTLS/2090 rename to test/scripts/1100-Basic-TLS/1114 index 91227e8ca..47badfe42 100644 --- a/test/scripts/2000-GnuTLS/2090 +++ b/test/scripts/1100-Basic-TLS/1114 @@ -4,7 +4,7 @@ exim -DSERVER=server -DSRV=tls -bd -oX PORT_D **** # # non-piplined -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 EHLO rhu.barb ??? 250- @@ -39,7 +39,7 @@ QUIT **** # # pipelined -client-gnutls 127.0.0.1 PORT_D +client-anytls 127.0.0.1 PORT_D ??? 220 EHLO rhu.barb ??? 250- diff --git a/test/scripts/2000-GnuTLS/2099 b/test/scripts/1100-Basic-TLS/1149 similarity index 93% rename from test/scripts/2000-GnuTLS/2099 rename to test/scripts/1100-Basic-TLS/1149 index 632dc094b..501a9c9da 100644 --- a/test/scripts/2000-GnuTLS/2099 +++ b/test/scripts/1100-Basic-TLS/1149 @@ -12,3 +12,4 @@ exim -be millisleep 500 # killdaemon +no_stderr_check diff --git a/test/scripts/2100-OpenSSL/2103 b/test/scripts/2100-OpenSSL/2103 deleted file mode 100644 index 1018c4eb4..000000000 --- a/test/scripts/2100-OpenSSL/2103 +++ /dev/null @@ -1,49 +0,0 @@ -# TLS server: unavailable cipher -exim -DSERVER=server -bd -oX PORT_D -**** -client-ssl HOSTIPV4 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -mail from: -??? 250 -rcpt to: -??? 550 -quit -??? 221 -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -helo rhu.barb -??? 250 -mail from: -??? 250 -rcpt to: -??? 250 -DATA -??? 3 -This is a test encrypted message. -. -??? 250 -quit -??? 221 -**** -killdaemon -exim -qf -**** diff --git a/test/scripts/2100-OpenSSL/2104 b/test/scripts/2100-OpenSSL/2104 deleted file mode 100644 index 55e54ddeb..000000000 --- a/test/scripts/2100-OpenSSL/2104 +++ /dev/null @@ -1,43 +0,0 @@ -# TLS server: TLS required -exim -DSERVER=server -bd -oX PORT_D -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -mail from: -??? 250 -rcpt to: -??? 550 -quit -??? 221 -**** -client-ssl HOSTIPV4 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -mail from: -??? 250 -rcpt to: -??? 250 -DATA -??? 3 -This is a test unencrypted message. -. -??? 250 -quit -??? 221 -**** -killdaemon -exim -qf -**** diff --git a/test/scripts/2100-OpenSSL/2105 b/test/scripts/2100-OpenSSL/2105 deleted file mode 100644 index 130fa48d9..000000000 --- a/test/scripts/2100-OpenSSL/2105 +++ /dev/null @@ -1,28 +0,0 @@ -# TLS server: accept for relay if encrypted -exim -DSERVER=server -bd -oX PORT_D -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -mail from: -??? 250 -rcpt to: -??? 550 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -mail from: -??? 250 -rcpt to: -??? 250 -quit -??? 221 -**** -killdaemon -exim -qf -**** diff --git a/test/scripts/2100-OpenSSL/2106 b/test/scripts/2100-OpenSSL/2106 deleted file mode 100644 index 3e36603a9..000000000 --- a/test/scripts/2100-OpenSSL/2106 +++ /dev/null @@ -1,17 +0,0 @@ -# TLS server: timeout in TLS session -exim -DSERVER=server -bd -oX PORT_D -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -+++ 3 -**** -killdaemon diff --git a/test/scripts/2100-OpenSSL/2115 b/test/scripts/2100-OpenSSL/2115 deleted file mode 100644 index 9ecefdbac..000000000 --- a/test/scripts/2100-OpenSSL/2115 +++ /dev/null @@ -1,18 +0,0 @@ -# TLS server: timeout after accepting STARTTLS -exim -DSERVER=server -bd -oX PORT_D -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls_wait -??? 220 -+++ 2 -??? 421 -**** -killdaemon diff --git a/test/scripts/2100-OpenSSL/2118 b/test/scripts/2100-OpenSSL/2118 deleted file mode 100644 index 281060ca8..000000000 --- a/test/scripts/2100-OpenSSL/2118 +++ /dev/null @@ -1,44 +0,0 @@ -# TLS: ACL encryption test -exim -DSERVER=server -bd -oX PORT_D -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -mail from: -??? 250 -rcpt to: -??? 250 -DATA -??? 3 -This is a test encrypted message. -. -??? 250 -quit -??? 221 -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -mail from: -??? 250 -rcpt to: -??? 550 -quit -??? 221 -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2119 b/test/scripts/2100-OpenSSL/2119 deleted file mode 100644 index 1ad9befd7..000000000 --- a/test/scripts/2100-OpenSSL/2119 +++ /dev/null @@ -1,40 +0,0 @@ -# TLS server: -tls-on-connect -exim -DSERVER=server -tls-on-connect -bd -oX PORT_D -**** -client-ssl -tls-on-connect 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -mail from: -??? 250 -rcpt to: -??? 250 -DATA -??? 3 -This is a test encrypted message. -. -??? 250 -quit -??? 221 -**** -client-ssl -tls-on-connect HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2 -??? 220 -mail from: -??? 250 -rcpt to: -??? 250 -DATA -??? 3 -This is a test encrypted message from a verified host. -. -??? 250 -quit -??? 221 -**** -killdaemon -exim -qf -**** diff --git a/test/scripts/2100-OpenSSL/2122 b/test/scripts/2100-OpenSSL/2122 deleted file mode 100644 index b93013962..000000000 --- a/test/scripts/2100-OpenSSL/2122 +++ /dev/null @@ -1,21 +0,0 @@ -# TLS server: help command in encrypted session -exim -DSERVER=server -bd -oX PORT_D -**** -client-ssl HOSTIPV4 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -help -??? 214- -??? 214 -quit -??? 221 -**** -killdaemon diff --git a/test/scripts/2100-OpenSSL/2123 b/test/scripts/2100-OpenSSL/2123 deleted file mode 100644 index 927c266c6..000000000 --- a/test/scripts/2100-OpenSSL/2123 +++ /dev/null @@ -1,6 +0,0 @@ -# TLS: ACL for STARTTLS -exim -bs -oMa 10.9.8.10 -ehlo a.b.c -starttls -quit -**** diff --git a/test/scripts/2100-OpenSSL/2128 b/test/scripts/2100-OpenSSL/2128 deleted file mode 100644 index b9d781a28..000000000 --- a/test/scripts/2100-OpenSSL/2128 +++ /dev/null @@ -1,32 +0,0 @@ -# tls_on_connect_ports -need_ipv4 -# -exim -DSERVER=server -bd -oX PORT_D:PORT_D2:PORT_D3 -**** -client-ssl 127.0.0.1 PORT_D -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -starttls -??? 220 -quit -??? 221 -**** -client-ssl -tls-on-connect 127.0.0.1 PORT_D2 -??? 220 -ehlo rhu.barb -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -quit -??? 221 -**** -killdaemon -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2130 b/test/scripts/2100-OpenSSL/2130 deleted file mode 100644 index afaa949e0..000000000 --- a/test/scripts/2100-OpenSSL/2130 +++ /dev/null @@ -1,11 +0,0 @@ -# TLS: client SNI -# -exim -DSERVER=server -bd -oX PORT_D -**** -# Basic: is SNI set on tpt seen by server -exim CALLER@test.ex -Test message. -**** -millisleep 500 -killdaemon -sleep 2 diff --git a/test/scripts/2100-OpenSSL/2190 b/test/scripts/2100-OpenSSL/2190 deleted file mode 100644 index e004e5e02..000000000 --- a/test/scripts/2100-OpenSSL/2190 +++ /dev/null @@ -1,71 +0,0 @@ -# TLS server, CHUNKING reception -exim -DSERVER=server -DSRV=tls -bd -oX PORT_D -**** -# -# non-piplined -client-ssl 127.0.0.1 PORT_D -??? 220 -EHLO rhu.barb -??? 250- -??? 250-SIZE -??? 250-8BITMIME -??? 250-PIPELINING -??? 250-CHUNKING -??? 250-STARTTLS -??? 250 HELP -STARTTLS -??? 220 -EHLO rhu.barb -??? 250- -??? 250-SIZE -??? 250-8BITMIME -??? 250-PIPELINING -??? 250-CHUNKING -??? 250 HELP -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -BDAT 88 LAST -To: Susan@random.com -From: Sam@random.com -Subject: This is a bodyless test message - -??? 250- -??? 250 -QUIT -??? 221 -**** -# -# pipelined -client-ssl 127.0.0.1 PORT_D -??? 220 -EHLO rhu.barb -??? 250- -??? 250-SIZE -??? 250-8BITMIME -??? 250-PIPELINING -??? 250-CHUNKING -??? 250-STARTTLS -??? 250 HELP -STARTTLS -??? 220 -EHLO rhu.barb -??? 250- -??? 250-SIZE -??? 250-8BITMIME -??? 250-PIPELINING -??? 250-CHUNKING -??? 250 HELP -MAIL FROM:\r\nRCPT TO:\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n -??? 250 -??? 250 -??? 250- -??? 250 -QUIT -??? 221 -**** -# -# -killdaemon -no_msglog_check diff --git a/test/scripts/2100-OpenSSL/2199 b/test/scripts/2100-OpenSSL/2199 deleted file mode 100644 index 632dc094b..000000000 --- a/test/scripts/2100-OpenSSL/2199 +++ /dev/null @@ -1,14 +0,0 @@ -# ${readsocket (IPv4 TLS) -need_ipv4 -# -exim -DSERVER=server -tls-on-connect -bd -oX PORT_D -**** -# -# -millisleep 500 -exim -be -1 >>${readsocket{inet:thisloop:PORT_D}{QUIT\n}{2s:tls=yes}}<< -**** -millisleep 500 -# -killdaemon diff --git a/test/stderr/2199 b/test/stderr/2199 deleted file mode 100644 index 0423be152..000000000 --- a/test/stderr/2199 +++ /dev/null @@ -1,4 +0,0 @@ -1999-03-02 09:44:33 [NULL] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock -1999-03-02 09:44:33 [NULL] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="thisloop" - -******** SERVER ******** diff --git a/test/stdout/2003 b/test/stdout/1103 similarity index 100% rename from test/stdout/2003 rename to test/stdout/1103 diff --git a/test/stdout/2004 b/test/stdout/1104 similarity index 100% rename from test/stdout/2004 rename to test/stdout/1104 diff --git a/test/stdout/2005 b/test/stdout/1105 similarity index 100% rename from test/stdout/2005 rename to test/stdout/1105 diff --git a/test/stdout/2006 b/test/stdout/1106 similarity index 100% rename from test/stdout/2006 rename to test/stdout/1106 diff --git a/test/stdout/2015 b/test/stdout/1107 similarity index 100% rename from test/stdout/2015 rename to test/stdout/1107 diff --git a/test/stdout/2018 b/test/stdout/1108 similarity index 100% rename from test/stdout/2018 rename to test/stdout/1108 diff --git a/test/stdout/2023 b/test/stdout/1109 similarity index 100% rename from test/stdout/2023 rename to test/stdout/1109 diff --git a/test/stdout/2019 b/test/stdout/1110 similarity index 100% rename from test/stdout/2019 rename to test/stdout/1110 diff --git a/test/stdout/2022 b/test/stdout/1111 similarity index 100% rename from test/stdout/2022 rename to test/stdout/1111 diff --git a/test/stdout/2028 b/test/stdout/1112 similarity index 100% rename from test/stdout/2028 rename to test/stdout/1112 diff --git a/test/stdout/2090 b/test/stdout/1114 similarity index 100% rename from test/stdout/2090 rename to test/stdout/1114 diff --git a/test/stdout/2099 b/test/stdout/1149 similarity index 100% rename from test/stdout/2099 rename to test/stdout/1149 diff --git a/test/stdout/2103 b/test/stdout/2103 deleted file mode 100644 index df5777d75..000000000 --- a/test/stdout/2103 +++ /dev/null @@ -1,72 +0,0 @@ -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 550 -<<< 550 unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> helo rhu.barb -??? 250 -<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1] ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2104 b/test/stdout/2104 deleted file mode 100644 index ac5245cba..000000000 --- a/test/stdout/2104 +++ /dev/null @@ -1,59 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 550 -<<< 550 encryption required ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test unencrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2105 b/test/stdout/2105 deleted file mode 100644 index 7a0430c10..000000000 --- a/test/stdout/2105 +++ /dev/null @@ -1,37 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 550 -<<< 550 encryption required ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 250 -<<< 250 Accepted ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2106 b/test/stdout/2106 deleted file mode 100644 index ba53967e0..000000000 --- a/test/stdout/2106 +++ /dev/null @@ -1,23 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS -+++ 3 -End of script diff --git a/test/stdout/2115 b/test/stdout/2115 deleted file mode 100644 index fd6174058..000000000 --- a/test/stdout/2115 +++ /dev/null @@ -1,23 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -+++ 2 -??? 421 -<<< 421 myhost.test.ex: SMTP command timeout - closing connection -End of script diff --git a/test/stdout/2118 b/test/stdout/2118 deleted file mode 100644 index c7a0df4c4..000000000 --- a/test/stdout/2118 +++ /dev/null @@ -1,64 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 550 -<<< 550 "You must encrypt" ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2119 b/test/stdout/2119 deleted file mode 100644 index b885461ed..000000000 --- a/test/stdout/2119 +++ /dev/null @@ -1,57 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -Attempting to start TLS -Succeeded in starting TLS -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250 -<<< 250 HELP ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message. ->>> . -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -Certificate file = aux-fixed/cert2 -Key file = aux-fixed/cert2 -Attempting to start TLS -Succeeded in starting TLS -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> mail from: -??? 250 -<<< 250 OK ->>> rcpt to: -??? 250 -<<< 250 Accepted ->>> DATA -??? 3 -<<< 354 Enter message, ending with "." on a line by itself ->>> This is a test encrypted message from a verified host. ->>> . -??? 250 -<<< 250 OK id=10HmaY-0005vi-00 ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2122 b/test/stdout/2122 deleted file mode 100644 index 3f280e0d5..000000000 --- a/test/stdout/2122 +++ /dev/null @@ -1,30 +0,0 @@ -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> help -??? 214- -<<< 214-Commands supported: -??? 214 -<<< 214 AUTH HELO EHLO MAIL RCPT DATA BDAT NOOP QUIT RSET HELP ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2123 b/test/stdout/2123 deleted file mode 100644 index 5022d27b3..000000000 --- a/test/stdout/2123 +++ /dev/null @@ -1,9 +0,0 @@ -220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -250-myhost.test.ex Hello CALLER at a.b.c [10.9.8.10] -250-SIZE 52428800 -250-8BITMIME -250-PIPELINING -250-STARTTLS -250 HELP -550 Administrative prohibition -221 myhost.test.ex closing connection diff --git a/test/stdout/2128 b/test/stdout/2128 deleted file mode 100644 index 1ccd96b88..000000000 --- a/test/stdout/2128 +++ /dev/null @@ -1,45 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250- -<<< 250-STARTTLS -??? 250 -<<< 250 HELP ->>> starttls -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script -Connecting to 127.0.0.1 port 1226 ... connected -Attempting to start TLS -Succeeded in starting TLS -??? 220 -<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> ehlo rhu.barb -??? 250- -<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250- -<<< 250-SIZE 52428800 -??? 250- -<<< 250-8BITMIME -??? 250- -<<< 250-PIPELINING -??? 250 -<<< 250 HELP ->>> quit -??? 221 -<<< 221 myhost.test.ex closing connection -End of script diff --git a/test/stdout/2190 b/test/stdout/2190 deleted file mode 100644 index f08abd10b..000000000 --- a/test/stdout/2190 +++ /dev/null @@ -1,104 +0,0 @@ -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250-STARTTLS -<<< 250-STARTTLS -??? 250 HELP -<<< 250 HELP ->>> STARTTLS -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250 HELP -<<< 250 HELP ->>> MAIL FROM: -??? 250 -<<< 250 OK ->>> RCPT TO: -??? 250 -<<< 250 Accepted ->>> BDAT 88 LAST ->>> To: Susan@random.com ->>> From: Sam@random.com ->>> Subject: This is a bodyless test message ->>> -??? 250- -<<< 250- 88 byte chunk, total 88 -??? 250 -<<< 250 OK id=10HmaX-0005vi-00 ->>> QUIT -??? 221 -<<< 221 testhost.test.ex closing connection -End of script -Connecting to 127.0.0.1 port 1225 ... connected -??? 220 -<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250-STARTTLS -<<< 250-STARTTLS -??? 250 HELP -<<< 250 HELP ->>> STARTTLS -??? 220 -<<< 220 TLS go ahead -Attempting to start TLS -Succeeded in starting TLS ->>> EHLO rhu.barb -??? 250- -<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1] -??? 250-SIZE -<<< 250-SIZE 52428800 -??? 250-8BITMIME -<<< 250-8BITMIME -??? 250-PIPELINING -<<< 250-PIPELINING -??? 250-CHUNKING -<<< 250-CHUNKING -??? 250 HELP -<<< 250 HELP ->>> MAIL FROM:\r\nRCPT TO:\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n -??? 250 -<<< 250 OK -??? 250 -<<< 250 Accepted -??? 250- -<<< 250- 88 byte chunk, total 88 -??? 250 -<<< 250 OK id=10HmaY-0005vi-00 ->>> QUIT -??? 221 -<<< 221 testhost.test.ex closing connection -End of script diff --git a/test/stdout/2199 b/test/stdout/2199 deleted file mode 100644 index a3eab5117..000000000 --- a/test/stdout/2199 +++ /dev/null @@ -1,4 +0,0 @@ -> 1 >>220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -221 myhost.test.ex closing connection -<< -> -- 2.30.2