Testsuite: another go at munging cipher-suite strings

author Jeremy Harris <jgh146exb@wizmail.org>

Thu, 9 Nov 2017 21:35:08 +0000 (21:35 +0000)

committer Jeremy Harris <jgh146exb@wizmail.org>

Thu, 9 Nov 2017 21:35:08 +0000 (21:35 +0000)
author Jeremy Harris <jgh146exb@wizmail.org>
Thu, 9 Nov 2017 21:35:08 +0000 (21:35 +0000)
committer Jeremy Harris <jgh146exb@wizmail.org>
Thu, 9 Nov 2017 21:35:08 +0000 (21:35 +0000)
diff --git a/test/log/2100 b/test/log/2100

index da00c76de92da6b6cadd075f1cb0d6edb8bbcfe6..3d7c8f10cad98c1dc84b1e5a69058d72fd9dd179 100644 (file)
--- a/test/log/2100
+++ b/test/log/2100
@@ -1,9 +1,9 @@
  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 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 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
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaX-0005vi-00@myhost.test.ex
diff --git a/test/log/2102 b/test/log/2102

index eb52fb4f2f94cf530a5d4fb01e08e4c0da1010b5..1f254e3f830a7d9f8aac6feabc3aef221f9714aa 100644 (file)
--- a/test/log/2102
+++ b/test/log/2102
@@ -13,10 +13,10 @@
  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 Our cert SN: <CN=server1.example_ec.com>
  1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss
  1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
  1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss
  1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
  1999-03-02 09:44:33 Peer cert:
@@ -39,8 +39,8 @@
  1999-03-02 09:44:33 sha1   fingerprint 0D9E776B02AFDEFB0231588927D305CA81F00366
  1999-03-02 09:44:33 sha256 fingerprint 3B8118604CE886FD44668735B467D32CA1A03C9EBA610F6EF54BB8CCA223F12F
  1999-03-02 09:44:33 der_b64 MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNDAxWhcNMzcxMjAxMTIzNDAxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5xczcpFPcohZhLegf/wzSJvwj/dVkXg0MEyVulbMS+sgCwwSO6uGykJVc6ZKUnGqFyv5Icp1zG9Y9/joYefiXN5K1n/3NrtsET+6AJDWzZYz/AyRGd07xLwEw+Ip0/bqqNaxpc07L1qAABcwz2lcSeKsIDbYC9znSdEzuNUFmGQIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAGQz0ggxKkEXx50eX/uWtlC7+JFwsJLBhU/nGBmOLxzHhptrRBLiqLYr8Chj92eZNnDr1HUY0jIC8PcPDjpgz1rs+6HOy3F++t7u+x1x89MQ2DUjCqqyjiM/PzuKsdU4VTVXsu8R4x8YSjCfXeKJAlOL4rPy2wU3wXRhzCf4Et4E=
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server2.example.com" S=sss
  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 Our cert SN: <CN=server1.example_ec.com>
  1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-ECDSA-AES256-SHAxxx:256 CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-ECDSA-AES256-SHA:xxx CV=no S=sss
diff --git a/test/log/2103 b/test/log/2103

index 1f3a0c8cc2873289a3352fe1af94ce872fc5787d..ba317c02880b1781714ad8489c7014177e5f91bb 100644 (file)
--- a/test/log/2103
+++ b/test/log/2103
@@ -5,5 +5,5 @@
  
  ******** 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 H=[ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLSv1:ke-RSA-AES256-SHAxxx:256
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss
+1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLSv1:ke-RSA-AES256-SHA:xxx
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss
diff --git a/test/log/2108 b/test/log/2108

index ad6acb70b0323fa371da064efaa52f567f67ff38..ca0f467ab8bcdf701d63cca1bb25696b8c7a730f 100644 (file)
--- a/test/log/2108
+++ b/test/log/2108
@@ -3,23 +3,23 @@
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaY-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmaY-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmaY-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="ip4.ip4.ip4.ip4"
-1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qf
  
  ******** SERVER ********
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <CALLER@test.ex> R=server T=local_delivery
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/log/2110 b/test/log/2110

index 7b8760a2410bee4a4b9baf27e35730e30ed3d8a2..e4ff8b04c346ab21ca0943a68dc60bfd15ead1ba 100644 (file)
--- a/test/log/2110
+++ b/test/log/2110
@@ -3,7 +3,7 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]:1111: a TLS session is required, but the server did not offer TLS support
  1999-03-02 09:44:33 10HmaX-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmaX-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="ip4.ip4.ip4.ip4"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no 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 -qf
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
@@ -16,4 +16,4 @@
  
  ******** 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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
diff --git a/test/log/2112 b/test/log/2112

index 1caa23f51d4c864e2bf782d60c797525e23066cd..341d34b0e99d25a2471906e3ef0197b938dbe360 100644 (file)
--- a/test/log/2112
+++ b/test/log/2112
@@ -17,21 +17,21 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 userx@test.ex: error ignored
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaY-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
-1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client_y T=send_to_server_retry H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client_y T=send_to_server_retry H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
  1999-03-02 09:44:33 10HmaZ-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to verify the first certificate cert=/CN=server1.example.com
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client_z T=send_to_server_crypt H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client_z T=send_to_server_crypt H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbA-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.com
  1999-03-02 09:44:33 10HmbA-0005vi-00 TLS session: (SSL_connect): error: <<detail omitted>>
  1999-03-02 09:44:33 10HmbA-0005vi-00 => userq@test.ex R=client_q T=send_to_server_req_fail H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbF-0005vi-00"
  1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbB-0005vi-00 no IP address found for host server1.example.net
-1999-03-02 09:44:33 10HmbB-0005vi-00 => userr@test.ex R=client_r T=send_to_server_req_failname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbG-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 => userr@test.ex R=client_r T=send_to_server_req_failname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbG-0005vi-00"
  1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbC-0005vi-00 no IP address found for host noway.example.com
-1999-03-02 09:44:33 10HmbC-0005vi-00 => users@test.ex R=client_s T=send_to_server_req_passname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbH-0005vi-00"
+1999-03-02 09:44:33 10HmbC-0005vi-00 => users@test.ex R=client_s T=send_to_server_req_passname H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbH-0005vi-00"
  1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qf
  
@@ -39,9 +39,9 @@
  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 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex
  1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex for userq@test.ex
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbB-0005vi-00@myhost.test.ex for userr@test.ex
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbC-0005vi-00@myhost.test.ex for users@test.ex
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbB-0005vi-00@myhost.test.ex for userr@test.ex
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbC-0005vi-00@myhost.test.ex for users@test.ex
diff --git a/test/log/2113 b/test/log/2113

index 7a7444c7f83415d01b7ef45b4b49d3ae0c868494..ada668f63f91d876c7ace19d5abca863526b2804 100644 (file)
--- a/test/log/2113
+++ b/test/log/2113
@@ -2,31 +2,31 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery@test.ex
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz@test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qqf
  1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usera@test.ex
  1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userb@test.ex
  1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userc@test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
+1999-03-02 09:44:33 10HmbD-0005vi-00 => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
  1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbH-0005vi-00"
+1999-03-02 09:44:33 10HmbF-0005vi-00 => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
  1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbI-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
  1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qqf
  
  ******** 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 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx@test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery@test.ex
  1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery
@@ -38,9 +38,9 @@
  1999-03-02 09:44:33 End queue run: pid=pppp -qf
  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 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for usera@test.ex
-1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for userc@test.ex
-1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for userb@test.ex
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbD-0005vi-00@myhost.test.ex for usera@test.ex
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbF-0005vi-00@myhost.test.ex for userc@test.ex
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for userb@test.ex
  1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmbG-0005vi-00 => usera <usera@test.ex> R=server T=local_delivery
diff --git a/test/log/2114 b/test/log/2114

index f420044c776b3121152ff0ea275459ac1da6abef..28fc750140e6577eb8dbbbb65239b091f514a665 100644 (file)
--- a/test/log/2114
+++ b/test/log/2114
@@ -2,14 +2,14 @@
  ******** 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 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
-1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
+1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
  1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  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 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=certificate revoked cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=CRL signature failure cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
diff --git a/test/log/2117 b/test/log/2117

index 30476c6a76841f5bf1fbd82814131c77bb74cd9c..3684170970cc66bd39cdd69792c3a08a5667eb05 100644 (file)
--- a/test/log/2117
+++ b/test/log/2117
@@ -1,16 +1,16 @@
  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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qqf
  
  ******** 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 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/log/2118 b/test/log/2118

index d0333b60d34162b30adeb71d68bd000e36756744..7149f824f2b17304a21c8da0bcdb4ac8a71f5259 100644 (file)
--- a/test/log/2118
+++ b/test/log/2118
@@ -1,5 +1,5 @@
  
  ******** 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 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss
  1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt"
