11 files changed, 234 insertions, 0 deletions
diff --git a/test/scripts/1100-Basic-TLS/1150 b/test/scripts/1100-Basic-TLS/1150
new file mode 100644
index 000000000..f22086a76
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1150
@@ -0,0 +1,15 @@
+# TLS client: general
+gnutls
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim CALLER@test.ex
+Test message. Contains FF: ÿ
+****
+exim CALLER@test.ex abcd@test.ex xyz@test.ex
+Test message to two different hosts
+****
+exim -v -qf
+****
+killdaemon
+exim -DSERVER=server -DNOTDAEMON -qf
+****
diff --git a/test/scripts/1100-Basic-TLS/1103 b/test/scripts/1100-Basic-TLS/1151
index de97e32ef..de97e32ef 100644
--- a/test/scripts/1100-Basic-TLS/1103
+++ b/test/scripts/1100-Basic-TLS/1151
diff --git a/test/scripts/1100-Basic-TLS/1152 b/test/scripts/1100-Basic-TLS/1152
new file mode 100644
index 000000000..280c426d2
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1152
@@ -0,0 +1,11 @@
+# TLS client: log_smtp_confirmation
+gnutls
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx@test.ex
+Test message
+****
+exim -qf
+****
+killdaemon
+no_msglog_check
diff --git a/test/scripts/1100-Basic-TLS/1153 b/test/scripts/1100-Basic-TLS/1153
new file mode 100644
index 000000000..69eb61d07
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1153
@@ -0,0 +1,11 @@
+# TLS client: hosts_avoid_tls
+gnutls
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx@test.ex
+Test message
+****
+exim -qf
+****
+killdaemon
+no_msglog_check
diff --git a/test/scripts/1100-Basic-TLS/1157 b/test/scripts/1100-Basic-TLS/1157
new file mode 100644
index 000000000..afbc9a6b7
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1157
@@ -0,0 +1,52 @@
+# TLS client: multiple messages over one connection
+gnutls
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx@test.ex
+Test message 1
+****
+exim usery@test.ex
+Test message 2
+****
+exim userz@test.ex
+Test message 3
+****
+exim -d-all+acl -qqf
+****
+killdaemon
+exim -DSERVER=server -DNOTDAEMON -qf
+****
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim usera@test.ex
+Test message 1
+****
+exim userb@test.ex
+Test message 2
+****
+exim userc@test.ex
+Test message 3
+****
+exim -DEQUIRE -d-all+acl -qqf
+****
+killdaemon
+exim -DSERVER=server -DNOTDAEMON -qf
+****
+#
+#
+# no tls proxy (default for test was permitting proxy)
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx@test.ex
+Test message 1
+****
+exim usery@test.ex
+Test message 2
+****
+exim userz@test.ex
+Test message 3
+****
+exim -d-all+acl '-DPEX=*' -qqf
+****
+killdaemon
diff --git a/test/scripts/1100-Basic-TLS/1158 b/test/scripts/1100-Basic-TLS/1158
new file mode 100644
index 000000000..2da309d68
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1158
@@ -0,0 +1,16 @@
+# TLS client: timeout while setting up TLS
+gnutls
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250-STARTTLS
+250 HELP
+STARTTLS
+220 Go ahead
+*sleep 2
+****
+exim -odi userx@domain1
+Test message
+****
+no_msglog_check
diff --git a/test/scripts/1100-Basic-TLS/1159 b/test/scripts/1100-Basic-TLS/1159
new file mode 100644
index 000000000..af08df0b1
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1159
@@ -0,0 +1,15 @@
+# TLS client: hosts_nopass_tls
+gnutls
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx@test.ex
+Test message 1
+****
+exim userx@test.ex
+Test message 2
+****
+exim -qqf
+****
+killdaemon
+exim -DSERVER=server -DNOTDAEMON -qf
+****
diff --git a/test/scripts/1100-Basic-TLS/1161 b/test/scripts/1100-Basic-TLS/1161
new file mode 100644
index 000000000..5c402ce2c
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1161
@@ -0,0 +1,53 @@
+# TLS client: 4xx response to STARTTLS
+gnutls
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+QUIT
+250 OK
+****
+exim -DTRYCLEAR=tls_tempfail_tryclear=false -odi x@y
+****
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+MAIL FROM:
+250 OK
+RCPT TO:
+250 OK
+DATA
+354 Go ahead
+.
+250 OK
+QUIT
+250 OK
+****
+exim -qf
+****
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250-HELP
+250-STARTTLS
+250 PIPELINING
+STARTTLS
+450 temp problem
+QUIT
+250 OK
+****
+exim -DREQUIRE=hosts_require_tls=* -odi x@y
+****
+no_msglog_check
diff --git a/test/scripts/1100-Basic-TLS/1163 b/test/scripts/1100-Basic-TLS/1163
new file mode 100644
index 000000000..650286814
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1163
@@ -0,0 +1,18 @@
+# TLS client: multiple messages over one connection (continue_more)
+gnutls
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx0@test.ex userx1@test.ex
+Test message 1
+****
+exim usery0@test.ex usery1@test.ex
+Test message 2
+****
+exim userz0@test.ex userz1@test.ex
+Test message 3
+****
+exim -qqf
+****
+killdaemon
+exim -DSERVER=server -DNOTDAEMON -qf
+****
diff --git a/test/scripts/1100-Basic-TLS/1164 b/test/scripts/1100-Basic-TLS/1164
new file mode 100644
index 000000000..19dfc6479
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1164
@@ -0,0 +1,34 @@
+# TLS client: recipient callout - TLS fail, retry in clear
+need_ipv4
+#
+server PORT_S 2
+220 Server ready
+EHLO
+250-wotcher mate
+250-STARTTLS
+250 OK
+STARTTLS
+250
+.
+220 Server ready
+EHLO
+250-wotcher mate
+250-STARTTLS
+250 OK
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+QUIT
+250 OK
+****
+exim -odq -bs
+ehlo xxxx
+mail from: s1@test.ex
+rcpt to: r1@test.ex
+data
+.
+quit
+****
+no_stdout_check
+no_msglog_check
diff --git a/test/scripts/1100-Basic-TLS/1165 b/test/scripts/1100-Basic-TLS/1165
new file mode 100644
index 000000000..58e5163c5
--- /dev/null
+++ b/test/scripts/1100-Basic-TLS/1165
@@ -0,0 +1,9 @@
+# TLS client, CHUNKING transmission
+gnutls
+exim -DSERVER=server -DSRV=tls -bd -oX PORT_S
+****
+exim -oMt this-user -f this-user -odf other-user@test.ex
+Test message. Contains FF: ÿ
+****
+killdaemon
+no_msglog_check