From: Jeremy Harris Date: Sat, 16 Dec 2017 14:17:13 +0000 (+0000) Subject: Testsuite output changes arising X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/a21a110410d2336428aaee0d35396bdef71cd2ad Testsuite output changes arising Broken-by: 854586e149 --- diff --git a/test/log/2002 b/test/log/2002 index b8838bbb7..7092b0e68 100644 --- a/test/log/2002 +++ b/test/log/2002 @@ -27,19 +27,19 @@ 1999-03-02 09:44:33 SN 1999-03-02 09:44:33 IN 1999-03-02 09:44:33 IN/O -1999-03-02 09:44:33 NB/r -1999-03-02 09:44:33 NB -1999-03-02 09:44:33 NB/i <1351774050> -1999-03-02 09:44:33 NA/i <2143284450> -1999-03-02 09:44:33 NA +1999-03-02 09:44:33 NB/r +1999-03-02 09:44:33 NB +1999-03-02 09:44:33 NB/i <1351773244> +1999-03-02 09:44:33 NA/i <2143283644> +1999-03-02 09:44:33 NA 1999-03-02 09:44:33 SA -1999-03-02 09:44:33 SG <0c 05 e2 24 42 2f 70 2c 8e f1 cd 49 b8 f3 58 a8 8f e6 3b dc 39 5f c2 84 a4 b0 08 22 c7 be d3 3f 1b 52 f4 0a c9 23 4d fb 49 d3 c8 f1 48 24 d0 8f 0b 83 df d1 48 7a 3b 40 cf 3f 6b 09 01 75 05 cc fd 9b 1b 7a d1 be d1 5a 69 0a fc a0 2e 02 a8 13 9b 7a 41 45 e1 50 3e 4c 72 a6 f1 a9 70 b9 2a 9b 07 63 9d 4b 4b 3d 8f 45 7e 70 67 13 da 69 e1 88 8e b1 fe 5c f6 e0 14 35 66 a7 ad f6 04 12 d6 c6> -1999-03-02 09:44:33 SAN -1999-03-02 09:44:33 CRU -1999-03-02 09:44:33 md5 fingerprint 4A6FE0FA3A8A98446BEB8E70BF201CE1 -1999-03-02 09:44:33 sha1 fingerprint DE760672322BFBA5959763A4A8DED6040D3AB95D -1999-03-02 09:44:33 sha256 fingerprint D389DA8ED2B8B003460A0474FCF76DE4B9EDA1B59F4120B296FE58579992A254 -1999-03-02 09:44:33 der_b64 MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTI0NzMwWhcNMzcxMjAxMTI0NzMwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6IkhtSyUHJbEr7AZDWJw80qajVnnWlw9JBFQzU+Q8HXTOanOTqcyQL569l1SArnpusY/cMOVFiqKRAK9mNtxWV7e4HzITtBMQEWLfOdAhCjYL669zI6RhiNosj4MpdZAGTH5As1d9wDjXEkzHEikC2HUNywaNqJBxNVX9y4UBoQIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB4GA1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEADAXiJEIvcCyO8c1JuPNYqI/mO9w5X8KEpLAIIse+0z8bUvQKySNN+0nTyPFIJNCPC4Pf0Uh6O0DPP2sJAXUFzP2bG3rRvtFaaQr8oC4CqBObekFF4VA+THKm8alwuSqbB2OdS0s9j0V+cGcT2mnhiI6x/lz24BQ1Zqet9gQS1sY= +1999-03-02 09:44:33 SG +1999-03-02 09:44:33 SAN +1999-03-02 09:44:33 (no CRU) +1999-03-02 09:44:33 md5 fingerprint 9314682BC87B3030240DCB4E2FFDCE1E +1999-03-02 09:44:33 sha1 fingerprint 54AB24D7172435C370178C266E6DFADCE13DB43E +1999-03-02 09:44:33 sha256 fingerprint A63B07D3B3A8F60C27AEECFED6C77A6F9E3BA175394528803B2DC8BA433FDF5A +1999-03-02 09:44:33 der_b64 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDsYoP8ERKZ5qk66VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3JhaQ1ZdpCsvP7RnVbCUOdAA6dJdlp2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dAQXxLKCMs2DGIJIV7DautDGieWQdGCLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAoPX7ejjfYyI4gc8WA8+Roe49y8t36ARgkdKrbaSUxmKl2g+fbL4vGohVR0nRu7HWx6XprJZhzEHc7gU4ouoWsILKXVEScYStuhFVJhvGBjAsqIc2/X63J4KK+9KWK2NvGmnQIx7KVSz9Z9nZjwzTr2KmXkJmQTtxsLcT8xu8TfM= 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 CV=yes DN="CN=server2.example.com" S=sss 1999-03-02 09:44:33 Our cert SN: 1999-03-02 09:44:33 Peer did not present a cert diff --git a/test/log/5710 b/test/log/5710 index b97a58105..00358504b 100644 --- a/test/log/5710 +++ b/test/log/5710 @@ -10,11 +10,11 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 SN; 1999-03-02 09:44:33 10HmaX-0005vi-00 SNCN 1999-03-02 09:44:33 10HmaX-0005vi-00 IN -1999-03-02 09:44:33 10HmaX-0005vi-00 NB -1999-03-02 09:44:33 10HmaX-0005vi-00 NA +1999-03-02 09:44:33 10HmaX-0005vi-00 NB +1999-03-02 09:44:33 10HmaX-0005vi-00 NA 1999-03-02 09:44:33 10HmaX-0005vi-00 SA -1999-03-02 09:44:33 10HmaX-0005vi-00 SG <7c 9b 46 71 07 49 97 31 2f 91 a4 2c 86 37 60 97 de d0 df e1 18 6d e9 a5 a1 ba 66 f8 93 1f 91 5d 45 99 30 c8 4f e8 1f 23 89 d3 f2 40 90 e3 d8 1d 4c 9a 09 42 12 4c bf de 95 b8 58 23 89 52 ab 93 e9 08 36 8f d7 af 1e f1 fa a6 1a 52 c5 34 ef 2e 68 ae 30 1c c7 5d 8e de 98 be 4f 04 95 64 c3 0f 7d 8e d9 0e 66 bd 5f 82 9f d9 2c 33 a9 85 12 23 c0 eb d4 11 c8 5c 5b ec 9d c5 d4 b6 70 03 51 2e> -1999-03-02 09:44:33 10HmaX-0005vi-00 SAN +1999-03-02 09:44:33 10HmaX-0005vi-00 SG <13 98 99 77 a1 f9 77 2d f8 25 d8 68 da fc a5 a9 b9 0e 84 65 06 03 f8 91 21 44 de 2e 62 eb 92 72 71 13 ee a0 ec 5d f2 6a c6 06 9b 3b 47 78 24 ca 2d 33 6f 5b e9 33 a5 e4 f8 3a ae 2a 9d e6 5c 74 85 b1 69 29 14 c9 4a 0e 48 27 d4 df aa 45 2b 67 af 07 7c a3 6c f7 98 4b ae d4 06 92 91 be 9b 4a c3 1c 33 e4 d0 5a fd 02 1d fb db fd 6d c7 9b 6b fa 7e 4a 2b fb 0c 3a 31 da 9d f8 f9 e4 47 ea 77> +1999-03-02 09:44:33 10HmaX-0005vi-00 SAN 1999-03-02 09:44:33 10HmaX-0005vi-00 CRU 1999-03-02 09:44:33 10HmaX-0005vi-00 TLS session: (certificate verification failed): certificate invalid: delivering unencrypted to H=127.0.0.1 [127.0.0.1] (not in hosts_require_tls) 1999-03-02 09:44:33 10HmaX-0005vi-00 => bad@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" @@ -32,11 +32,11 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 SN; 1999-03-02 09:44:33 10HmaY-0005vi-00 SNCN 1999-03-02 09:44:33 10HmaY-0005vi-00 IN -1999-03-02 09:44:33 10HmaY-0005vi-00 NB -1999-03-02 09:44:33 10HmaY-0005vi-00 NA +1999-03-02 09:44:33 10HmaY-0005vi-00 NB +1999-03-02 09:44:33 10HmaY-0005vi-00 NA 1999-03-02 09:44:33 10HmaY-0005vi-00 SA -1999-03-02 09:44:33 10HmaY-0005vi-00 SG <7c 9b 46 71 07 49 97 31 2f 91 a4 2c 86 37 60 97 de d0 df e1 18 6d e9 a5 a1 ba 66 f8 93 1f 91 5d 45 99 30 c8 4f e8 1f 23 89 d3 f2 40 90 e3 d8 1d 4c 9a 09 42 12 4c bf de 95 b8 58 23 89 52 ab 93 e9 08 36 8f d7 af 1e f1 fa a6 1a 52 c5 34 ef 2e 68 ae 30 1c c7 5d 8e de 98 be 4f 04 95 64 c3 0f 7d 8e d9 0e 66 bd 5f 82 9f d9 2c 33 a9 85 12 23 c0 eb d4 11 c8 5c 5b ec 9d c5 d4 b6 70 03 51 2e> -1999-03-02 09:44:33 10HmaY-0005vi-00 SAN +1999-03-02 09:44:33 10HmaY-0005vi-00 SG <13 98 99 77 a1 f9 77 2d f8 25 d8 68 da fc a5 a9 b9 0e 84 65 06 03 f8 91 21 44 de 2e 62 eb 92 72 71 13 ee a0 ec 5d f2 6a c6 06 9b 3b 47 78 24 ca 2d 33 6f 5b e9 33 a5 e4 f8 3a ae 2a 9d e6 5c 74 85 b1 69 29 14 c9 4a 0e 48 27 d4 df aa 45 2b 67 af 07 7c a3 6c f7 98 4b ae d4 06 92 91 be 9b 4a c3 1c 33 e4 d0 5a fd 02 1d fb db fd 6d c7 9b 6b fa 7e 4a 2b fb 0c 3a 31 da 9d f8 f9 e4 47 ea 77> +1999-03-02 09:44:33 10HmaY-0005vi-00 SAN 1999-03-02 09:44:33 10HmaY-0005vi-00 CRU 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp -qf