diff --git a/test/log/2119 b/test/log/2119

index 8d84b41708a312eae7d4be0a184ee4d73e8a0330..66b9b83730ae76ea07628f5345afbcb5eeeb894e 100644 (file)
--- a/test/log/2119
+++ b/test/log/2119
@@ -7,5 +7,5 @@
  
  ******** SERVER ********
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port 1225
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss
diff --git a/test/log/2120 b/test/log/2120

index 6d7b6f5cd2968514c82097247d9ddea2ad175978..7fffe77edb6b639672d3282afd9b1a10b721c39c 100644 (file)
--- a/test/log/2120
+++ b/test/log/2120
@@ -5,7 +5,7 @@
   Suggested action: either install a certificate or change tls_advertise_hosts option
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=Exim Developers/CN=thishost.test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=Exim Developers/CN=thishost.test.ex" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@thishost.test.ex R=abc T=t1 H=thishost.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=Exim Developers/CN=thishost.test.ex" 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 -qf
  
@@ -13,4 +13,4 @@
  1999-03-02 09:44:33 Warning: No server certificate defined; will use a selfsigned one.
   Suggested action: either install a certificate or change tls_advertise_hosts option
  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 10HmaY-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@thishost.test.ex H=localhost (thishost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@thishost.test.ex
diff --git a/test/log/2126 b/test/log/2126

index 357fe1fdb27522b1255b3ff8a8376771c40883c2..4de59e1ba33900b1967e07355ab52b84d41da9d2 100644 (file)
--- a/test/log/2126
+++ b/test/log/2126
@@ -1,7 +1,7 @@
  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 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@myhost.test.ex>: 451 Temporary local problem - please try later
  1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@myhost.test.ex R=r1 T=t1 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@myhost.test.ex R=r1 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@myhost.test.ex R=r1 T=t1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  
  ******** SERVER ********
@@ -10,6 +10,6 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@myhost.test.ex> R=r0 T=t2
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery <usery@myhost.test.ex> R=r0 T=t2
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/log/2127 b/test/log/2127

index 62dddd1e1fc15e1ffc3b41a9b57a03543c9d7225..e7057449b6ee8e9a756a30f4ec0ba2b23ed35041 100644 (file)
--- a/test/log/2127
+++ b/test/log/2127
@@ -1,7 +1,7 @@
  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 10HmaY-0005vi-00 <= CALLER@myhost.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 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session: (SSL_connect): error: <<detail omitted>>
  1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbA-0005vi-00"
@@ -10,7 +10,7 @@
  
  ******** 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 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  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 S=sss id=E10HmaY-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
diff --git a/test/log/2130 b/test/log/2130

index 7e7f20d3715ce68e9328a15b5db56ca819341488..d045e819831cc73cfb0030fe6244ca3e686af87a 100644 (file)
--- a/test/log/2130
+++ b/test/log/2130
@@ -1,10 +1,10 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 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 SNI <fred>
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no SNI="fred" S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no SNI="fred" S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=server
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/2131 b/test/log/2131

index d3cb35359f9205e8c403107a79a7e511f5c807ca..1f8144a244522533b08baf20d059d93b517f28e2 100644 (file)
--- a/test/log/2131
+++ b/test/log/2131
@@ -1,17 +1,17 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for abcd@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-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 SNI <fred>
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no SNI="fred" S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no SNI="fred" S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@test.ex
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=server
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 SNI <bill>
-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=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no SNI="bill" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for abcd@test.ex
+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=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no SNI="bill" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for abcd@test.ex
  1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <abcd@test.ex> R=server
  1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/log/2132 b/test/log/2132

index 6271979315f47a2d82bd3f665407eeeb9b5612d7..71f890472d0777bd03567c33e5556633d4ba014a 100644 (file)
--- a/test/log/2132
+++ b/test/log/2132
@@ -11,11 +11,11 @@
  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 Our cert SN: <CN=server2.example.com>
  1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss
  1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
  1999-03-02 09:44:33 Peer did not present a cert
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=[127.0.0.1] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss
  1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
  1999-03-02 09:44:33 SN  <CN=server1.example.com>
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" S=sss
diff --git a/test/log/2133 b/test/log/2133

index 3a1b8fbc3f119856ac4ccbe528b938b19284a1db..2341ff959deffabc67a35a175d536d050f1262ed 100644 (file)
--- a/test/log/2133
+++ b/test/log/2133
@@ -11,10 +11,10 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 TLS session: (SSL_connect): error: <<detail omitted>>
  1999-03-02 09:44:33 10HmaY-0005vi-00 => userr@test.ex R=client_r T=send_to_server_req_failname H=the.local.host.name [ip4.ip4.ip4.ip4] C="250 OK id=10HmbC-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => users@test.ex R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => users@test.ex R=client_s T=send_to_server_req_passname H=server1.example.com [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbD-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbA-0005vi-00 [ip4.ip4.ip4.ip4] SSL verify error: certificate name mismatch: DN="/CN=server1.example.com" H="the.local.host.name"
-1999-03-02 09:44:33 10HmbA-0005vi-00 => usert@test.ex R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
+1999-03-02 09:44:33 10HmbA-0005vi-00 => usert@test.ex R=client_t T=send_to_server_req_failcarryon H=the.local.host.name [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
  1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qf
  
@@ -24,5 +24,5 @@
  1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex 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 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbA-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmbA-0005vi-00@myhost.test.ex
diff --git a/test/log/2135 b/test/log/2135

index a96a4269654906be5a28d181131d8af04a7b24bf..bf1527f7a6f9b3ef9e417d2a9f412499953d75b2 100644 (file)
--- a/test/log/2135
+++ b/test/log/2135
@@ -1,5 +1,5 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-smtp S=sss for userb@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 Start queue run: pid=pppp
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userb@test.ex> R=target
@@ -8,4 +8,4 @@
  
  ******** 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 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= usera@ok.example H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userb@test.ex
diff --git a/test/log/2137 b/test/log/2137

index c7cc60d953a750d471570666e94444b3e892c23e..f922c6b8f06235bfe10ff05cad4bf3786a9acf6e 100644 (file)
--- a/test/log/2137
+++ b/test/log/2137
@@ -4,5 +4,5 @@
  
  ******** 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 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex>
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> temporarily rejected after DATA
+1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> temporarily rejected after DATA
diff --git a/test/log/2138 b/test/log/2138

index 9ab65d877484ff4257b458af4145e29a00f33e88..b8c977fc8d72df4233e26daa815a8be70ab7ec71 100644 (file)
--- a/test/log/2138
+++ b/test/log/2138
@@ -2,28 +2,28 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for usery0@test.ex usery1@test.ex
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for userz0@test.ex userz1@test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbC-0005vi-00"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbD-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => usery0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbE-0005vi-00"
-1999-03-02 09:44:33 10HmaY-0005vi-00 => usery1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbF-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => usery0@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbE-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => usery1@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbF-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qqf
  
  ******** 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 SMTP connection from [127.0.0.1]:1111 (TCP/IP connection count = 1)
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx0@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx0@test.ex
  1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1112 (TCP/IP connection count = 2)
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx1@test.ex
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz0@test.ex
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz1@test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for userx1@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz0@test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1111 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@myhost.test.ex for userz1@test.ex
  1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1111 closed by QUIT
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery0@test.ex
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery1@test.ex
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery0@test.ex
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1112 P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for usery1@test.ex
  1999-03-02 09:44:33 SMTP connection from localhost (myhost.test.ex) [127.0.0.1]:1112 closed by QUIT
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmbA-0005vi-00 => userx0 <userx0@test.ex> R=server T=local_delivery
diff --git a/test/log/2149 b/test/log/2149

index e2654abbf87945028d1de0c74d6401dfa0119ae5..d84d03fa122108ca7d7975a931f58e9a67c71b9b 100644 (file)
--- a/test/log/2149
+++ b/test/log/2149
@@ -1,12 +1,12 @@
  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 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no 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 -qf
  
  ******** 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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/2190 b/test/log/2190

index 5dba2bad9133a07b0ce18b95e0dcaf88e109418d..42b7df99641f93512e161ffc477658a493ec633a 100644 (file)
--- a/test/log/2190
+++ b/test/log/2190
@@ -1,5 +1,5 @@
  
  ******** 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 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no K S=sss for CALLER@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no K S=sss for CALLER@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no K S=sss for CALLER@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= someone@some.domain H=(rhu.barb) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no K S=sss for CALLER@test.ex
diff --git a/test/log/2191 b/test/log/2191

index 34468e2281852c75db2cf504dd88132523d0e325..aea10b5d020a76b53fab82eaf35dfd4525250bc8 100644 (file)
--- a/test/log/2191
+++ b/test/log/2191
@@ -1,9 +1,9 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= this-user@testhost.test.ex U=this-user P=local S=sss for other-user@test.ex
  1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="127.0.0.1"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => other-user@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no K C="250- 3nn byte chunk, total 3nn\\n250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  
  ******** SERVER ********
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1224
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for other-user@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no K S=sss id=E10HmaX-0005vi-00@testhost.test.ex for other-user@test.ex
diff --git a/test/log/3461 b/test/log/3461

index 6d043d50619aa881c82aa0a3f4f4503eec60bde7..0616a1ddd5cdf915c6da71e7017a76632f5a2e9e 100644 (file)
--- a/test/log/3461
+++ b/test/log/3461
@@ -1,16 +1,16 @@
  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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qqf
  
  ******** 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 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/log/3462 b/test/log/3462

index 6d043d50619aa881c82aa0a3f4f4503eec60bde7..0616a1ddd5cdf915c6da71e7017a76632f5a2e9e 100644 (file)
--- a/test/log/3462
+++ b/test/log/3462
@@ -1,16 +1,16 @@
  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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" A=plain C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qqf
  
  ******** 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 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no A=plain:userx S=sss id=E10HmaY-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=server T=local_delivery
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/log/3464 b/test/log/3464

index 93e2efc22f2fae4de34fb73c4468da68c32647b5..c61330dc8a3a089c48c523e0b341cd966ee3ee22 100644 (file)
--- a/test/log/3464
+++ b/test/log/3464
@@ -1,5 +1,5 @@
  
  ******** 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 no MAIL in SMTP connection from [127.0.0.1] D=qqs X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C=EHLO,STARTTLS,AUTH
-1999-03-02 09:44:33 no MAIL in SMTP connection from (foobar) [127.0.0.1] D=qqs A=plain:userx X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C=EHLO,STARTTLS,EHLO,AUTH,QUIT
+1999-03-02 09:44:33 no MAIL in SMTP connection from [127.0.0.1] D=qqs X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C=EHLO,STARTTLS,AUTH
+1999-03-02 09:44:33 no MAIL in SMTP connection from (foobar) [127.0.0.1] D=qqs A=plain:userx X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C=EHLO,STARTTLS,EHLO,AUTH,QUIT
diff --git a/test/log/3465 b/test/log/3465

index 8cfea80c089c7cddc33ca62d945b82f568ae92ee..35ac7649081e6623fde02d814548bfe86b9f0bee 100644 (file)
--- a/test/log/3465
+++ b/test/log/3465
@@ -1,6 +1,6 @@
  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 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no A=plain C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userz@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no A=plain 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 -qf
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
@@ -10,5 +10,5 @@
  
  ******** 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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpsa X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no A=plain:userx S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtpa A=login:usery S=sss id=E10HmaX-0005vi-00@myhost.test.ex
diff --git a/test/log/4221 b/test/log/4221

index 0fd49c7ffb989ad66fa5b771263d9a9fe6f6a05b..808eda60d96aca573a81ebda8ebf3292901ebd8c 100644 (file)
--- a/test/log/4221
+++ b/test/log/4221
@@ -1,12 +1,12 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com U=CALLER P=utf8local-esmtp S=sss for usery@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@test.ex F=<他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  
  ******** SERVER ********
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
  1999-03-02 09:44:33 10HmbA-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for usery@test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=localuser
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/log/4223 b/test/log/4223

index e3b95208979feade66260433b4de82211cbd40fe..31a7734fb9d62229b025fa3427c2dc028493ffa4 100644 (file)
--- a/test/log/4223
+++ b/test/log/4223
@@ -1,6 +1,6 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local U=CALLER P=utf8local-esmtp S=sss for userz@test.ex
  1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: utf8 support required but not offered for forwarding
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** userz@test.ex F=<यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no: utf8 support required but not offered for forwarding
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userz@test.ex F=<यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no: utf8 support required but not offered for forwarding
  1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
  1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/4224 b/test/log/4224

index 9a4393d0f390df86a5b0656bcc4d6da6aca7ca54..7de4ba27b48bed9f86d1ebd65d99afe8a4864266 100644 (file)
--- a/test/log/4224
+++ b/test/log/4224
@@ -1,17 +1,17 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userQ@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex <userQ@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => userq@test.ex <userQ@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com U=CALLER P=utf8local-esmtp S=sss for userR@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => userr@test.ex <userR@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => userr@test.ex <userR@test.ex> F=<세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  1999-03-02 09:44:33 U=CALLER F=<CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> rejected RCPT <userS@test.ex>: 127.0.0.1 [127.0.0.1] : response to "EHLO" did not include SMTPUTF8
  1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: 127.0.0.1 [127.0.0.1] : response to "EHLO" did not include SMTPUTF8
  
  ******** 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 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for userQ@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= 세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for userR@test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userQ@test.ex> R=localuser
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/4225 b/test/log/4225

index 4215c5861e96463402053ad5e2d73f4b04cf3c98..e19ca8ee9ded4928e43f1b1dbce01c676fa37ee7 100644 (file)
--- a/test/log/4225
+++ b/test/log/4225
@@ -1,10 +1,10 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= userU@test.ex U=CALLER P=utf8local-esmtp S=sss for user.γλυκύρριζα@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => user.γλυκύρριζα@test.ex F=<userU@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => user.γλυκύρριζα@test.ex F=<userU@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  
  ******** SERVER ********
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userU@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.γλυκύρριζα@test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.γλυκύρριζα@test.ex> R=localuser
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/4226 b/test/log/4226

index d8f5c21382e89ca02aaab2d65db243d14b00612d..05b72553c5d832a8f21e354c8c7d1317fbd61660 100644 (file)
--- a/test/log/4226
+++ b/test/log/4226
@@ -1,8 +1,8 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= userV.වැල්_මී@test.ex U=CALLER P=utf8local-esmtp S=sss for user.அதிமதுரம்@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => user.அதிமதுரம்@test.ex F=<userV.වැල්_මී@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => user.அதிமதுரம்@test.ex F=<userV.වැල්_මී@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userW@test.ex U=CALLER P=utf8local-esmtp S=sss for user.ഇരട്ടിമധുരം@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => user.ഇരട്ടിമധുരം@test.ex F=<userW@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => user.ഇരട്ടിമധുരം@test.ex F=<userW@test.ex> R=rmt T=rmt_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  1999-03-02 09:44:33 U=CALLER sender verify fail for <userA@test.ex>: 127.0.0.1 [127.0.0.1] : response to "EHLO" did not include SMTPUTF8
  1999-03-02 09:44:33 U=CALLER F=<userA@test.ex> rejected RCPT <user.यष्टिमधु@test.ex>: Sender verify failed
@@ -11,9 +11,9 @@
  
  ******** 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 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userV.වැල්_මී@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@the.local.host.name for user.அதிமதுரம்@test.ex
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userW@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=utf8esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@the.local.host.name for user.ഇരട്ടിമധുരം@test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qqff
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <user.அதிமதுரம்@test.ex> R=localuser
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
diff --git a/test/log/5410 b/test/log/5410

index 8cf2cdccb50255fa9ebc61256069f4a692a4d57b..56a86b1fe5f617bdb5e5a9c129e8f854293b2827 100644 (file)
--- a/test/log/5410
+++ b/test/log/5410
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00"
@@ -10,7 +10,7 @@
  
  ******** 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 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: queued by ACL
  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 S=sss id=E10HmaZ-0005vi-00@myhost.test.ex
  1999-03-02 09:44:33 10HmbA-0005vi-00 no immediate delivery: queued by ACL
diff --git a/test/log/5601 b/test/log/5601

index 0a5ff40033b2f27874bd592df7d1683b88e92c2e..c40ac6546277af21ab6d10db44f528dc4202531b 100644 (file)
--- a/test/log/5601
+++ b/test/log/5601
@@ -1,11 +1,11 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for norequire@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for nostaple@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for CALLER@test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
  1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for CALLER@test.ex
  1999-03-02 09:44:33 10HmbD-0005vi-00 Received TLS status callback, null content
@@ -20,16 +20,16 @@
  ******** 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 10HmaY-0005vi-00 client claims: ocsp status 1 (notresp)
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com for norequire@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com for norequire@test.ex
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  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 client claims: ocsp status 0 (notreq)
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com for nostaple@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com for nostaple@test.ex
  1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <nostaple@test.ex> R=server
  1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbC-0005vi-00 client claims: ocsp status 4 (verified)
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com for CALLER@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com for CALLER@test.ex
  1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@test.ex> R=server
  1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
diff --git a/test/log/5611 b/test/log/5611

index 302ee7460f43b5b5f120444303658367ba905de8..435229407de6fbbc580cdeae7e38f566dedee451 100644 (file)
--- a/test/log/5611
+++ b/test/log/5611
@@ -1,11 +1,11 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER@test.ex R=client T=send_to_server3 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
  1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss
  1999-03-02 09:44:33 10HmbD-0005vi-00 Received TLS status callback, null content
@@ -20,16 +20,16 @@
  ******** 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 10HmaY-0005vi-00 client claims: ocsp status 1 (notresp)
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire@test.ex> R=server
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  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 client claims: ocsp status 0 (notreq)
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com
  1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <nostaple@test.ex> R=server
  1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbC-0005vi-00 client claims: ocsp status 4 (verified)
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com
  1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <CALLER@test.ex> R=server
  1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
diff --git a/test/log/5720 b/test/log/5720

index d0b4f6c902b5568cf6ac25d9a8b62b2d18d0cd7a..796104207e2f1ce64c45eceb247ee72367666a4a 100644 (file)
--- a/test/log/5720
+++ b/test/log/5720
@@ -26,7 +26,7 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 tls:cert depth=2 <CN=clica CA rsa,O=example.com>
  1999-03-02 09:44:33 10HmaY-0005vi-00 tls:cert depth=1 <CN=clica Signing Cert rsa,O=example.com>
  1999-03-02 09:44:33 10HmaY-0005vi-00 tls:cert depth=0 <CN=server1.example.com>
-1999-03-02 09:44:33 10HmaY-0005vi-00 => good@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => good@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 msg:delivery good
  1999-03-02 09:44:33 10HmaY-0005vi-00 Our cert SN: CN=server2.example.com
  1999-03-02 09:44:33 10HmaY-0005vi-00 Peer cert:
@@ -52,4 +52,4 @@
  1999-03-02 09:44:33 [127.0.0.1] depth=2 CN=clica CA rsa,O=example.com
  1999-03-02 09:44:33 [127.0.0.1] depth=1 CN=clica Signing Cert rsa,O=example.com
  1999-03-02 09:44:33 [127.0.0.1] depth=0 CN=server2.example.com
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server2.example.com" S=sss id=E10HmaY-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server2.example.com" S=sss id=E10HmaY-0005vi-00@myhost.test.ex
diff --git a/test/log/5740 b/test/log/5740

index 0b853410ae3f95dd1571756b55e9069538eb0465..df6dfe858dea66ee9be05805e9a75c38dea8931e 100644 (file)
--- a/test/log/5740
+++ b/test/log/5740
@@ -1,17 +1,17 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for norequire_1@test.ex
-1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire_1@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => norequire_1@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmaY-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 client ocsp status: 1 (notresp)
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for norequire_2@test.ex
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => norequire_2@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => norequire_2@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaZ-0005vi-00 client ocsp status: 4 (verified)
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for nostaple@test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
+1999-03-02 09:44:33 10HmbB-0005vi-00 => nostaple@test.ex R=client T=send_to_server1 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbC-0005vi-00"
  1999-03-02 09:44:33 10HmbB-0005vi-00 client ocsp status: 0 (notreq)
  1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for good@test.ex
-1999-03-02 09:44:33 10HmbD-0005vi-00 => good@test.ex R=client T=send_to_server3 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
+1999-03-02 09:44:33 10HmbD-0005vi-00 => good@test.ex R=client T=send_to_server3 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbE-0005vi-00"
  1999-03-02 09:44:33 10HmbD-0005vi-00 client ocsp status: 4 (verified)
  1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@server1.example.com U=CALLER P=local S=sss for failrequire@test.ex
@@ -30,20 +30,20 @@
  ******** 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 10HmaY-0005vi-00 client claims: ocsp status 1
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com for norequire_1@test.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@server1.example.com for norequire_1@test.ex
  1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <norequire_1@test.ex> R=server
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  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 client claims: ocsp status 4
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com for norequire_2@test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaZ-0005vi-00@server1.example.com for norequire_2@test.ex
  1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <norequire_2@test.ex> R=server
  1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbC-0005vi-00 client claims: ocsp status 0
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com for nostaple@test.ex
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@server1.example.com H=the.local.host.name (server1.example.com) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbB-0005vi-00@server1.example.com for nostaple@test.ex
  1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <nostaple@test.ex> R=server
  1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbE-0005vi-00 client claims: ocsp status 4
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbD-0005vi-00@server1.example.com for good@test.ex
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@server1.example.com H=(helo.data.changed) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbD-0005vi-00@server1.example.com for good@test.ex
  1999-03-02 09:44:33 10HmbE-0005vi-00 => :blackhole: <good@test.ex> R=server
  1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
  1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
diff --git a/test/log/5840 b/test/log/5840

index 6925ad0b96f5b0db7f7f7451ba54bbedf078df5c..98f18bd86f9cd6e654a406353151244a0eb3eaf1 100644 (file)
--- a/test/log/5840
+++ b/test/log/5840
@@ -1,9 +1,9 @@
  1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@dane256ee.test.ex
  1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane512ee.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane256ta.test.ex
@@ -17,14 +17,14 @@
  1999-03-02 09:44:33 10HmbB-0005vi-00 == CALLER@mxdane256ta.test.ex R=client T=send_to_server defer (-37) H=dane256ta.test.ex [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>>
  1999-03-02 09:44:33 10HmbC-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmbC-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="thishost.test.ex"
-1999-03-02 09:44:33 10HmbC-0005vi-00 => CALLER@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbD-0005vi-00"
+1999-03-02 09:44:33 10HmbC-0005vi-00 => CALLER@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbD-0005vi-00"
  1999-03-02 09:44:33 10HmbC-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@myhost.test.ex U=CALLER P=local S=sss for CALLER@thishost.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmbB-0005vi-00 DANE attempt failed; TLS connection to dane256ta.test.ex [ip4.ip4.ip4.ip4]: (SSL_connect): error:14090086:SSL routines:ssl3_get_server_certificate:certificate verify failed
  1999-03-02 09:44:33 10HmbB-0005vi-00 == CALLER@mxdane256ta.test.ex R=client T=send_to_server defer (-37) H=dane256ta.test.ex [ip4.ip4.ip4.ip4]: TLS session: (SSL_connect): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbE-0005vi-00 => CALLER@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=yes DN="/CN=server1.example.com" C="250 OK id=10HmbF-0005vi-00"
+1999-03-02 09:44:33 10HmbE-0005vi-00 => CALLER@thishost.test.ex R=client T=send_to_server H=thishost.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=yes DN="/CN=server1.example.com" 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 -qf
  1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdanelazy.test.ex
@@ -44,7 +44,7 @@
  1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbI-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmbI-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="dane.no.2.test.ex"
-1999-03-02 09:44:33 10HmbI-0005vi-00 => CALLER@dane.no.2.test.ex R=client T=send_to_server H=dane.no.2.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
+1999-03-02 09:44:33 10HmbI-0005vi-00 => CALLER@dane.no.2.test.ex R=client T=send_to_server H=dane.no.2.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbM-0005vi-00"
  1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbJ-0005vi-00 H=danebroken1.test.ex [127.0.0.1]: DANE error: tlsa lookup DEFER
  1999-03-02 09:44:33 10HmbJ-0005vi-00 == CALLER@danebroken1.test.ex R=client T=send_to_server defer (-36): DANE error: tlsa lookup DEFER
@@ -53,35 +53,35 @@
  1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
  1999-03-02 09:44:33 10HmbL-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  1999-03-02 09:44:33 10HmbL-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" H="dane.no.4.test.ex"
-1999-03-02 09:44:33 10HmbL-0005vi-00 => CALLER@dane.no.4.test.ex R=client T=send_to_server H=dane.no.4.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
+1999-03-02 09:44:33 10HmbL-0005vi-00 => CALLER@dane.no.4.test.ex R=client T=send_to_server H=dane.no.4.test.ex [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbN-0005vi-00"
  1999-03-02 09:44:33 10HmbL-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
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <CALLER@dane256ee.test.ex> R=server
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for CALLER@mxdane512ee.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for CALLER@mxdane512ee.test.ex
  1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: <CALLER@mxdane512ee.test.ex> R=server
  1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  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 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
  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 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbC-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbC-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex
  1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <CALLER@thishost.test.ex> R=server
  1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
  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 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbE-0005vi-00@myhost.test.ex for CALLER@thishost.test.ex
  1999-03-02 09:44:33 10HmbF-0005vi-00 => :blackhole: <CALLER@thishost.test.ex> R=server
  1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
  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 TLS error on connection from the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
-1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbI-0005vi-00@myhost.test.ex for CALLER@dane.no.2.test.ex
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbI-0005vi-00@myhost.test.ex for CALLER@dane.no.2.test.ex
  1999-03-02 09:44:33 10HmbM-0005vi-00 => :blackhole: <CALLER@dane.no.2.test.ex> R=server
  1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex for CALLER@dane.no.4.test.ex
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex for CALLER@dane.no.4.test.ex
  1999-03-02 09:44:33 10HmbN-0005vi-00 => :blackhole: <CALLER@dane.no.4.test.ex> R=server
  1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
diff --git a/test/log/5860 b/test/log/5860

index 8a18da9ae0c4cba33a3f24e3fc4387fcadf236fb..79fbe0406e81a9d963761a3dbba289a0e9dc9f40 100644 (file)
--- a/test/log/5860
+++ b/test/log/5860
@@ -2,11 +2,11 @@
  1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for CALLER@mxdane512ee.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaX-0005vi-00 tls:cert depth = 0 <CN=Phil Pennock,OU=Test Suite,O=The Exim Maintainers,C=UK>
-1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => CALLER@dane256ee.test.ex R=client T=send_to_server H=dane256ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
  1999-03-02 09:44:33 10HmaX-0005vi-00 msg:delivery dane=yes
  1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
  1999-03-02 09:44:33 10HmaY-0005vi-00 tls:cert depth = 0 <CN=Phil Pennock,OU=Test Suite,O=The Exim Maintainers,C=UK>
-1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=dane DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  1999-03-02 09:44:33 10HmaY-0005vi-00 msg:delivery dane=yes
  1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  1999-03-02 09:44:33 End queue run: pid=pppp -qf
@@ -23,8 +23,8 @@
  
  ******** 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 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex
-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=esmtps X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for CALLER@mxdane512ee.test.ex
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaX-0005vi-00@myhost.test.ex for CALLER@dane256ee.test.ex
+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=esmtps X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no S=sss id=E10HmaY-0005vi-00@myhost.test.ex for CALLER@mxdane512ee.test.ex
  1999-03-02 09:44:33 Start queue run: pid=pppp -qf
  1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <CALLER@dane256ee.test.ex> R=server
  1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER

index dde10d5fd1ada5dc8c0f09beea71c121b6c96f25..cf3fc103ff520c23be723407f6a92eb40ccbeb8b 100644 (file)
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,48 +1,48 @@
  From CALLER@test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@test.ex>)
         id 10HmaX-0005vi-00
         for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
  tls-certificate-verified: 0
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  This is a test encrypted message.
  
  From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <"name with spaces"@test.ex>)
         id 10HmaY-0005vi-00
         for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
  tls-certificate-verified: 0
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  This is a test encrypted message.
  
  From CALLER@test.ex Tue Mar 02 09:44:33 1999
  Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@test.ex>)
         id 10HmaZ-0005vi-00
         for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
  tls-certificate-verified: 1
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=/CN=server2.example.com
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=/CN=server2.example.com
  
  This is a test encrypted message from a verified host.
  
  From CALLER@test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLSv1:ke-ECDSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-ECDSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@test.ex>)
         id 10HmbA-0005vi-00
         for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
  tls-certificate-verified: 0
