Lose duplicated cert in ocsp response

2 files changed, 19 insertions, 19 deletions

diff --git a/test/log/2102.openssl_1_1_1 b/test/log/2102.openssl_1_1_1
index 5e0cf77bc..0a962c88e 100644
--- a/test/log/2102.openssl_1_1_1
+++ b/test/log/2102.openssl_1_1_1
@@ -25,20 +25,20 @@
 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:35:12 2012 GMT>
-1999-03-02 09:44:33 NB   <Nov  1 12:35:12 2012 +0000>
-1999-03-02 09:44:33 NB/i <1351773312>
-1999-03-02 09:44:33 NA/i <2143283712>
-1999-03-02 09:44:33 NA   <Dec  1 12:35:12 2037 +0000>
+1999-03-02 09:44:33 NB/r <Nov  1 12:34:56 2019 GMT>
+1999-03-02 09:44:33 NB   <Nov  1 12:34:56 2019 +0000>
+1999-03-02 09:44:33 NB/i <1572611696>
+1999-03-02 09:44:33 NA/i <2364208496>
+1999-03-02 09:44:33 NA   <Dec  1 12:34:56 2044 +0000>
 1999-03-02 09:44:33 SA  <sha256WithRSAEncryption>
-1999-03-02 09:44:33 SG  <a1:d2:89:bd:71:59:a5:cd:d4:dc:b6:a6:83:40:3a:48:57:0e:6b:34:ea:dc:6d:2d:4f:4e:65:4f:3d:28:bf:45:1d:b1:a5:da:e0:08:b4:24:4b:88:3f:9f:14:83:df:8e:12:4d:82:bc:ae:1f:42:66:95:fe:d8:7a:72:b2:7b:e3:36:bb:6e:70:13:41:51:79:1b:48:6a:bf:62:c6:a5:d3:8a:f8:dd:62:4e:f5:94:63:8f:10:83:86:aa:8c:1a:d8:0d:29:57:61:73:11:74:e1:6c:f6:86:0b:e9:e3:8e:0a:58:b4:cf:be:63:d4:81:10:6b:c8:2e:ca:5c:19:c1:55:e7:e0:fb:b6:cb:48:da:30:72:be:e7:8c:35:49:90:20:18:b4:79:69:19:87:13:cc:a7:76:96:6b:7b:bf:f9:11:2f:95:c3:6c:89:dc:43:a7:84:87:5c:15:69:7e:69:8f:ad:07:c2:26:94:e8:9a:6b:55:44:4d:24:55:18:ec:3a:0b:02:1f:bb:4d:4c:62:05:2b:e4:1d:49:28:63:c8:3e:7c:63:c8:ee:f8:9b:91:41:d4:c5:36:a3:c2:69:ec:fd:91:ad:bc:49:aa:bc:28:d3:2c:40:8c:75:8d:8c:c2:c5:5e:71:f3:e6:9c:58:12:ca:c9:2c:cd:74:7b:3d:4e:fe>
+1999-03-02 09:44:33 SG  <43:92:24:83:bd:6e:40:cd:67:7e:2a:5d:fb:9d:89:f6:a2:9b:c5:06:47:d0:db:8e:20:52:59:97:b0:7f:69:f1:96:05:89:2f:6c:f8:e1:22:f7:28:1e:07:07:2b:81:47:05:1f:d7:74:f8:49:af:b4:86:15:7c:46:82:cd:63:f4:f1:e2:d8:d1:ba:6e:a5:63:92:27:97:5a:69:0e:42:b8:9f:78:09:9d:d5:0c:1e:37:49:a5:ac:35:c8:6a:ce:1e:50:69:27:a9:18:ab:19:50:10:64:2a:d9:4c:8a:47:79:4b:05:b8:fe:cb:c2:7c:ef:0e:99:46:a8:4a:68:52:33:95:8b:fe:0d:b1:4a:e3:21:5e:55:3a:4a:7e:21:91:0e:f7:85:d5:36:da:4b:22:51:16:a0:b7:7c:a5:d8:f6:a6:b2:15:3d:36:d6:01:46:aa:7a:9c:b9:52:24:36:d0:40:3d:cf:62:9b:b4:60:37:9a:5a:a5:f1:f8:e4:bc:30:11:05:3e:ad:4c:ef:6a:81:ca:e3:73:e0:1e:44:8c:9a:e1:41:41:c6:59:97:be:01:84:8b:30:da:9d:cb:a4:93:d8:54:d0:c6:58:eb:8c:ff:ef:7e:d3:40:8d:59:88:12:db:36:63:df:a2:1a:46:14:c6:c1:8a:75:aa:70:1f:4d:0c>
 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 B5B541ECA7A66FC7F1B1AB34D8317E21
