summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/05701
-rw-r--r--test/confs/451057
-rw-r--r--test/lib/Exim/Runtest.pm1
-rw-r--r--test/log/0570104
-rw-r--r--test/log/451020
-rw-r--r--test/mail/4510.store58
-rw-r--r--test/rejectlog/057024
-rwxr-xr-xtest/runtest30
-rw-r--r--test/scripts/0000-Basic/057030
-rw-r--r--test/scripts/4510-DKIM-Bounces/451015
-rw-r--r--test/scripts/4510-DKIM-Bounces/REQUIRES2
-rw-r--r--test/stdout/10082
-rw-r--r--test/stdout/101018
-rw-r--r--test/stdout/210257
-rw-r--r--test/stdout/2102.debian8164
-rw-r--r--test/stdout/210326
-rw-r--r--test/stdout/2103.debian882
-rw-r--r--test/stdout/210513
-rw-r--r--test/stdout/2105.debian842
-rw-r--r--test/stdout/210613
-rw-r--r--test/stdout/2106.debian828
-rw-r--r--test/stdout/2114126
-rw-r--r--test/stdout/2114.debian8274
-rw-r--r--test/stdout/211813
-rw-r--r--test/stdout/2118.debian869
-rw-r--r--test/stdout/211929
-rw-r--r--test/stdout/2119.debian867
-rw-r--r--test/stdout/212213
-rw-r--r--test/stdout/2122.debian835
-rw-r--r--test/stdout/212416
-rw-r--r--test/stdout/2124.debian850
-rw-r--r--test/stdout/212826
-rw-r--r--test/stdout/2128.debian855
-rw-r--r--test/stdout/213257
-rw-r--r--test/stdout/2132.debian8164
-rw-r--r--test/stdout/215013
-rw-r--r--test/stdout/2150.debian839
-rw-r--r--test/stdout/219026
-rw-r--r--test/stdout/2190.debian8120
-rw-r--r--test/stdout/345012
-rw-r--r--test/stdout/3450.debian876
-rw-r--r--test/stdout/345424
-rw-r--r--test/stdout/3454.debian880
-rw-r--r--test/stdout/346013
-rw-r--r--test/stdout/3460.debian876
-rw-r--r--test/stdout/346326
-rw-r--r--test/stdout/3463.debian876
-rw-r--r--test/stdout/346426
-rw-r--r--test/stdout/3464.debian880
-rw-r--r--test/stdout/560064
-rw-r--r--test/stdout/5600.debian8140
-rw-r--r--test/stdout/561064
-rw-r--r--test/stdout/5610.debian8140
53 files changed, 285 insertions, 2591 deletions
diff --git a/test/confs/0570 b/test/confs/0570
index 1c2ca0a25..962e76bb0 100644
--- a/test/confs/0570
+++ b/test/confs/0570
@@ -36,5 +36,6 @@ smtp:
driver = smtp
port = PORT_D
OPTION
+ max_parallel = 1
# End
diff --git a/test/confs/4510 b/test/confs/4510
new file mode 100644
index 000000000..42c58aac5
--- /dev/null
+++ b/test/confs/4510
@@ -0,0 +1,57 @@
+# Exim test configuration 4510
+
+SERVER=
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames
+acl_smtp_data_prdr = accept local_parts = okuser
+
+prdr_enable
+
+# ----- Routers
+
+begin routers
+
+client:
+ driver = accept
+ condition = ${if eq {SERVER}{server}{no}{yes}}
+ transport = send_to_server
+
+server_dump:
+ driver = redirect
+ senders = ! :
+ data = :blackhole:
+
+server_store:
+ driver = accept
+ transport = store
+
+# ----- Transports
+
+begin transports
+
+store:
+ driver = appendfile
+ file = DIR/test-mail/store
+ return_path_add
+ user = CALLER
+
+send_to_server:
+ driver = smtp
+ allow_localhost
+ hosts = HOSTIPV4
+ port = PORT_D
+
+ dkim_domain = ${if def:sender_address_local_part {test.ex}}
+ dkim_selector = sel
+ dkim_private_key = DIR/aux-fixed/dkim/dkim.private
+ dkim_sign_headers = From
+
+# End
diff --git a/test/lib/Exim/Runtest.pm b/test/lib/Exim/Runtest.pm
index 8d22544bf..537cea1e9 100644
--- a/test/lib/Exim/Runtest.pm
+++ b/test/lib/Exim/Runtest.pm
@@ -103,6 +103,7 @@ sub exim_binary {
my $os = `$_/scripts/os-type`;
my $arch = `$_/scripts/arch-type`;
chomp($os, $arch);
+ ($ENV{build} ? "$_/build-$ENV{build}" : ()),
"$_/build-$os-$arch" . ($ENV{EXIM_BUILD_SUFFIX} ? ".$ENV{EXIM_BUILD_SUFFIX}" : '');
} @candidates;
diff --git a/test/log/0570 b/test/log/0570
index fa76b71f1..3630b692a 100644
--- a/test/log/0570
+++ b/test/log/0570
@@ -1,43 +1,58 @@
-**NOTE: The delivery lines in this file have been sorted.
1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00"
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> usery@domd.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
-1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00"
-1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbB-0005vi-00 == usery@domf.ex R=all T=smtp defer (-56): concurrency limit reached for transport
+1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@dome.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbB-0005vi-00 => usery@domf.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00"
-1999-03-02 09:44:33 10HmbE-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbG-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 => userx@domg.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 -> usery@domh.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbF-0005vi-00"
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbH-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00"
-1999-03-02 09:44:33 10HmbH-0005vi-00 => usery@domb.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbJ-0005vi-00"
-1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbG-0005vi-00 == usery@doml.ex R=all T=smtp defer (-56): concurrency limit reached for transport
+1999-03-02 09:44:33 10HmbG-0005vi-00 => userx@domk.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbH-0005vi-00"
1999-03-02 09:44:33 End queue run: pid=pppp
-1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbG-0005vi-00 => usery@doml.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbI-0005vi-00"
+1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmbK-0005vi-00 -> usery@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00"
-1999-03-02 09:44:33 10HmbK-0005vi-00 => userx@doma.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00"
-1999-03-02 09:44:33 10HmbK-0005vi-00 => userz@domc.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbM-0005vi-00"
-1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbJ-0005vi-00 == usery@domn.ex R=all T=smtp defer (-56): concurrency limit reached for transport
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@domm.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbK-0005vi-00"
1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbJ-0005vi-00 => usery@domn.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbL-0005vi-00"
+1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
+1999-03-02 09:44:33 End queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmbM-0005vi-00 == userz@domq.ex R=all T=smtp defer (-56): concurrency limit reached for transport
+1999-03-02 09:44:33 10HmbM-0005vi-00 => userx@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00"
+1999-03-02 09:44:33 10HmbM-0005vi-00 -> usery@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00"
+1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 Start queue run: pid=pppp -qf
+1999-03-02 09:44:33 10HmbM-0005vi-00 => userz@domq.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbO-0005vi-00"
+1999-03-02 09:44:33 10HmbM-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 1225
@@ -46,41 +61,46 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@primary.test.ex
1999-03-02 09:44:33 10HmaY-0005vi-00 => blackhole (RCPT ACL discarded recipients)
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domC.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domD.ex>: discarded by RCPT ACL
1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-0005vi-00@primary.test.ex
1999-03-02 09:44:33 10HmbA-0005vi-00 => blackhole (RCPT ACL discarded recipients)
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domE.ex>: discarded by RCPT ACL
1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex
1999-03-02 09:44:33 10HmbC-0005vi-00 => blackhole (RCPT ACL discarded recipients)
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domF.ex>: discarded by RCPT ACL
1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbB-0005vi-00@primary.test.ex
1999-03-02 09:44:33 10HmbD-0005vi-00 => blackhole (RCPT ACL discarded recipients)
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domG.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domH.ex>: discarded by RCPT ACL
1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex
1999-03-02 09:44:33 10HmbF-0005vi-00 => blackhole (RCPT ACL discarded recipients)
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbE-0005vi-00@primary.test.ex
-1999-03-02 09:44:33 10HmbG-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domK.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbG-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmbH-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domL.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbG-0005vi-00@primary.test.ex
1999-03-02 09:44:33 10HmbI-0005vi-00 => blackhole (RCPT ACL discarded recipients)
1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbH-0005vi-00@primary.test.ex
-1999-03-02 09:44:33 10HmbJ-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domM.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbJ-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmbK-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domN.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbJ-0005vi-00@primary.test.ex
1999-03-02 09:44:33 10HmbL-0005vi-00 => blackhole (RCPT ACL discarded recipients)
1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domC.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbK-0005vi-00@primary.test.ex
-1999-03-02 09:44:33 10HmbM-0005vi-00 => blackhole (RCPT ACL discarded recipients)
-1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domP.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domP.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbM-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmbN-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domQ.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@test.ex H=localhost (primary.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmbM-0005vi-00@primary.test.ex
+1999-03-02 09:44:33 10HmbO-0005vi-00 => blackhole (RCPT ACL discarded recipients)
+1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
diff --git a/test/log/4510 b/test/log/4510
new file mode 100644
index 000000000..0d826ab32
--- /dev/null
+++ b/test/log/4510
@@ -0,0 +1,20 @@
+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 ** baduser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: PRDR error after DATA: 550 PRDR R=<baduser@test.ex> refusal
+1999-03-02 09:44:33 10HmaX-0005vi-00 => okuser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] PRDR C="250 PRDR R=<okuser@test.ex> acceptance"
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@myhost.test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+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 1225
+1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded]
+1999-03-02 09:44:33 10HmbA-0005vi-00 signer: test.ex bits: 1024 h=From
+1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R=<baduser@test.ex> refusal
+1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R=<okuser@test.ex> acceptance
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp PRDR S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <okuser@test.ex> R=server_dump
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=server_store T=store
+1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/mail/4510.store b/test/mail/4510.store
new file mode 100644
index 000000000..d75e40906
--- /dev/null
+++ b/test/mail/4510.store
@@ -0,0 +1,58 @@
+From MAILER-DAEMON Tue Mar 02 09:44:33 1999
+Return-path: <>
+Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
+ by myhost.test.ex with esmtp (Exim x.yz)
+ id 10HmaZ-0005vi-00
+ for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
+ id 10HmaY-0005vi-00
+ for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+X-Failed-Recipients: baduser@test.ex
+Auto-Submitted: auto-replied
+From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
+To: CALLER@myhost.test.ex
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
+Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
+This message was created automatically by mail delivery software.
+
+A message that you sent could not be delivered to one or more of its
+recipients. This is a permanent error. The following address(es) failed:
+
+ baduser@test.ex
+ host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
+ PRDR error after DATA: 550 PRDR R=<baduser@test.ex> refusal
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;baduser@test.ex
+Status: 5.0.0
+Diagnostic-Code: smtp; 550 PRDR R=<baduser@test.ex> refusal
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
+
+Return-path: <CALLER@myhost.test.ex>
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+ (envelope-from <CALLER@myhost.test.ex>)
+ id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+From: nobody@example.com
+From: second@example.com
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+content
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+
diff --git a/test/rejectlog/0570 b/test/rejectlog/0570
index a1acc1559..63f236a55 100644
--- a/test/rejectlog/0570
+++ b/test/rejectlog/0570
@@ -2,14 +2,16 @@
******** SERVER ********
1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domB.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domA.ex>: discarded by RCPT ACL
-1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domC.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domC.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domD.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domE.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domF.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domG.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domH.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domK.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domL.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domM.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domN.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userx@domP.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <usery@domP.ex>: discarded by RCPT ACL
+1999-03-02 09:44:33 H=localhost (primary.test.ex) [127.0.0.1] F=<CALLER@test.ex> RCPT <userz@domQ.ex>: discarded by RCPT ACL
diff --git a/test/runtest b/test/runtest
index fbe30e910..3016e5df6 100755
--- a/test/runtest
+++ b/test/runtest
@@ -358,6 +358,7 @@ open(IN, "$file") || tests_exit(-1, "Failed to open $file: $!");
my($is_log) = $file =~ /log/;
my($is_stdout) = $file =~ /stdout/;
my($is_stderr) = $file =~ /stderr/;
+my($is_mail) = $file =~ /mail/;
# Date pattern
@@ -420,12 +421,6 @@ RESET_AFTER_EXTRA_LINE_READ:
s?prvs=([^/]+)/[\da-f]{10}@?prvs=$1/xxxxxxxxxx@?g; # Old form
s?prvs=[\da-f]{10}=([^@]+)@?prvs=xxxxxxxxxx=$1@?g; # New form
- # Error lines on stdout from SSL contain process id values and file names.
- # They also contain a source file name and line number, which may vary from
- # release to release.
- s/^\d+:error:/pppp:error:/;
- s/:(?:\/[^\s:]+\/)?([^\/\s]+\.c):\d+:/:$1:dddd:/;
-
# There are differences in error messages between OpenSSL versions
s/SSL_CTX_set_cipher_list/SSL_connect/;
@@ -889,15 +884,25 @@ RESET_AFTER_EXTRA_LINE_READ:
}
}
+ # remote IPv6 addrs vary
+ s/^(Connection request from) \[.*:.*:.*\]$/$1 \[ipv6\]/;
+
# openssl version variances
- next if /^SSL info: unknown state/;
- next if /^SSL info: SSLv2\/v3 write client hello A/;
- next if /^SSL info: SSLv3 read server key exchange A/;
+ # Error lines on stdout from SSL contain process id values and file names.
+ # They also contain a source file name and line number, which may vary from
+ # release to release.
+
+ next if /^SSL info:/;
next if /SSL verify error: depth=0 error=certificate not trusted/;
s/SSL3_READ_BYTES/ssl3_read_bytes/i;
+ s/^\d+:error:\d+(:SSL routines:ssl3_read_bytes:[^:]+:).*(:SSL alert number \d\d)$/pppp:error:dddddddd$1\[...\]$2/;
# gnutls version variances
next if /^Error in the pull function./;
+
+ # optional IDN2 variant conversions. Accept either IDN1 or IDN2
+ s/conversion strasse.de/conversion xn--strae-oqa.de/;
+ s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/;
}
# ======== stderr ========
@@ -1140,6 +1145,13 @@ RESET_AFTER_EXTRA_LINE_READ:
next if / Berkeley DB error: /;
}
+ elsif ($is_mail)
+ {
+ # Experimental_DSN info in bounces
+ next if /^Remote-MTA: /;
+ next if /^X-Exim-Diagnostic: /;
+ }
+
# ======== All files other than stderr ========
print MUNGED;
diff --git a/test/scripts/0000-Basic/0570 b/test/scripts/0000-Basic/0570
index 75ac0cec6..8f8c0b2da 100644
--- a/test/scripts/0000-Basic/0570
+++ b/test/scripts/0000-Basic/0570
@@ -12,7 +12,7 @@ exim -q
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domC.ex usery@domD.ex
Test message
****
# Equivalent explicit case: can multi-domain
@@ -20,14 +20,17 @@ exim -DOPTION=multi_domain=yes -q
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domE.ex usery@domF.ex
Test message
****
-# no multi-domain
+# no multi-domain: 2nd rcpt is deferred since parallel is disabled
exim -DOPTION=multi_domain=no -q
+****
+exim -DOPTION=multi_domain=no -qf
+****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domG.ex usery@domH.ex
Test message
****
# Expanded case: can multi-domain
@@ -35,33 +38,38 @@ exim -DOPTION='multi_domain=${if bool{1} {true}{false}}' -q
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domK.ex usery@domL.ex
Test message
****
# Expanded case: no multi-domain (1)
-exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -q
+****
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domK.ex} {no}{yes}}' -qf
****
#
#
-exim userx@domA.ex usery@domB.ex
+exim userx@domM.ex usery@domN.ex
Test message
****
# Expanded case: no multi-domain (2)
-exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domB.ex} {no}{yes}}' -q
+exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -q
+****
+exim -DOPTION='multi_domain=${if match_domain {$address_data}{domZ.ex : domY.ex : domN.ex} {no}{yes}}' -qf
****
#
#
-exim userx@domA.ex usery@domA.ex userz@domC.ex
+exim userx@domP.ex usery@domP.ex userz@domQ.ex
Test message
****
# Expanded case: both yes and no
-exim -DOPTION='multi_domain=${if eqi {$address_data}{domA.ex} {no}{yes}}' -q
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -q
+****
+exim -DOPTION='multi_domain=${if eqi {$address_data}{domP.ex} {no}{yes}}' -qf
****
#
#
killdaemon
no_msglog_check
-sortlog
#
#
##
diff --git a/test/scripts/4510-DKIM-Bounces/4510 b/test/scripts/4510-DKIM-Bounces/4510
new file mode 100644
index 000000000..531dbdafd
--- /dev/null
+++ b/test/scripts/4510-DKIM-Bounces/4510
@@ -0,0 +1,15 @@
+# DKIM signing and bounces
+#
+exim -bd -DSERVER=server -oX PORT_D
+****
+#
+# single header signed
+# one rcpt accept, one reject - should get a DSN
+exim -odf baduser@test.ex okuser@test.ex
+From: nobody@example.com
+From: second@example.com
+
+content
+****
+millisleep 500
+killdaemon
diff --git a/test/scripts/4510-DKIM-Bounces/REQUIRES b/test/scripts/4510-DKIM-Bounces/REQUIRES
new file mode 100644
index 000000000..a75b81c54
--- /dev/null
+++ b/test/scripts/4510-DKIM-Bounces/REQUIRES
@@ -0,0 +1,2 @@
+support DKIM
+support PRDR
diff --git a/test/stdout/1008 b/test/stdout/1008
index f930d30a5..9122d3d05 100644
--- a/test/stdout/1008
+++ b/test/stdout/1008
@@ -31,7 +31,7 @@ QUIT
250 OK
Expected EOF read from client
Listening on port 1224 ...
-Connection request from [::]
+Connection request from [ipv6]
220 Server ready
EHLO the.local.host.name
250-server id
diff --git a/test/stdout/1010 b/test/stdout/1010
index cacc1541b..b8cd645e5 100644
--- a/test/stdout/1010
+++ b/test/stdout/1010
@@ -12,43 +12,43 @@
******** SERVER ********
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
QUERY-1
>LF>ANSWER-1
>*eof
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
QUERY-2
>>ANSWER-2
>*eof
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
QUERY-3
>LF>ANSWER-3
>*eof
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
QUERY-4
>LF>ANSWER-4
>*eof
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
>>ANSWER-5
>*eof
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
*sleep 1
>*eof
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
>*eof
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
QUERY-8
*sleep 2
Expected EOF read from client
Listening on port 1224 ...
-Connection request from [::1]
+Connection request from [ipv6]
QUERY-9
*sleep 2
Expected EOF read from client
diff --git a/test/stdout/2102 b/test/stdout/2102
index ec0a7c921..0d96d1279 100644
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<CALLER@test.ex>
@@ -70,19 +57,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<"name with spaces"@test.ex>
@@ -122,20 +96,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read server session ticket A
-pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
+pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40
Failed to start TLS
End of script
Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -160,22 +121,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<CALLER@test.ex>
diff --git a/test/stdout/2102.debian8 b/test/stdout/2102.debian8
deleted file mode 100644
index e512c398b..000000000
--- a/test/stdout/2102.debian8
+++ /dev/null
@@ -1,164 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<CALLER@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<CALLER@test.ex>
-??? 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
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<"name with spaces"@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<CALLER@test.ex>
-??? 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=10HmaY-0005vi-00
->>> 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
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
-Failed to start TLS
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
-Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<CALLER@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<CALLER@test.ex>
-??? 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=10HmaZ-0005vi-00
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-
-**** SMTP testing session as if from host 10.0.0.1
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-503 STARTTLS command used when not advertised
-221 myhost.test.ex closing connection
diff --git a/test/stdout/2103 b/test/stdout/2103
index bf79d4217..f987fe59c 100644
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -18,19 +18,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
@@ -63,19 +50,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> helo rhu.barb
diff --git a/test/stdout/2103.debian8 b/test/stdout/2103.debian8
deleted file mode 100644
index d445aea3e..000000000
--- a/test/stdout/2103.debian8
+++ /dev/null
@@ -1,82 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 550
-<<< 550 unacceptable cipher TLSv1:AES256-SHA:256
->>> 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> helo rhu.barb
-??? 250
-<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 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/2105 b/test/stdout/2105
index 4faa84d50..5395110c7 100644
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -24,19 +24,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
diff --git a/test/stdout/2105.debian8 b/test/stdout/2105.debian8
deleted file mode 100644
index 72e4f0c51..000000000
--- a/test/stdout/2105.debian8
+++ /dev/null
@@ -1,42 +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:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@remote.test.ex>
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@remote.test.ex>
-??? 250
-<<< 250 Accepted
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/2106 b/test/stdout/2106
index 25b649cf4..3c6dc5d36 100644
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
+++ 3
diff --git a/test/stdout/2106.debian8 b/test/stdout/2106.debian8
deleted file mode 100644
index 54e9e06d7..000000000
--- a/test/stdout/2106.debian8
+++ /dev/null
@@ -1,28 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
-+++ 3
-End of script
diff --git a/test/stdout/2114 b/test/stdout/2114
index 050519979..7020b0c57 100644
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -18,20 +18,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read server session ticket A
-pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
+pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40
Failed to start TLS
End of script
Connecting to 127.0.0.1 port 1225 ... connected
@@ -54,21 +41,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> helo rhu.barb
@@ -106,22 +78,6 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
@@ -156,22 +112,6 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
@@ -206,21 +146,7 @@ Key file = aux-fixed/cert1
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read server session ticket A
-pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
+pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48
Failed to start TLS
End of script
Connecting to 127.0.0.1 port 1225 ... connected
@@ -245,22 +171,6 @@ Key file = aux-fixed/cert1
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
@@ -297,21 +207,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read server session ticket A
-pppp:error:14094414:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44
+pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:[...]:SSL alert number 44
Failed to start TLS
End of script
Connecting to 127.0.0.1 port 1225 ... connected
@@ -336,22 +232,6 @@ Key file = aux-fixed/cert1
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
diff --git a/test/stdout/2114.debian8 b/test/stdout/2114.debian8
deleted file mode 100644
index b02d2dd7c..000000000
--- a/test/stdout/2114.debian8
+++ /dev/null
@@ -1,274 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
-Failed to start TLS
-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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> helo rhu.barb
-??? 250
-<<< 250 myhost.test.ex Hello rhu.barb [127.0.0.1]
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 550
-<<< 550 certificate not verified: peerdn=
->>> 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
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert1
-Key file = aux-fixed/cert1
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
-Failed to start TLS
-End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-Certificate file = aux-fixed/cert1
-Key file = aux-fixed/cert1
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 550-
-<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test
-??? 550
-<<< 550 Suite/CN=Phil Pennock
->>> 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
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-pppp:error:14094414:SSL routines:ssl3_read_bytes:sslv3 alert certificate revoked:s3_pkt.c:dddd:SSL alert number 44
-Failed to start TLS
-End of script
-Connecting to 127.0.0.1 port 1225 ... connected
-Certificate file = aux-fixed/cert1
-Key file = aux-fixed/cert1
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 550-
-<<< 550-certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test
-??? 550
-<<< 550 Suite/CN=Phil Pennock
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/2118 b/test/stdout/2118
index 0359564ba..c026a063b 100644
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
diff --git a/test/stdout/2118.debian8 b/test/stdout/2118.debian8
deleted file mode 100644
index 98f17c3c9..000000000
--- a/test/stdout/2118.debian8
+++ /dev/null
@@ -1,69 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 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:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 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
index dd74cb469..5fffd603a 100644
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -1,18 +1,5 @@
Connecting to 127.0.0.1 port 1225 ... connected
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
??? 220
@@ -49,22 +36,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
Certificate file = aux-fixed/cert2
Key file = aux-fixed/cert2
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
??? 220
diff --git a/test/stdout/2119.debian8 b/test/stdout/2119.debian8
deleted file mode 100644
index 92cbd6e4e..000000000
--- a/test/stdout/2119.debian8
+++ /dev/null
@@ -1,67 +0,0 @@
-Connecting to 127.0.0.1 port 1225 ... connected
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-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:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
-??? 220
-<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 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
index 55feb8f41..8fe3d56a2 100644
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -18,19 +18,6 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> help
diff --git a/test/stdout/2122.debian8 b/test/stdout/2122.debian8
deleted file mode 100644
index c44db97c7..000000000
--- a/test/stdout/2122.debian8
+++ /dev/null
@@ -1,35 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-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/2124 b/test/stdout/2124
index 9a7a744c5..166f39657 100644
--- a/test/stdout/2124
+++ b/test/stdout/2124
@@ -20,21 +20,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read server session ticket A
-pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
+pppp:error:dddddddd:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:[...]:SSL alert number 48
Failed to start TLS
End of script
Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
diff --git a/test/stdout/2124.debian8 b/test/stdout/2124.debian8
deleted file mode 100644
index c7fef405d..000000000
--- a/test/stdout/2124.debian8
+++ /dev/null
@@ -1,50 +0,0 @@
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-pppp:error:14094418:SSL routines:ssl3_read_bytes:tlsv1 alert unknown ca:s3_pkt.c:dddd:SSL alert number 48
-Failed to start TLS
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 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
-??? 454
-<<< 454 TLS currently unavailable
-Abandoning TLS start attempt
-End of script
diff --git a/test/stdout/2128 b/test/stdout/2128
index e0a0c3b00..b251b4cc4 100644
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> quit
@@ -39,19 +26,6 @@ Succeeded in starting TLS
End of script
Connecting to 127.0.0.1 port 1226 ... connected
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
??? 220
diff --git a/test/stdout/2128.debian8 b/test/stdout/2128.debian8
deleted file mode 100644
index 2c4f98316..000000000
--- a/test/stdout/2128.debian8
+++ /dev/null
@@ -1,55 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-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/2132 b/test/stdout/2132
index 97aca85c1..322237463 100644
--- a/test/stdout/2132
+++ b/test/stdout/2132
@@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<CALLER@test.ex>
@@ -70,19 +57,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<"name with spaces"@test.ex>
@@ -122,20 +96,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read server session ticket A
-pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
+pppp:error:dddddddd:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:[...]:SSL alert number 40
Failed to start TLS
End of script
Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -160,22 +121,6 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<CALLER@test.ex>
diff --git a/test/stdout/2132.debian8 b/test/stdout/2132.debian8
deleted file mode 100644
index 3744d44b9..000000000
--- a/test/stdout/2132.debian8
+++ /dev/null
@@ -1,164 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<CALLER@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<CALLER@test.ex>
-??? 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
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<"name with spaces"@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<CALLER@test.ex>
-??? 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=10HmaY-0005vi-00
->>> 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
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-pppp:error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure:s3_pkt.c:dddd:SSL alert number 40
-Failed to start TLS
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
-Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<CALLER@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<CALLER@test.ex>
-??? 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=10HmaZ-0005vi-00
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
-
-**** SMTP testing session as if from host 10.0.0.1
-**** but without any ident (RFC 1413) callback.
-**** This is not for real!
-
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-503 STARTTLS command used when not advertised
-221 myhost.test.ex closing connection
diff --git a/test/stdout/2150 b/test/stdout/2150
index 8580754c1..75f7c5b54 100644
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -18,19 +18,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
diff --git a/test/stdout/2150.debian8 b/test/stdout/2150.debian8
deleted file mode 100644
index 70b247e07..000000000
--- a/test/stdout/2150.debian8
+++ /dev/null
@@ -1,39 +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 abcd
-??? 250-
-<<< 250-myhost.test.ex Hello abcd [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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> data
-??? 354
-<<< 354 Enter message, ending with "." on a line by itself
->>> This is a test message.
->>> .
-+++ 1
-End of script
diff --git a/test/stdout/2190 b/test/stdout/2190
index c1ee9ffcf..9d386bdf7 100644
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -20,19 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> EHLO rhu.barb
@@ -89,19 +76,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> EHLO rhu.barb
diff --git a/test/stdout/2190.debian8 b/test/stdout/2190.debian8
deleted file mode 100644
index 2bb8156ce..000000000
--- a/test/stdout/2190.debian8
+++ /dev/null
@@ -1,120 +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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-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:<someone@some.domain>
-??? 250
-<<< 250 OK
->>> RCPT TO:<CALLER@test.ex>
-??? 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-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:<someone@some.domain>
->>> RCPT TO:<CALLER@test.ex>
->>> BDAT 88 LAST
->>> To: Susan@random.com
->>> From: Sam@random.com
->>> Subject: This is a bodyless test message
->>>
-??? 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/3450 b/test/stdout/3450
index bbb4db1c2..5efba0069 100644
--- a/test/stdout/3450
+++ b/test/stdout/3450
@@ -48,18 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> ehlo foobar
diff --git a/test/stdout/3450.debian8 b/test/stdout/3450.debian8
deleted file mode 100644
index bddcb4deb..000000000
--- a/test/stdout/3450.debian8
+++ /dev/null
@@ -1,76 +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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [ip4.ip4.ip4.ip4]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 235
-<<< 235 Authentication succeeded
->>> 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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 503
-<<< 503 STARTTLS required before AUTH
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> ehlo foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 235
-<<< 235 Authentication succeeded
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/3454 b/test/stdout/3454
index d60485e6c..eec5221b5 100644
--- a/test/stdout/3454
+++ b/test/stdout/3454
@@ -20,18 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220 TLS
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> auth plain AHVzZXJ4AHNlY3JldA==
@@ -60,18 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220 TLS
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> ehlo foobar
diff --git a/test/stdout/3454.debian8 b/test/stdout/3454.debian8
deleted file mode 100644
index 66dc56386..000000000
--- a/test/stdout/3454.debian8
+++ /dev/null
@@ -1,80 +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 foobar
-??? 250-myhost
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-8BITMIME
-<<< 250-8BITMIME
-??? 250-PIPELINING
-<<< 250-PIPELINING
-??? 250-AUTH
-<<< 250-AUTH PLAIN
-??? 250-STARTTLS
-<<< 250-STARTTLS
-??? 250 HELP
-<<< 250 HELP
->>> starttls
-??? 220 TLS
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 503
-<<< 503 AUTH command used when not advertised
-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 foobar
-??? 250-myhost
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-8BITMIME
-<<< 250-8BITMIME
-??? 250-PIPELINING
-<<< 250-PIPELINING
-??? 250-AUTH
-<<< 250-AUTH PLAIN
-??? 250-STARTTLS
-<<< 250-STARTTLS
-??? 250 HELP
-<<< 250 HELP
->>> starttls
-??? 220 TLS
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> ehlo foobar
-??? 250-myhost
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-SIZE
-<<< 250-SIZE 52428800
-??? 250-8BITMIME
-<<< 250-8BITMIME
-??? 250-PIPELINING
-<<< 250-PIPELINING
-??? 250-AUTH
-<<< 250-AUTH PLAIN
-??? 250 HELP
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 235
-<<< 235 Authentication succeeded
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/3460 b/test/stdout/3460
index e77771e9d..5efba0069 100644
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -48,19 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> ehlo foobar
diff --git a/test/stdout/3460.debian8 b/test/stdout/3460.debian8
deleted file mode 100644
index bddcb4deb..000000000
--- a/test/stdout/3460.debian8
+++ /dev/null
@@ -1,76 +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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [ip4.ip4.ip4.ip4]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 235
-<<< 235 Authentication succeeded
->>> 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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 503
-<<< 503 STARTTLS required before AUTH
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> ehlo foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 235
-<<< 235 Authentication succeeded
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/3463 b/test/stdout/3463
index 859d8b166..60ba9d3a9 100644
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -20,19 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> auth plain AHVzZXJ4AHNlY3JldA==
@@ -67,19 +54,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> auth plain AHVzZXJ4AHNlY3JldA==
diff --git a/test/stdout/3463.debian8 b/test/stdout/3463.debian8
deleted file mode 100644
index ae1ce3e33..000000000
--- a/test/stdout/3463.debian8
+++ /dev/null
@@ -1,76 +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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 503
-<<< 503 AUTH command used when not advertised
->>> mail from:<x@y> size=1234
-??? 501
-<<< 501 <x@y> size=1234: malformed address: size=1234 may not follow <x@y>
->>> 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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 235
-<<< 235 Authentication succeeded
->>> mail from:<x@y> size=1234
-??? 250
-<<< 250 OK
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/3464 b/test/stdout/3464
index 4ec7dcc0b..3668f5e8a 100644
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -20,19 +20,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> auth plain AHVzZXJ4AHNlY3JldA==
@@ -61,19 +48,6 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> ehlo foobar
diff --git a/test/stdout/3464.debian8 b/test/stdout/3464.debian8
deleted file mode 100644
index 5e6162d5f..000000000
--- a/test/stdout/3464.debian8
+++ /dev/null
@@ -1,80 +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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 503
-<<< 503 AUTH command used when not advertised
-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 foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250-
-<<< 250-STARTTLS
-??? 250
-<<< 250 HELP
->>> starttls
-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> ehlo foobar
-??? 250-
-<<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250-
-<<< 250-AUTH PLAIN
-??? 250
-<<< 250 HELP
->>> auth plain AHVzZXJ4AHNlY3JldA==
-??? 235
-<<< 235 Authentication succeeded
->>> quit
-??? 221
-<<< 221 myhost.test.ex closing connection
-End of script
diff --git a/test/stdout/5600 b/test/stdout/5600
index d2d28dce6..9af94384a 100644
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -20,23 +20,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
Response verify OK
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
@@ -71,23 +55,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
no response received
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
End of script
@@ -113,23 +81,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
no response received
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
End of script
@@ -155,22 +107,6 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> ehlo rhu.barb.tls
diff --git a/test/stdout/5600.debian8 b/test/stdout/5600.debian8
deleted file mode 100644
index 039f5152f..000000000
--- a/test/stdout/5600.debian8
+++ /dev/null
@@ -1,140 +0,0 @@
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-Response verify OK
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> quit
-??? 221
-<<< 221 server1.example.com closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-no response received
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-no response received
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> ehlo rhu.barb.tls
-??? 250-
-<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250
-<<< 250 HELP
->>> quit
-End of script
diff --git a/test/stdout/5610 b/test/stdout/5610
index d2d28dce6..9af94384a 100644
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -20,23 +20,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
Response verify OK
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> mail from:<userx@test.ex>
@@ -71,23 +55,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
no response received
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
End of script
@@ -113,23 +81,7 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
no response received
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
End of script
@@ -155,22 +107,6 @@ Key file = aux-fixed/cert2
??? 220
<<< 220 TLS go ahead
Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate A
-SSL info: SSLv3 read server certificate request A
-SSL info: SSLv3 read server done A
-SSL info: SSLv3 write client certificate A
-SSL info: SSLv3 write client key exchange A
-SSL info: SSLv3 write certificate verify A
-SSL info: SSLv3 write change cipher spec A
-SSL info: SSLv3 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
SSL connection using AES256-SHA
Succeeded in starting TLS
>>> ehlo rhu.barb.tls
diff --git a/test/stdout/5610.debian8 b/test/stdout/5610.debian8
deleted file mode 100644
index 039f5152f..000000000
--- a/test/stdout/5610.debian8
+++ /dev/null
@@ -1,140 +0,0 @@
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-Response verify OK
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> mail from:<userx@test.ex>
-??? 250
-<<< 250 OK
->>> rcpt to:<userx@test.ex>
-??? 250
-<<< 250 Accepted
->>> quit
-??? 221
-<<< 221 server1.example.com closing connection
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-no response received
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-no response received
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
-End of script
-Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
-Certificate file = aux-fixed/cert2
-Key file = aux-fixed/cert2
-??? 220
-<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
-??? 250-
-<<< 250-server1.example.com 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
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
-Succeeded in starting TLS
->>> ehlo rhu.barb.tls
-??? 250-
-<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4]
-??? 250-
-<<< 250-SIZE 52428800
-??? 250-
-<<< 250-8BITMIME
-??? 250-
-<<< 250-PIPELINING
-??? 250
-<<< 250 HELP
->>> quit
-End of script