-TLS: cipher=TLSv1:ke-ECDSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-ECDSA-AES256-SHA:xxx peerdn=
  
  This is a test encrypted message.
  It should be sent under the EC server cert and with an ECDSA cipher.
diff --git a/test/mail/2103.userx b/test/mail/2103.userx

index 63cc79e9132ad25ad6bfa4da2faaeb6a7a1a2720..4a195cb3d11906c2d3972b2193a7682e573de48d 100644 (file)
--- a/test/mail/2103.userx
+++ b/test/mail/2103.userx
@@ -1,11 +1,11 @@
  From userx@test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1] (helo=rhu.barb)
-       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <userx@test.ex>)
         id 10HmaX-0005vi-00
         for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  This is a test encrypted message.
  
diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER

index 2a8ef65d0b5f6e8abae4de213df04e9e90500b54..c7ede61277b0793c024fad802d03e78fadaa68a9 100644 (file)
--- a/test/mail/2108.CALLER
+++ b/test/mail/2108.CALLER
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1] (helo=helo.data.changed)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message. Contains FF: ÿ
  
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1] (helo=helo.data.changed)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
@@ -28,7 +28,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message to two different hosts
  
diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd

index 659e192ba27e21d449769048a428692c252bdf83..174bf2f12436c7749e91fc944b1a626e2915a9e4 100644 (file)
--- a/test/mail/2108.abcd
+++ b/test/mail/2108.abcd
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbB-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message to two different hosts
  
diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz

index 27f6b15024e8c5a13629b217e6127a827eacddc6..7d20822728205ef02e44dbabadaf5a23b6f84309 100644 (file)
--- a/test/mail/2108.xyz
+++ b/test/mail/2108.xyz
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1] (helo=helo.data.changed)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
@@ -10,7 +10,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message to two different hosts
  
diff --git a/test/mail/2113.usera b/test/mail/2113.usera

index 3ac0f6eb9b580b1ced2ce1e442649993db000f16..99cf1e7ae3409441f50586037fb7650002d1cbf1 100644 (file)
--- a/test/mail/2113.usera
+++ b/test/mail/2113.usera
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbG-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 1
  
diff --git a/test/mail/2113.userb b/test/mail/2113.userb

index 4fae7807116589709c2e3f3b8798b655370dbaa1..8dec46dadd165c14e7abb2ed94ac27f6a547df21 100644 (file)
--- a/test/mail/2113.userb
+++ b/test/mail/2113.userb
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbI-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 2
  
diff --git a/test/mail/2113.userc b/test/mail/2113.userc

index 3f8bc1dc1c3ac6ac6690069918cb0858268a9918..33b93919e4de3c91810024fc2202ea57603430ba 100644 (file)
--- a/test/mail/2113.userc
+++ b/test/mail/2113.userc
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbH-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 3
  