-1999-03-02 09:44:33 sha1   fingerprint 0C7D0ADCB4EDED464A6060B5C3C8BB3A4354CD27
-1999-03-02 09:44:33 sha256 fingerprint D2CDB81A829E370B823EEDA58F38A4B4A4C2A2FCAA5F67049AFCADE7C0CF72D3
-1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNTEyWhcNMzcxMjAxMTIzNTEyWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2m+DyjEFdeXcBs2qsmUM3al4xV0K2NxbAT0no0wI5g+4ceAQqySOFdS0jn2Sl6d4Vpiq+rUce6ZpiySkUj277kcwYXYoH+4sdUXSc+GC9n4NeQCLTxsNaFihgWYj9jweRXZdkBdwJIkbUMJvexWN0gQldRu2pbLFzbKBZWCJ337dEhv8QkVW5KMblzO09pfLPeLiQlId+JF7iizsfBmKOHM+lU5Mz5WJje9kCNcNaXOQMW51wnMpbac1DjL30bfRqeconcO315hb5olIlhqr9Jqlyn9iKY0FVNq9EyqVWRNuRW52TxSXh//Hzd+5jj9Q3G1ygeVFmwE317MoIzH3qwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAKHSib1xWaXN1Ny2poNAOkhXDms06txtLU9OZU89KL9FHbGl2uAItCRLiD+fFIPfjhJNgryuH0Jmlf7YenKye+M2u25wE0FReRtIar9ixqXTivjdYk71lGOPEIOGqowa2A0pV2FzEXThbPaGC+njjgpYtM++Y9SBEGvILspcGcFV5+D7tstI2jByvueMNUmQIBi0eWkZhxPMp3aWa3u/+REvlcNsidxDp4SHXBVpfmmPrQfCJpTommtVRE0kVRjsOgsCH7tNTGIFK+QdSShjyD58Y8ju+JuRQdTFNqPCaez9ka28Saq8KNMsQIx1jYzCxV5x8+acWBLKySzNdHs9Tv4=
+1999-03-02 09:44:33 md5    fingerprint 0EC720D50B90219A2126318C8AC16427
+1999-03-02 09:44:33 sha1   fingerprint DDFDB41DEF1CB4425B7656C037A4614D194E1148
+1999-03-02 09:44:33 sha256 fingerprint 30C1CFCE92CA95887E8B4FDE58BD32E5FFEFBA9AF6F5A856FC5D33AB8DF8D9BF
+1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkxMTAxMTIzNDU2WhcNNDQxMjAxMTIzNDU2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAof6VHfuK2WHcXTyvWXXmk98Smc4wLxTqU7/Lwh+hEqGcFNjlmv6A3blSUX76X/YCIjJljmy+i1HWyEevpEp1782h9W1OwrFZ4aUnJK+UMpThK66Dr8Xg26S6QPOebdteGkl/96hJSs0T3iLQauw/4E1fRe03ev+Ui2egtwtcFD8cmrVbE/UB47ClkXbZ3/Sz7VQGrRcAnvPe1rtTQmOxLCkS/8NLTXIx54wdEXJVcu83WciM+DeiCc1MqxO+dsJIswrGZ6gJ4Zc6NwiRy/AJuKSNU4PG/6nZEx0x3mzDTFXvqfe6hTYqCeKjFxH/uhTBn5lmClk6amehN234eyXsPQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEOSJIO9bkDNZ34qXfudifaim8UGR9DbjiBSWZewf2nxlgWJL2z44SL3KB4HByuBRwUf13T4Sa+0hhV8RoLNY/Tx4tjRum6lY5Inl1ppDkK4n3gJndUMHjdJpaw1yGrOHlBpJ6kYqxlQEGQq2UyKR3lLBbj+y8J87w6ZRqhKaFIzlYv+DbFK4yFeVTpKfiGRDveF1TbaSyJRFqC3fKXY9qayFT021gFGqnqcuVIkNtBAPc9im7RgN5papfH45LwwEQU+rUzvaoHK43PgHkSMmuFBQcZZl74BhIsw2p3LpJPYVNDGWOuM/+9+00CNWYgS2zZj36IaRhTGwYp1qnAfTQw=
 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
