X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/242583694aff4f43c3dbf7581b1100a68b3e0c11..c8535a954a3ec877083b39088f385ed3174abab7:/test/log/2002

diff --git a/test/log/2002 b/test/log/2002
index 18b85dbd6..a22faaf58 100644
--- a/test/log/2002
+++ b/test/log/2002
@@ -15,11 +15,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.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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn: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=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
 1999-03-02 09:44:33 Our cert SN: <CN=server1.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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 CV=no S=sss
-1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex 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 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer cert:
 1999-03-02 09:44:33 ver 3
@@ -27,23 +26,24 @@
 1999-03-02 09:44:33 SN  <CN=server2.example.com>
 1999-03-02 09:44:33 IN  <O=example.com,CN=clica Signing Cert rsa>
 1999-03-02 09:44:33 IN/O <example.com>
-1999-03-02 09:44:33 NB/r <Nov  1 12:34:04 2012 GMT>
-1999-03-02 09:44:33 NB   <Nov  1 12:34:04 2012 GMT>
-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   <Dec  1 12:34:04 2037 GMT>
+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 GMT>
+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 GMT>
 1999-03-02 09:44:33 SA  <RSA-SHA256>
-1999-03-02 09:44:33 SG  <34 52 66 f3 75 39 61 c3 16 70 4f 06 51 be bd 36 ce 9b f1 a3 3c dd d6 ff c5 73 48 94 84 69 d9 d8 a0 9d 61 8c c1 2f ae 54 78 f6 45 a7 5a 91 ea 0b 96 dc 27 ba 1b 7f e9 7d 82 52 75 57 13 23 40 11 f5 2f d2 d7 21 73 41 85 63 6b b6 8c 7f fc 21 13 5b e8 bd 09 22 72 25 b2 4e 86 a2 1b b3 4c 9e ca d1 fd 4b d9 15 8a 56 6c cc 2b 47 d6 85 b2 68 bd b9 19 d3 77 32 95 4b 4a 01 07 79 0b f5 ce 47 ef>
+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 51 3a ff ed 13 08 8a 0f 13 17 aa a9 23 ac cb 83 6c 17 e1 da e3 a5 ad b6 32 51 49 5b 5b 85 1c 45 f2 3c 44 53 b6 ed 3e 21 60 41 46 8e 70 96 53 c1 03 c3 86 64 12 38 f3 4e f0 64 b8 ea 82 79 ed a4 3b 53 b3 be 5f 73 35 b1 54 b9 3d ad 88 cc 4e af ac 94 a1 df 8f 7f 08 d6 d3 03 c5 8f 41 d5 8b 97 15 49 84 95 c0 71 93 6d 68 4b ba 94 2b 19 b8 34 8c 4e 90 2c 5b 92 38 fa c9 f2 ae 6d f2 bc fe 6d d1 e0 f6 f0 ae 4b 80 22 9e 3d 7f 7a d9 da e4 00 e3 fa 5c 64 39 d5 59 db 31 0e db d5 34 9d 41 e7 6d 60 a2 29 47 75 4a 52 f1 b9 2b 2f fe d1 cf 91 9b 07 e2 d9 a4 3c a1 75 f0 7a 4c c9 c9 2e 63 be 8b dd 55 5b 1d 84 ee bc 22 df 91 cf fc ee ae c3 79 3e 7f 86 8f 56 2e 40 d5 2c da 70 eb 18 73 7e 54 82 05 a6 05 94 8c b6 4e e1 b7 09 72 d6>
 1999-03-02 09:44:33 SAN <DNS=server2.example.com\nDNS=*.test.ex>
 1999-03-02 09:44:33 (no CRU)
-1999-03-02 09:44:33 md5    fingerprint FD3D9DD9589FAE5E09CAC8F57AFD20C3
-1999-03-02 09:44:33 sha1   fingerprint 7C00CE8DB08862F0999F2CEBBC5593081E5A6812
-1999-03-02 09:44:33 sha256 fingerprint F2ED966A3D3B523504CFEE66907E3A5FB9E5E9FFA6C246C610EA6C99B3847704
-1999-03-02 09:44:33 der_b64 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4eiW0/mMuTie82SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnjkiadxlHY1zBUrQknkRT1RtFYULKa/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxVjTs+/6LIa6LNFskOyShNDnvJWvetMRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEANFJm83U5YcMWcE8GUb69Ns6b8aM83db/xXNIlIRp2dignWGMwS+uVHj2RadakeoLltwnuht/6X2CUnVXEyNAEfUv0tchc0GFY2u2jH/8IRNb6L0JInIlsk6GohuzTJ7K0f1L2RWKVmzMK0fWhbJovbkZ03cylUtKAQd5C/XOR+8=
-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 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 10HmaZ-0005vi-00 <= CALLER@test.ex 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 Our cert SN: <CN=server1.example.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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn: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=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 10HmbB-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke_ECDSA_AES_256_CBC_SHAnnn:256 CV=no S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex 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 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.