diff --git a/test/mail/2113.userx b/test/mail/2113.userx

index 60810ec072aeab1ad923e693f77223a9899e78f0..d9d76947dbacc05bf1858564a67f70a395cc5436 100644 (file)
--- a/test/mail/2113.userx
+++ b/test/mail/2113.userx
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbA-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 1
  
diff --git a/test/mail/2113.usery b/test/mail/2113.usery

index 0f9a46248bf504afb36d81e798d60cc99955f5d9..451c49956daca176eb581950b4498825d5f26cb4 100644 (file)
--- a/test/mail/2113.usery
+++ b/test/mail/2113.usery
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbC-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 2
  
diff --git a/test/mail/2113.userz b/test/mail/2113.userz

index 32889da6502acdb1b6caf9a862c2544f3fe967a8..1db17b1d319a63dab8cbf46511390e43f5d33610 100644 (file)
--- a/test/mail/2113.userz
+++ b/test/mail/2113.userz
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbB-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 3
  
diff --git a/test/mail/2117.userx b/test/mail/2117.userx

index 329be639b4030c9dd911ef1f31fa2e89f076ef43..e0db1544e597fd8f8a53d94f89b65f329c106305 100644 (file)
--- a/test/mail/2117.userx
+++ b/test/mail/2117.userx
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 1
  
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 2
  
diff --git a/test/mail/2119.userx b/test/mail/2119.userx

index 6aa5d974896f4485ea469111b750d3ad229aad07..a336ee1e23dd53c8419f8b4d1eae0396b4623f88 100644 (file)
--- a/test/mail/2119.userx
+++ b/test/mail/2119.userx
@@ -1,22 +1,22 @@
  From userx@test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1] (helo=rhu.barb)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <userx@test.ex>)
         id 10HmaX-0005vi-00
         for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  This is a test encrypted message.
  
  From userx@test.ex Tue Mar 02 09:44:33 1999
  Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtp (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtp (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <userx@test.ex>)
         id 10HmaY-0005vi-00
         for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
  
  This is a test encrypted message from a verified host.
  
diff --git a/test/mail/2127.userx b/test/mail/2127.userx

index 3edda5271746dd29c947b398a35df1719e4ffddf..ad75397b079155767d2c889df34daeaf4c5bc17f 100644 (file)
--- a/test/mail/2127.userx
+++ b/test/mail/2127.userx
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmaZ-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message
  
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER

index a1d0808558813815983bba0d43cc897374179981..eb9eedeb42e38c36f3fe1d7dad260c96b95b235c 100644 (file)
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,36 +1,36 @@
  From CALLER@test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@test.ex>)
         id 10HmaX-0005vi-00
         for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
  tls-certificate-verified: 0
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  This is a test encrypted message.
  
  From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
  Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <"name with spaces"@test.ex>)
         id 10HmaY-0005vi-00
         for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
  tls-certificate-verified: 0
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  This is a test encrypted message.
  
  From CALLER@test.ex Tue Mar 02 09:44:33 1999
  Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@test.ex>)
         id 10HmaZ-0005vi-00
         for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
  tls-certificate-verified: 1
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=/CN=server1.example.com
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=/CN=server1.example.com
  
  This is a test encrypted message from a verified host.
  
diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0

index 1958a178138e3a4740c39da608349a49b989b825..0182b22074bd5be88d0a9bbc728ea6891a67e874 100644 (file)
--- a/test/mail/2138.userx0
+++ b/test/mail/2138.userx0
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbA-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 1
  
diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1

index ead4a92afb6cbfacf4331e4cd40fc10aaf8854c4..7edb740a2deac0d7095185f8a1d95c0d78716cfa 100644 (file)
--- a/test/mail/2138.userx1
+++ b/test/mail/2138.userx1
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbB-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 1
  
diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0

index 39b2cf9f95c8bef9223d541c84166075ef5307aa..9add7407ea96e4889f7fea42359504a17500632b 100644 (file)
--- a/test/mail/2138.usery0
+++ b/test/mail/2138.usery0
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbE-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 2
  
diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1

index f9c35c18a6cf3af077f5827d00469e20bd8805bb..aa90dc62683e6cbc40213db9d69bcc65e9edb0f0 100644 (file)
--- a/test/mail/2138.usery1
+++ b/test/mail/2138.usery1
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbF-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 2
  
diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0

index e59087c6492501bed8984c53ec5b7dfd0b4eebf9..b8831947d1f7323751a6c5c9193c0eca2d8a2003 100644 (file)
--- a/test/mail/2138.userz0
+++ b/test/mail/2138.userz0
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbC-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 3
  
diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1

index 0bab36453e8c7efbf07121e74ff0f0efb39ec30c..66df6b9416dc8e17e4fc236f41c4c4444f469c34 100644 (file)
--- a/test/mail/2138.userz1
+++ b/test/mail/2138.userz1
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbD-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 3
  
diff --git a/test/mail/2149.userx b/test/mail/2149.userx

index 1e7209c08fa087880216c09189f07287a831fc84..c785585c5d2006b3fb86b97c9e204adb90e6872b 100644 (file)
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmaY-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message
  
diff --git a/test/mail/3461.userx b/test/mail/3461.userx

index a2e7998d636b3d9e849f91f47ce5c8123060794d..3e6b082c29305b9f14c8f9d929c2c4b11b1ff93e 100644 (file)
--- a/test/mail/3461.userx
+++ b/test/mail/3461.userx
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 1
  
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 2
  
diff --git a/test/mail/3462.userx b/test/mail/3462.userx

index a2e7998d636b3d9e849f91f47ce5c8123060794d..3e6b082c29305b9f14c8f9d929c2c4b11b1ff93e 100644 (file)
--- a/test/mail/3462.userx
+++ b/test/mail/3462.userx
@@ -1,6 +1,6 @@
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 1
  
  From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
  Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         (envelope-from <CALLER@myhost.test.ex>)
         id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
  From: CALLER_NAME <CALLER@myhost.test.ex>
  Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
  
  Test message 2
  
diff --git a/test/rejectlog/2103 b/test/rejectlog/2103

index 68217d1f90f065ae648c2f0a425f7ba236e1a97c..4e4f93507fdba5bfa1698c50acff2917fa3b54e6 100644 (file)
--- a/test/rejectlog/2103
+++ b/test/rejectlog/2103
@@ -1,3 +1,3 @@
  
  ******** SERVER ********
-1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLSv1:ke-RSA-AES256-SHAxxx:256
+1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLSv1:ke-RSA-AES256-SHA:xxx
diff --git a/test/rejectlog/2114 b/test/rejectlog/2114

index 75e1c5279abbe025eeabd8bacb5ff6d3575bbacf..80a140ec2364443429aaf850dcd591a7c68a5ea9 100644 (file)
--- a/test/rejectlog/2114
+++ b/test/rejectlog/2114
@@ -1,5 +1,5 @@
  
  ******** SERVER ********
-1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
+1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+1999-03-02 09:44:33 H=[127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
diff --git a/test/rejectlog/2137 b/test/rejectlog/2137

index c451ccaae7d68d361a6b37c251027aeb33432a05..3d457a03c20800fdde48eb7cd59ea7dd3baaca9c 100644 (file)
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -1,12 +1,12 @@
  1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <rcpt_defer@test.ex>: Could not complete recipient verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<rcpt_defer@test.ex>: 451 Temporary local problem - please try later
  
  ******** SERVER ********
-1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex>
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> temporarily rejected after DATA
+1999-03-02 09:44:33 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> temporarily rejected RCPT <rcpt_defer@test.ex>
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=localhost (myhost.test.ex) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> temporarily rejected after DATA
  Envelope-from: <>
  Envelope-to: <data_defer@test.ex>
  P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+       by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
         (Exim x.yz)
         id 10HmaX-0005vi-00
         for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/4224 b/test/rejectlog/4224

index 5f4134d70bb93615cab761ee7a464809bd52b937..404016810fecea2400bd3f98e66a18fbaaec0baa 100644 (file)
--- a/test/rejectlog/4224
+++ b/test/rejectlog/4224
@@ -2,4 +2,4 @@
  1999-03-02 09:44:33 U=CALLER F=<CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> rejected RCPT <userT@test.ex>: 127.0.0.1 [127.0.0.1] : response to "EHLO" did not include SMTPUTF8
  
  ******** SERVER ********
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
diff --git a/test/rejectlog/4226 b/test/rejectlog/4226

index f0fb59315da97a953e76b6eb95c24849e87f876c..6b584a3ce6445cd9b14f294d7c9bdafbd0d6c22f 100644 (file)
--- a/test/rejectlog/4226
+++ b/test/rejectlog/4226
@@ -4,4 +4,4 @@
  1999-03-02 09:44:33 U=CALLER F=<userB.જેઠીમધ@test.ex> rejected RCPT <user.ქართული@test.ex>: Sender verify failed
  
  ******** SERVER ********
-1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
+1999-03-02 09:44:33 H=localhost (the.local.host.name) [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no F=<> rejected RCPT <the.local.host.name-dddddddd-testing@test.ex>: relay not permitted
diff --git a/test/runtest b/test/runtest

index e4195b64a06ffb676bd8c4e84df4b65850bbd283..5640a5f58fea0fcaacbbc5bd9eaaf10864f732bf 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -549,12 +549,12 @@ RESET_AFTER_EXTRA_LINE_READ:
    # Retain the authentication algorith field as we want to test that.
  
    s/( (?: (?:\b|\s) [\(=] ) | \s )TLSv1\.[12]:/$1TLSv1:/xg;
-  s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA)(?-:)/ke-$3-AES256-SHAxxx/g;
-  s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA):(128|256)/ke-$3-AES256-SHAxxx/g;
+  s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA)(?!:)/ke-$3-AES256-SHA/g;
+  s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA):(128|256)/ke-$3-AES256-SHA:xxx/g;
  
    # LibreSSL
    # TLSv1:ECDHE-RSA-CHACHA20-POLY1305:256
-  s/((EC)?DHE-)?(RSA|ECDSA)-CHACHA20-POLY1305\b/ke-$3-AES256-SHAxxx/g;
+  s/((EC)?DHE-)?(RSA|ECDSA)-CHACHA20-POLY1305\b/ke-$3-AES256-SHA:xxx/g;
  
    # GnuTLS have seen:
    #   TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256
diff --git a/test/stderr/2108 b/test/stderr/2108

index 11c88b0fae59db2d4dd6b5aa087dd4fa7f43abba..9821815b0128a9f97eff77c635acb3b43ec12f24 100644 (file)
--- a/test/stderr/2108
+++ b/test/stderr/2108
@@ -33,7 +33,7 @@ LOG: MAIN
    SMTP>> QUIT
    SMTP(close)>>
  LOG: MAIN
-  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
+  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
  LOG: MAIN
    Completed
  delivering 10HmaY-0005vi-00 (queue run pid ppppp)
@@ -71,9 +71,9 @@ LOG: MAIN
    SMTP>> QUIT
    SMTP(close)>>
  LOG: MAIN
-  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  LOG: MAIN
-  -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+  -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
    SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
    SMTP>> EHLO myhost.test.ex
@@ -106,7 +106,7 @@ LOG: MAIN
    SMTP>> QUIT
    SMTP(close)>>
  LOG: MAIN
-  => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
+  => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
  LOG: MAIN
    Completed
  LOG: queue_run MAIN