diff --git a/test/log/5720 b/test/log/5720
index 1c5a4e763..0ff9d99b2 100644
--- a/test/log/5720
+++ b/test/log/5720
@@ -13,10 +13,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 SN; <CN=clica CA rsa;O=example.com>
 1999-03-02 09:44:33 10HmaX-0005vi-00 SNO <example.com>
 1999-03-02 09:44:33 10HmaX-0005vi-00 IN  <CN=clica CA rsa,O=example.com>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NB  <Nov  1 12:35:12 2019 +0000>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NA  <Jan  1 12:35:12 2038 +0000>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NB  <Nov  1 12:34:16 2019 +0000>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NA  <Jan  1 12:34:16 2038 +0000>
 1999-03-02 09:44:33 10HmaX-0005vi-00 SA  <sha256WithRSAEncryption>
-1999-03-02 09:44:33 10HmaX-0005vi-00 SG  <ae:93:45:1a:27:1e:bd:d7:f3:1a:e0:23:46:11:b9:27:35:c5:51:1f:51:4c:0b:ca:6d:4c:12:a0:39:21:99:75:43:2c:1c:e0:5b:0e:64:ab:62:aa:58:bb:be:d8:ce:07:a6:70:d2:19:f7:51:53:47:59:eb:2b:f1:4b:28:a0:84:ef:2b:9b:ca:a0:db:f3:7f:09:ac:97:0c:1a:5f:65:83:a2:71:a0:8e:05:38:e7:de:b1:b9:59:d4:90:32:6a:76:6c:e3:5d:51:30:87:98:e2:8c:85:86:f8:13:b0:a2:78:4b:1d:f3:6a:59:fe:6c:83:85:0c:12:34:6a:46:28:44:ec:7b:cf:92:39:95:77:00:43:a4:c5:31:00:74:ce:46:3b:eb:15:74:c2:9e:b4:d0:4f:9a:9b:53:1b:c9:b2:ee:da:a4:32:45:c7:b4:0e:51:a2:fa:db:55:95:2f:9e:02:61:6a:09:ae:6f:7e:61:14:b9:34:a3:3e:b0:14:48:1d:ce:fc:fb:9b:0b:91:8f:a1:93:65:88:e3:f4:23:57:09:82:36:4d:37:27:51:b0:03:ae:68:3a:8d:cc:cc:cb:d0:20:81:2c:2f:85:3c:13:52:3a:6c:a9:f0:2b:82:86:26:d2:be:30:70:4c:56:48:32:44:ed:8f:e4:68:d8:0a:7c>
+1999-03-02 09:44:33 10HmaX-0005vi-00 SG  <7c:57:01:1a:fe:b4:1b:c2:84:7e:2f:74:e2:e2:4f:2a:0d:35:00:b0:df:86:5c:8d:36:05:90:e9:f2:8f:1b:c0:0e:2e:36:b6:7f:85:42:60:0b:04:71:d4:ab:ea:c1:2c:ea:9a:56:7c:01:81:0d:6e:f3:2a:55:f9:56:7d:8d:d9:9d:d6:48:f0:15:47:6c:9d:01:13:73:01:b2:4a:51:39:aa:b6:fa:61:ee:9d:71:89:e3:f8:6b:6d:c1:a8:6b:df:af:d8:31:28:f0:e7:e2:26:a5:35:c9:8a:ed:46:2f:3d:5b:ff:9c:90:fe:f9:7a:fa:b0:de:48:5f:8a:0c:b1:ea:8c:7e:a1:84:9f:5b:16:33:da:4b:63:02:2e:b0:be:08:29:d1:61:ab:76:ef:7f:19:d4:12:15:98:3e:1a:71:4d:69:fb:3e:6c:f3:13:19:63:b0:b2:7b:b7:1f:47:d0:53:3e:79:e3:82:e4:2e:b2:c3:7c:d0:b9:10:9a:70:03:f0:3a:2c:a4:8a:af:a1:48:a0:6f:08:7b:4e:ed:14:ca:a7:ed:c3:1c:b8:c3:5e:98:be:d4:54:20:97:30:f7:43:c7:4e:3a:91:30:45:6b:12:ac:5f:26:fa:03:58:e8:e6:09:8f:37:07:06:3e:7d:a3:65:4e:e7:24:10:39:77:ca:05>
 1999-03-02 09:44:33 10HmaX-0005vi-00 (no SAN)
 1999-03-02 09:44:33 10HmaX-0005vi-00 (no OCU)
 1999-03-02 09:44:33 10HmaX-0005vi-00 (no CRU)
