Gitweb:
https://git.exim.org/exim.git/commitdiff/6814cb2f15160a6171e7a55605ba8e80f58302a9
Commit: 6814cb2f15160a6171e7a55605ba8e80f58302a9
Parent: 04db5dd467f7ecabb1774676f1c7c8d96174d4f0
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Jun 17 19:50:08 2021 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Jun 17 19:50:08 2021 +0100
Testsuite: output changes for OpenSSL library variants
Broken-by: 2f8e0a5f6b
---
test/log/2102 | 30 +++++++++++++++---------------
test/stdout/2114 | 15 +++++++++++++++
test/stdout/2132 | 9 +++++++++
3 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/test/log/2102 b/test/log/2102
index d66cc00..b4e6431 100644
--- 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 PORT_D
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 <= a@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 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"@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
1999-03-02 09:44:33 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:
@@ -25,25 +25,25 @@
1999-03-02 09:44:33 SN <CN=server2.example.com>
1999-03-02 09:44:33 IN <CN=clica Signing Cert rsa,O=example.com>
1999-03-02 09:44:33 IN/O <example.com>
-1999-03-02 09:44:33 NB/r <Nov 1 12:40:04 2012 GMT>
-1999-03-02 09:44:33 NB <Nov 1 12:40:04 2012 +0000>
-1999-03-02 09:44:33 NB/i <1351773604>
-1999-03-02 09:44:33 NA/i <2143284004>
-1999-03-02 09:44:33 NA <Dec 1 12:40:04 2037 +0000>
+1999-03-02 09:44:33 NB/r <Nov 1 12:34:30 2012 GMT>
+1999-03-02 09:44:33 NB <Nov 1 12:34:30 2012 +0000>
+1999-03-02 09:44:33 NB/i <1351773270>
+1999-03-02 09:44:33 NA/i <2143283670>
+1999-03-02 09:44:33 NA <Dec 1 12:34:30 2037 +0000>
1999-03-02 09:44:33 SA <sha256WithRSAEncryption>
-1999-03-02 09:44:33 SG < b1:ce:91:99:2f:1c:ba:4d:9b:44:12:a1:fd:3d:be:69:9d:34:\n 51:3a:ff:ed:13:08:8a:0f:13:17:aa:a9:23:ac:cb:83:6c:17:\n e1:da:e3:a5:ad:b6:32:51:49:5b:5b:85:1c:45:f2:3c:44:53:\n b6:ed:3e:21:60:41:46:8e:70:96:53:c1:03:c3:86:64:12:38:\n f3:4e:f0:64:b8:ea:82:79:ed:a4:3b:53:b3:be:5f:73:35:b1:\n 54:b9:3d:ad:88:cc:4e:af:ac:94:a1:df:8f:7f:08:d6:d3:03:\n c5:8f:41:d5:8b:97:15:49:84:95:c0:71:93:6d:68:4b:ba:94:\n 2b:19:b8:34:8c:4e:90:2c:5b:92:38:fa:c9:f2:ae:6d:f2:bc:\n fe:6d:d1:e0:f6:f0:ae:4b:80:22:9e:3d:7f:7a:d9:da:e4:00:\n e3:fa:5c:64:39:d5:59:db:31:0e:db:d5:34:9d:41:e7:6d:60:\n a2:29:47:75:4a:52:f1:b9:2b:2f:fe:d1:cf:91:9b:07:e2:d9:\n a4:3c:a1:75:f0:7a:4c:c9:c9:2e:63:be:8b:dd:55:5b:1d:84:\n ee:bc:22:df:91:cf:fc:ee:ae:c3:79:3e:7f:86:8f:56:2e:40:\n d5:2c:da:70:eb:18:73:7e:54:82:05:a6:05:94:8c:b6:4e:e1:\n b7:09:72:d6\n>
-1999-03-02 09:44:33 SAN <DNS=*.test.ex\nDNS=server2.example.com>
+1999-03-02 09:44:33 SG < 5d:2c:8d:dc:bf:45:79:5d:60:8e:57:08:fe:10:da:9d:34:eb:\n e6:b0:b0:5b:88:16:70:97:0b:ab:b4:1c:a8:04:99:40:84:1b:\n ed:45:6c:fc:30:9c:f2:f2:44:28:f3:76:28:a0:14:49:9f:a1:\n 00:ac:2b:cf:88:68:ea:bc:21:d2:4b:29:fa:5e:38:d8:78:52:\n ae:0e:d8:ef:20:84:f3:43:8a:05:ea:17:f7:37:89:a8:9b:3a:\n ba:41:26:d2:e4:0f:a5:21:f6:c1:e7:15:90:b0:c4:5b:2b:d0:\n 05:23:e7:84:45:77:24:b1:34:8f:24:a0:9b:69:39:52:0a:ec:\n b3:38:1e:70:47:60:23:ea:f7:3d:c7:0c:20:de:dd:d5:6f:56:\n 76:db:74:24:c4:4e:13:e1:ee:0a:b5:c1:72:95:38:08:11:bc:\n e4:fe:d5:be:5f:80:1d:5d:c9:48:b8:40:43:5a:3e:2a:fa:bb:\n e7:df:29:79:d2:c2:3a:2d:f4:4b:02:f1:c3:05:88:84:9a:b4:\n af:03:c0:55:2b:72:b0:ba:f4:3b:5d:09:8f:6e:06:2a:52:0d:\n a4:4a:38:06:2c:c3:4c:83:a9:91:d9:6a:ed:a5:a1:fe:67:44:\n 97:2c:f1:f9:4f:36:1f:92:57:0c:76:7a:d3:e0:6f:04:72:11:\n db:ae:4b:42\n>
+1999-03-02 09:44:33 SAN <DNS=server2.example.com\nDNS=*.test.ex>
1999-03-02 09:44:33 OCU <http://oscp.example.com/>
1999-03-02 09:44:33 (no CRU)
-1999-03-02 09:44:33 md5 fingerprint 861F6627E5FD9C624B4B27ECA6FA6B06
-1999-03-02 09:44:33 sha1 fingerprint E75D537E478758010505D4F339B00DFD73728088
-1999-03-02 09:44:33 sha256 fingerprint E251FA7D0372CB784294CF92B243DCE53FDDABD9F58A1B89226586C07C82CAC6
-1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2Igy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSodF3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xwPCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYGOhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNSgCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59YtxxJC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPDhmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJhJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovdVVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
+1999-03-02 09:44:33 md5 fingerprint 1B701FAEF70F57451A50B2A91EF011EE
+1999-03-02 09:44:33 sha1 fingerprint DE737222042460A49F3E53A3FE05B9313E57327B
+1999-03-02 09:44:33 sha256 fingerprint D64B951B475CAB05CD7CFDBC4A1E4754D448FA554D6BB0411E065A5A885A013A
+1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNDMwWhcNMzcxMjAxMTIzNDMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHHdAsbLWHT6remjd2Rw+Tb1EDjDgHkhc6X2d3KyEvcNkbp+RMhyC0grYbue0tOp8SU+3U+TjLAsc3xesuGJYmsC8ttWf3fNOCM7TmE80fSzbZ4j6B8z6jbGT+fblaunHTRJF5H+yRKrV+Nfi7Pqu0YO3dnlGuehg8jjDUq3QrPTSU67P7DyDQv68cgWmck4h9OOC/T81hkNJk99ThWMkTkj8WsmdLVysK8suaniNuhDQvRmF/OZBUGb6hqEdRYDz3rIjrENHCtOygPFtZhc/YNSYMokIcJw3mTPLwTE0GbCfLowhkjPYW6J7ZuOlTTQqF/9b3yIYTpmm8sGVacEEwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAF0sjdy/RXldYI5XCP4Q2p006+awsFuIFnCXC6u0HKgEmUCEG+1FbPwwnPLyRCjzdiigFEmfoQCsK8+IaOq8IdJLKfpeONh4Uq4O2O8ghPNDigXqF/c3iaibOrpBJtLkD6Uh9sHnFZCwxFsr0AUj54RFdySxNI8koJtpOVIK7LM4HnBHYCPq9z3HDCDe3dVvVnbbdCTEThPh7gq1wXKVOAgRvOT+1b5fgB1dyUi4QENaPir6u+ffKXnSwjot9EsC8cMFiISatK8DwFUrcrC69DtdCY9uBipSDaRKOAYsw0yDqZHZau2lof5nRJcs8flPNh+SVwx2etPgbwRyEduuS0I=
1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 ver: TLS1.x
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@??? H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn: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 PORT_D
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 <= c@??? H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@??? H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
diff --git a/test/stdout/2114 b/test/stdout/2114
index e4b3b5a..f37ca8c 100644
--- a/test/stdout/2114
+++ b/test/stdout/2114
@@ -91,6 +91,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -125,6 +128,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -190,6 +196,9 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -255,6 +264,9 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
@@ -289,6 +301,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<userx@???>
??? 250
<<< 250 OK
diff --git a/test/stdout/2132 b/test/stdout/2132
index c9a281c..c1071df 100644
--- a/test/stdout/2132
+++ b/test/stdout/2132
@@ -20,6 +20,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
@@ -59,6 +62,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
>>> mail from:<"name with spaces"@???>
??? 250
<<< 250 OK
@@ -129,6 +135,9 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
<<< 220 TLS go ahead
Attempting to start TLS
Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
>>> mail from:<CALLER@???>
??? 250
<<< 250 OK