diff --git a/test/stderr/2113 b/test/stderr/2113

index f5c1e34b52ae6e25cce385bd5fb6747f1de95a2d..026cd28b633bcbf976b6fe45b75f752232c2f600 100644 (file)
--- a/test/stderr/2113
+++ b/test/stderr/2113
@@ -32,7 +32,7 @@ cmd buf flush ddd bytes
    SMTP<< 354 Enter message, ending with "." on a line by itself
    SMTP<< 250 OK id=10HmbA-0005vi-00
  LOG: MAIN
-  => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
+  => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
  LOG: MAIN
    Completed
  Exim version x.yz ....
@@ -49,7 +49,7 @@ cmd buf flush ddd bytes
    SMTP<< 250 OK id=10HmbB-0005vi-00
    SMTP(close)>>
  LOG: MAIN
-  => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbB-0005vi-00"
+  => userz@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbB-0005vi-00"
  LOG: MAIN
    Completed
  >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -69,7 +69,7 @@ cmd buf flush ddd bytes
  cmd buf flush ddd bytes
    SMTP(close)>>
  LOG: MAIN
-  => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbC-0005vi-00"
+  => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbC-0005vi-00"
  LOG: MAIN
    Completed
  >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -111,7 +111,7 @@ cmd buf flush ddd bytes
    SMTP<< 354 Enter message, ending with "." on a line by itself
    SMTP<< 250 OK id=10HmbG-0005vi-00
  LOG: MAIN
-  => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
+  => usera@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbG-0005vi-00"
  LOG: MAIN
    Completed
  Exim version x.yz ....
@@ -128,7 +128,7 @@ cmd buf flush ddd bytes
    SMTP<< 250 OK id=10HmbH-0005vi-00
    SMTP(close)>>
  LOG: MAIN
-  => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbH-0005vi-00"
+  => userc@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbH-0005vi-00"
  LOG: MAIN
    Completed
  >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -148,7 +148,7 @@ cmd buf flush ddd bytes
  cmd buf flush ddd bytes
    SMTP(close)>>
  LOG: MAIN
-  => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmbI-0005vi-00"
+  => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmbI-0005vi-00"
  LOG: MAIN
    Completed
  >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/2135 b/test/stderr/2135

index 1bba4fa031034cc9bd119f4a10da8d020af2be5d..c99402f52f124568dcbbdf424cef1a2a6ff3a9e6 100644 (file)
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -67,7 +67,7 @@ cmd buf flush ddd bytes
    SMTP(close)>>
  Leaving t1 transport
  LOG: MAIN
-  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+  => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:1225 X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
  LOG: MAIN
    Completed
  >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5410 b/test/stderr/5410

index 9466d6c6b0bf31144b1c682336f87e57caea0ca3..946c48a2a9a1977bd8f8b4b9521e4ed85c80c4b7 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -233,7 +233,7 @@ end of inline ACL: ACCEPT
    SMTP>> .
    SMTP<< 250 OK id=10HmaY-0005vi-00
  LOG: MAIN
-  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHAxxx:256 CV=no C="250 OK id=10HmaY-0005vi-00"
+  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:ke-RSA-AES256-SHA:xxx CV=no C="250 OK id=10HmaY-0005vi-00"
    SMTP>> QUIT
    SMTP<< 221 myhost.test.ex closing connection
    SMTP(close)>>
diff --git a/test/stdout/2102 b/test/stdout/2102

index 3664c7302436b51aa365c4e82b4fd149d76ee1b7..ea69fc186396fa7463d1029f5cb75becb47c706e 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<CALLER@test.ex>
  ??? 250
@@ -57,7 +57,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<"name with spaces"@test.ex>
  ??? 250
@@ -125,7 +125,7 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<CALLER@test.ex>
  ??? 250
@@ -164,7 +164,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-ECDSA-AES256-SHAxxx
+SSL connection using ke-ECDSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<CALLER@test.ex>
  ??? 250
diff --git a/test/stdout/2103 b/test/stdout/2103

index 6582afa7b3f007d44a989b2baa23f8f27aa33aa3..814a157367ce42b87327e283a40d3eed79794ff6 100644 (file)
--- a/test/stdout/2103
+++ b/test/stdout/2103
@@ -18,14 +18,14 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
  <<< 250 OK
  >>> rcpt to:<userx@test.ex>
  ??? 550
-<<< 550 unacceptable cipher TLSv1:ke-RSA-AES256-SHAxxx:256
+<<< 550 unacceptable cipher TLSv1:ke-RSA-AES256-SHA:xxx
  >>> quit
  ??? 221
  <<< 221 myhost.test.ex closing connection
@@ -50,7 +50,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> helo rhu.barb
  ??? 250
diff --git a/test/stdout/2105 b/test/stdout/2105

index 28337c9e3a0495503a1c8c670a174b13c1d9c567..a5b65bb1324e40ed103d992a957c4d5865e62fb8 100644 (file)
--- a/test/stdout/2105
+++ b/test/stdout/2105
@@ -24,7 +24,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
diff --git a/test/stdout/2106 b/test/stdout/2106

index 0e102dc3831d9db4efdb791ea51522f22252739a..523f2320cddc4730a199e553db2505a02f99aaa1 100644 (file)
--- a/test/stdout/2106
+++ b/test/stdout/2106
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  +++ 3
  End of script
diff --git a/test/stdout/2114 b/test/stdout/2114

index 262738f942500e56b42dcc843ab4c279c874712b..0611347895fa3da04b2e95b745a40849f8879abd 100644 (file)
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -41,7 +41,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> helo rhu.barb
  ??? 250
@@ -78,7 +78,7 @@ Key file = aux-fixed/cert2
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
@@ -112,7 +112,7 @@ Key file = aux-fixed/cert2
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
@@ -171,7 +171,7 @@ Key file = aux-fixed/cert1
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
@@ -232,7 +232,7 @@ Key file = aux-fixed/cert1
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
diff --git a/test/stdout/2118 b/test/stdout/2118

index 5f81d7393feaa902919505b09e333f8221be04db..db04a0068508dc4453924d665a06da90d47246c1 100644 (file)
--- a/test/stdout/2118
+++ b/test/stdout/2118
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
diff --git a/test/stdout/2119 b/test/stdout/2119

index 3f06107f9b14cce28d9e075e580ae7bc48e5eb21..fc977c5628e1847819add509920d7fcb24c7a7ca 100644 (file)
--- a/test/stdout/2119
+++ b/test/stdout/2119
@@ -1,6 +1,6 @@
  Connecting to 127.0.0.1 port 1225 ... connected
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  ??? 220
  <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -36,7 +36,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
  Certificate file = aux-fixed/cert2
  Key file = aux-fixed/cert2
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  ??? 220
  <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/2122 b/test/stdout/2122

index c9ce22bac2aec6444dbc91c238e7001b3081c741..e8e8cb0c20a5625c8c006ace0c36eb929da16407 100644 (file)
--- a/test/stdout/2122
+++ b/test/stdout/2122
@@ -18,7 +18,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> help
  ??? 214-
diff --git a/test/stdout/2128 b/test/stdout/2128

index 2384c647cc368d6544b57874841c11e9f1e88034..c72135b578c7b2bbcfc1f8385f033c3955abe501 100644 (file)
--- a/test/stdout/2128
+++ b/test/stdout/2128
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> quit
  ??? 221
@@ -26,7 +26,7 @@ Succeeded in starting TLS
  End of script
  Connecting to 127.0.0.1 port 1226 ... connected
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  ??? 220
  <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/2132 b/test/stdout/2132

index aa62c59018a54136f3730146eea594c4081f5b38..905dfb913e81572f694676066c0e58525432bdbc 100644 (file)
--- a/test/stdout/2132
+++ b/test/stdout/2132
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<CALLER@test.ex>
  ??? 250
@@ -57,7 +57,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<"name with spaces"@test.ex>
  ??? 250
@@ -125,7 +125,7 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<CALLER@test.ex>
  ??? 250
diff --git a/test/stdout/2150 b/test/stdout/2150

index 1361650b3a814fdc3704292d2c7fd810e8f43df9..661f6d90f26f685718c1d002d191db7b3591459e 100644 (file)
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
diff --git a/test/stdout/2190 b/test/stdout/2190

index 30f205ba3d794a0271cc591c377489a16276e238..f3416369edd359d00ccd79eb41d192acc6bd04a1 100644 (file)
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> EHLO rhu.barb
  ??? 250-
@@ -76,7 +76,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> EHLO rhu.barb
  ??? 250-
diff --git a/test/stdout/3450 b/test/stdout/3450