@@ -49,15 +49,15 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 SN; <CN=server1.example.com>
 1999-03-02 09:44:33 10HmaY-0005vi-00 SNO <>
 1999-03-02 09:44:33 10HmaY-0005vi-00 IN  <CN=clica Signing Cert rsa,O=example.com>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NB  <Nov  1 12:35:18 2019 +0000>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NA  <Dec  1 12:35:18 2044 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NB  <Nov  1 12:34:21 2019 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NA  <Dec  1 12:34:21 2044 +0000>
 1999-03-02 09:44:33 10HmaY-0005vi-00 SA  <sha256WithRSAEncryption>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SG  <18:6f:dc:d4:7c:5c:b1:4d:99:52:88:47:a4:bb:1d:12:7d:70:cc:2d:c4:3c:d3:ad:5d:17:83:06:89:01:dd:0a:49:34:5d:e4:fd:b9:ed:17:e8:12:90:d5:d3:d5:18:52:6e:d5:04:b3:1a:d0:b6:08:56:6b:65:ac:0c:7a:17:70:ed:96:7f:9b:43:fe:cf:79:90:ba:c4:c0:66:31:fa:3b:d3:d5:ef:ea:66:8c:a1:c5:57:8d:68:22:f8:80:17:8e:ad:21:98:71:c0:ca:09:c3:bb:ee:39:f1:12:e9:b9:b9:dc:4c:b2:3d:0f:a5:4b:a6:79:21:97:68:95:d4:e5:79:00:7f:dd:1e:e7:06:f8:bc:d8:8b:da:62:24:58:1a:db:a3:dd:3f:a1:5b:6f:7b:84:6c:77:34:1a:9c:9d:95:19:50:0a:83:41:06:be:86:a0:bb:1d:36:23:1b:87:8d:8d:7b:a0:a8:95:d5:8d:bb:db:9d:e1:c9:f5:ff:a1:8a:56:f0:e8:74:d3:f5:f4:fc:70:59:f6:cb:e6:c7:9a:b7:33:52:a1:68:3e:a7:71:fc:54:fb:92:7e:e4:38:27:ce:4e:77:b0:db:6a:e6:55:a2:d2:43:5e:5b:7e:51:38:57:60:bb:67:f3:5b:e5:26:b9:1b:16:f5:3f:41:20:38:67:6f>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=alternatename2.server1.example.com;DNS=server1.example.com;DNS=*.test.ex;DNS=alternatename.server1.example.com>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SG  <1b:2e:d8:cd:93:4d:b3:d1:d6:59:f5:74:03:0b:2a:8a:00:3a:32:19:91:c1:5c:45:17:7d:6c:80:aa:b6:ca:6b:df:6a:7e:d3:ef:e6:c8:4f:c2:ea:95:49:cb:4d:ab:4a:0e:8f:c9:93:f3:22:e7:65:08:e8:ad:0c:31:cd:97:61:8b:67:3c:ee:28:af:a7:41:13:85:ea:22:60:55:9c:bb:8a:ae:b2:df:f1:95:5a:7b:81:a7:44:46:0c:0e:5f:ec:62:78:1b:58:e8:d6:45:01:0f:ab:16:86:8a:0b:25:a6:cc:da:7b:9f:7e:67:ee:ec:dd:07:da:1b:35:45:50:b5:d3:5f:65:26:49:4a:99:e6:f4:41:8a:ea:9d:9f:c7:55:71:c0:ae:c5:02:63:b7:47:76:31:9d:6a:8e:5c:b5:f0:aa:63:28:3d:65:d3:c1:12:45:4c:b4:80:34:e1:3e:e8:0f:7c:8a:fb:c1:23:72:c3:a1:a8:06:99:17:15:d5:eb:44:87:82:06:bd:59:7e:7a:ec:28:53:bd:c9:75:28:54:63:d8:c1:e6:11:34:70:6b:0b:2e:df:12:9e:f5:00:19:1a:8e:f4:e3:6a:20:0d:bb:7c:70:ed:5b:ae:9a:b9:55:79:78:21:cc:e2:19:f1:4e:59:fa:61:1b:89:37:ee:4e>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=alternatename.server1.example.com;DNS=server1.example.com;DNS=*.test.ex;DNS=alternatename2.server1.example.com>
 1999-03-02 09:44:33 10HmaY-0005vi-00 OCU <http://oscp.example.com/>
 1999-03-02 09:44:33 10HmaY-0005vi-00 CRU <http://crl.example.com/latest.crl>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename2.server1.example.com:server1.example.com:*.test.ex:alternatename.server1.example.com>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename2.server1.example.com:server1.example.com:*.test.ex:alternatename.server1.example.com>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename.server1.example.com:server1.example.com:*.test.ex:alternatename2.server1.example.com>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename.server1.example.com:server1.example.com:*.test.ex:alternatename2.server1.example.com>
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=p1234 -qf