index 565e1a35bfa9eb0ba5a7cf8d98b7c737d5711f90..d0576d0c58f8a59f4df4f69cf4c57480a2fd9187 100644 (file)
--- a/test/stdout/3450
+++ b/test/stdout/3450
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> ehlo foobar
  ??? 250-
diff --git a/test/stdout/3454 b/test/stdout/3454

index 0d4406111110ed563048980242afa13e1ed375d3..11d718c4490aa5a01e3dc1e058264f01c1cfb7ff 100644 (file)
--- a/test/stdout/3454
+++ b/test/stdout/3454
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220 TLS
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> auth plain AHVzZXJ4AHNlY3JldA==
  ??? 503
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220 TLS
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> ehlo foobar
  ??? 250-myhost
diff --git a/test/stdout/3460 b/test/stdout/3460

index 565e1a35bfa9eb0ba5a7cf8d98b7c737d5711f90..d0576d0c58f8a59f4df4f69cf4c57480a2fd9187 100644 (file)
--- a/test/stdout/3460
+++ b/test/stdout/3460
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> ehlo foobar
  ??? 250-
diff --git a/test/stdout/3463 b/test/stdout/3463

index 42ecf1dcc07d5391156714b20f86963665db5422..a7665f08c9fd4476cfb96497af939713ac510b59 100644 (file)
--- a/test/stdout/3463
+++ b/test/stdout/3463
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> auth plain AHVzZXJ4AHNlY3JldA==
  ??? 503
@@ -54,7 +54,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> auth plain AHVzZXJ4AHNlY3JldA==
  ??? 235
diff --git a/test/stdout/3464 b/test/stdout/3464

index c8ee2679d77c87c38e8c556b11835407baf10585..c070b669a8c864c06302b44d852282f4962d3292 100644 (file)
--- a/test/stdout/3464
+++ b/test/stdout/3464
@@ -20,7 +20,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> auth plain AHVzZXJ4AHNlY3JldA==
  ??? 503
@@ -48,7 +48,7 @@ Connecting to 127.0.0.1 port 1225 ... connected
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> ehlo foobar
  ??? 250-
diff --git a/test/stdout/5600 b/test/stdout/5600

index f1e728ba0befdd74bdb4e93cd12d7b1f056288ca..6d8d21b32f0cf77f7a70a6e39e62486e8d4ed05b 100644 (file)
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -21,7 +21,7 @@ Key file = aux-fixed/cert2
  <<< 220 TLS go ahead
  Attempting to start TLS
  Response verify OK
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
@@ -56,7 +56,7 @@ Key file = aux-fixed/cert2
  <<< 220 TLS go ahead
  Attempting to start TLS
  no response received
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  End of script
  Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -82,7 +82,7 @@ Key file = aux-fixed/cert2
  <<< 220 TLS go ahead
  Attempting to start TLS
  no response received
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  End of script
  Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -107,7 +107,7 @@ Key file = aux-fixed/cert2
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> ehlo rhu.barb.tls
  ??? 250-
diff --git a/test/stdout/5610 b/test/stdout/5610

index f1e728ba0befdd74bdb4e93cd12d7b1f056288ca..6d8d21b32f0cf77f7a70a6e39e62486e8d4ed05b 100644 (file)
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -21,7 +21,7 @@ Key file = aux-fixed/cert2
  <<< 220 TLS go ahead
  Attempting to start TLS
  Response verify OK
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> mail from:<userx@test.ex>
  ??? 250
@@ -56,7 +56,7 @@ Key file = aux-fixed/cert2
  <<< 220 TLS go ahead
  Attempting to start TLS
  no response received
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  End of script
  Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -82,7 +82,7 @@ Key file = aux-fixed/cert2
  <<< 220 TLS go ahead
  Attempting to start TLS
  no response received
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  End of script
  Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
@@ -107,7 +107,7 @@ Key file = aux-fixed/cert2
  ??? 220
  <<< 220 TLS go ahead
  Attempting to start TLS
-SSL connection using ke-RSA-AES256-SHAxxx
+SSL connection using ke-RSA-AES256-SHA
  Succeeded in starting TLS
  >>> ehlo rhu.barb.tls
  ??? 250-
author	Jeremy Harris <jgh146exb@wizmail.org>
	Thu, 9 Nov 2017 21:35:08 +0000 (21:35 +0000)
committer	Jeremy Harris <jgh146exb@wizmail.org>
	Thu, 9 Nov 2017 21:35:08 +0000 (21:35 +0000)
test/log/2100		patch \| blob \| history
test/log/2102		patch \| blob \| history
test/log/2103		patch \| blob \| history
test/log/2108		patch \| blob \| history
test/log/2110		patch \| blob \| history
test/log/2112		patch \| blob \| history
test/log/2113		patch \| blob \| history
test/log/2114		patch \| blob \| history
test/log/2117		patch \| blob \| history
test/log/2118		patch \| blob \| history
test/log/2119		patch \| blob \| history
test/log/2120		patch \| blob \| history
test/log/2126		patch \| blob \| history
test/log/2127		patch \| blob \| history
test/log/2130		patch \| blob \| history
test/log/2131		patch \| blob \| history
test/log/2132		patch \| blob \| history
test/log/2133		patch \| blob \| history
test/log/2135		patch \| blob \| history
test/log/2137		patch \| blob \| history
test/log/2138		patch \| blob \| history
test/log/2149		patch \| blob \| history
test/log/2190		patch \| blob \| history
test/log/2191		patch \| blob \| history
test/log/3461		patch \| blob \| history
test/log/3462		patch \| blob \| history
test/log/3464		patch \| blob \| history
test/log/3465		patch \| blob \| history
test/log/4221		patch \| blob \| history
test/log/4223		patch \| blob \| history
test/log/4224		patch \| blob \| history
test/log/4225		patch \| blob \| history
test/log/4226		patch \| blob \| history
test/log/5410		patch \| blob \| history
test/log/5601		patch \| blob \| history
test/log/5611		patch \| blob \| history
test/log/5720		patch \| blob \| history
test/log/5740		patch \| blob \| history
test/log/5840		patch \| blob \| history
test/log/5860		patch \| blob \| history
test/mail/2102.CALLER		patch \| blob \| history
test/mail/2103.userx		patch \| blob \| history
test/mail/2108.CALLER		patch \| blob \| history
test/mail/2108.abcd		patch \| blob \| history
test/mail/2108.xyz		patch \| blob \| history
test/mail/2113.usera		patch \| blob \| history
test/mail/2113.userb		patch \| blob \| history
test/mail/2113.userc		patch \| blob \| history
test/mail/2113.userx		patch \| blob \| history
test/mail/2113.usery		patch \| blob \| history
test/mail/2113.userz		patch \| blob \| history
test/mail/2117.userx		patch \| blob \| history
test/mail/2119.userx		patch \| blob \| history
test/mail/2127.userx		patch \| blob \| history
test/mail/2132.CALLER		patch \| blob \| history
test/mail/2138.userx0		patch \| blob \| history
test/mail/2138.userx1		patch \| blob \| history
test/mail/2138.usery0		patch \| blob \| history
test/mail/2138.usery1		patch \| blob \| history
test/mail/2138.userz0		patch \| blob \| history
test/mail/2138.userz1		patch \| blob \| history
test/mail/2149.userx		patch \| blob \| history
test/mail/3461.userx		patch \| blob \| history
test/mail/3462.userx		patch \| blob \| history
test/rejectlog/2103		patch \| blob \| history
test/rejectlog/2114		patch \| blob \| history
test/rejectlog/2137		patch \| blob \| history
test/rejectlog/4224		patch \| blob \| history
test/rejectlog/4226		patch \| blob \| history
test/runtest		patch \| blob \| history
test/stderr/2108		patch \| blob \| history
test/stderr/2113		patch \| blob \| history
test/stderr/2135		patch \| blob \| history
test/stderr/5410		patch \| blob \| history
test/stdout/2102		patch \| blob \| history
test/stdout/2103		patch \| blob \| history
test/stdout/2105		patch \| blob \| history
test/stdout/2106		patch \| blob \| history
test/stdout/2114		patch \| blob \| history
test/stdout/2118		patch \| blob \| history
test/stdout/2119		patch \| blob \| history
test/stdout/2122		patch \| blob \| history
test/stdout/2128		patch \| blob \| history
test/stdout/2132		patch \| blob \| history
test/stdout/2150		patch \| blob \| history
test/stdout/2190		patch \| blob \| history
test/stdout/3450		patch \| blob \| history
test/stdout/3454		patch \| blob \| history
test/stdout/3460		patch \| blob \| history
test/stdout/3463		patch \| blob \| history
test/stdout/3464		patch \| blob \| history
test/stdout/5600		patch \| blob \| history
test/stdout/5610		patch \| blob \| history