Bump ocsp_unittest to RSA-2048 from RSA-1024

One less small key lying around. The generator had some assumptions
around 1024-bit keys, so fix that assumption. Turns out pyasn1's
BitString type already has the method we need.

Change-Id: I079bb6f4b57dfa375fc82da25ad62e0819fcdd0d
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/92207
Auto-Submit: David Benjamin <davidben@google.com>
Presubmit-BoringSSL-Verified: Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com>
Commit-Queue: Matt Mueller <mattm@google.com>
Reviewed-by: Matt Mueller <mattm@google.com>
diff --git a/pki/ocsp_unittest.cc b/pki/ocsp_unittest.cc
index 23a7d9f..b8b34dc 100644
--- a/pki/ocsp_unittest.cc
+++ b/pki/ocsp_unittest.cc
@@ -37,10 +37,10 @@
 std::shared_ptr<const ParsedCertificate> ParseCertificate(
     std::string_view data) {
   CertErrors errors;
+  auto bytes = StringAsBytes(data);
   return ParsedCertificate::Create(
       bssl::UniquePtr<CRYPTO_BUFFER>(
-          CRYPTO_BUFFER_new(reinterpret_cast<const uint8_t *>(data.data()),
-                            data.size(), nullptr)),
+          CRYPTO_BUFFER_new(bytes.data(), bytes.size(), nullptr)),
       {}, &errors);
 }
 
diff --git a/pki/testdata/ocsp_unittest/bad_ocsp_type.pem b/pki/testdata/ocsp_unittest/bad_ocsp_type.pem
index f01d4ce..c51dfae 100644
--- a/pki/testdata/ocsp_unittest/bad_ocsp_type.pem
+++ b/pki/testdata/ocsp_unittest/bad_ocsp_type.pem
@@ -1,13 +1,13 @@
 Has an invalid OCSP OID
 
 $ openssl asn1parse -i < [OCSP RESPONSE]
-    0:d=0  hl=4 l= 311 cons: SEQUENCE          
+    0:d=0  hl=4 l= 440 cons: SEQUENCE          
     4:d=1  hl=2 l=   1 prim:  ENUMERATED        :00
-    7:d=1  hl=4 l= 304 cons:  cont [ 0 ]        
-   11:d=2  hl=4 l= 300 cons:   SEQUENCE          
+    7:d=1  hl=4 l= 433 cons:  cont [ 0 ]        
+   11:d=2  hl=4 l= 429 cons:   SEQUENCE          
    15:d=3  hl=2 l=   9 prim:    OBJECT            :OCSP Nonce
-   26:d=3  hl=4 l= 285 prim:    OCTET STRING      
-    0:d=0  hl=4 l= 281 cons:      SEQUENCE          
+   26:d=3  hl=4 l= 414 prim:    OCTET STRING      
+    0:d=0  hl=4 l= 410 cons:      SEQUENCE          
     4:d=1  hl=3 l= 133 cons:       SEQUENCE          
     7:d=2  hl=2 l=  33 cons:        cont [ 1 ]        
     9:d=3  hl=2 l=  31 cons:         SEQUENCE          
@@ -22,20 +22,22 @@
    65:d=5  hl=2 l=   7 cons:           SEQUENCE          
    67:d=6  hl=2 l=   5 prim:            OBJECT            :sha1
    74:d=5  hl=2 l=  20 prim:           OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   96:d=5  hl=2 l=  20 prim:           OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   96:d=5  hl=2 l=  20 prim:           OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
   118:d=5  hl=2 l=   1 prim:           INTEGER           :05
   121:d=4  hl=2 l=   0 prim:          cont [ 0 ]        
   123:d=4  hl=2 l=  15 prim:          GENERALIZEDTIME   :20170301000000Z
   140:d=1  hl=2 l=  11 cons:       SEQUENCE          
   142:d=2  hl=2 l=   9 prim:        OBJECT            :sha1WithRSAEncryption
-  153:d=1  hl=3 l= 129 prim:       BIT STRING        
+  153:d=1  hl=4 l= 257 prim:       BIT STRING        
 -----BEGIN OCSP RESPONSE-----
-MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQIEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBuAoBAKCCAbEwggGtBgkrBgEFBQcwAQIEggGeMIIBmjCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQEFA4GBAKLTycjRgk6pnHDWU/qewJ9autKmffb9muWBBavN7saoeWYsNE0n
-DnXckSIdhmmx7aBWDxWulTe1iOSTBshI/CpSmyP5biXaqLQu931G7x5ANJEXEpaRIXA+fTvZQF2
-532akBzQNMIZF5Xyv1s2kPHKmUD0aWRE99e/YveGVinlo
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQEFA4IBAQBAI+HXlizQ2//deHBvjaeNsQXU329PDKIKvCCoufNcmj2/Osw2
+SUmLt4OBWuclfsO3e2lRB/Jk2Mrjxp6m34sxFZnGitkArPg/mqPljgnrdlkN5C/fwuhhzXKhq8b
+H3OVrlCbWHapQm7l0nPKlwxWFRCTWnEufvjoxIxsC0Xjk3vSWJCXHaTi/cPf3c/wOJF1pvR8mDt
+Gx/5hjprRuoSolCfa8OYcZfpcGoelxGzDDos5ckmewi3FLVjsk8kjH6QJLelG29KnR7gkWjdYXC
+7I+mDOr8NrCY6+FUTCYXG2Ctwlz2D9FYhr+SIhMvQFpvGXnSSovqhO1IuRE84klgJpC
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -51,37 +53,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -97,37 +120,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -140,9 +184,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/bad_signature.pem b/pki/testdata/ocsp_unittest/bad_signature.pem
index e4a546f..c64b6c7 100644
--- a/pki/testdata/ocsp_unittest/bad_signature.pem
+++ b/pki/testdata/ocsp_unittest/bad_signature.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -22,7 +22,7 @@
 -----BEGIN OCSP RESPONSE-----
 MIG2CgEAoIGwMIGtBgkrBgEFBQcwAQEEgZ8wgZwwgYWhITAfMR0wGwYDVQQDDBRUZXN0IEludGV
 ybWVkaWF0ZSBDQRgPMjAxNzAzMDIwMDAwMDBaME8wTTA4MAcGBSsOAwIaBBREmxxbMcbpmQlmUj
-5Jw/dzwCQZCgQUTRpM5loz6Tahaz9iwCKjpiwu6mECAQWAABgPMjAxNzAzMDEwMDAwMDBaMAsGC
+5Jw/dzwCQZCgQUKoYAccmxogfDsAvdqUESIz0jILgCAQWAABgPMjAxNzAzMDEwMDAwMDBaMAsGC
 SqGSIb3DQEBBQMFAN6tvu8=
 -----END OCSP RESPONSE-----
 
@@ -39,37 +39,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -85,37 +106,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -128,9 +170,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/bad_status.pem b/pki/testdata/ocsp_unittest/bad_status.pem
index f410c1b..78d1b6f 100644
--- a/pki/testdata/ocsp_unittest/bad_status.pem
+++ b/pki/testdata/ocsp_unittest/bad_status.pem
@@ -20,37 +20,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -66,37 +87,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -109,9 +151,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/good_response.pem b/pki/testdata/ocsp_unittest/good_response.pem
index bf69582..e15d2e7 100644
--- a/pki/testdata/ocsp_unittest/good_response.pem
+++ b/pki/testdata/ocsp_unittest/good_response.pem
@@ -11,28 +11,37 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        a2:d3:c9:c8:d1:82:4e:a9:9c:70:d6:53:fa:9e:c0:9f:5a:ba:
-        d2:a6:7d:f6:fd:9a:e5:81:05:ab:cd:ee:c6:a8:79:66:2c:34:
-        4d:27:0e:75:dc:91:22:1d:86:69:b1:ed:a0:56:0f:15:ae:95:
-        37:b5:88:e4:93:06:c8:48:fc:2a:52:9b:23:f9:6e:25:da:a8:
-        b4:2e:f7:7d:46:ef:1e:40:34:91:17:12:96:91:21:70:3e:7d:
-        3b:d9:40:5d:b9:df:66:a4:07:34:0d:30:86:45:e5:7c:af:d6:
-        cd:a4:3c:72:a6:50:3d:1a:59:11:3d:f5:ef:d8:bd:e1:95:8a:
-        79:68
+        40:23:e1:d7:96:2c:d0:db:ff:dd:78:70:6f:8d:a7:8d:b1:05:
+        d4:df:6f:4f:0c:a2:0a:bc:20:a8:b9:f3:5c:9a:3d:bf:3a:cc:
+        36:49:49:8b:b7:83:81:5a:e7:25:7e:c3:b7:7b:69:51:07:f2:
+        64:d8:ca:e3:c6:9e:a6:df:8b:31:15:99:c6:8a:d9:00:ac:f8:
+        3f:9a:a3:e5:8e:09:eb:76:59:0d:e4:2f:df:c2:e8:61:cd:72:
+        a1:ab:c6:c7:dc:e5:6b:94:26:d6:1d:aa:50:9b:b9:74:9c:f2:
+        a5:c3:15:85:44:24:d6:9c:4b:9f:be:3a:31:23:1b:02:d1:78:
+        e4:de:f4:96:24:25:c7:69:38:bf:70:f7:f7:73:fc:0e:24:5d:
+        69:bd:1f:26:0e:d1:b1:ff:98:63:a6:b4:6e:a1:2a:25:09:f6:
+        bc:39:87:19:7e:97:06:a1:e9:71:1b:30:c3:a2:ce:5c:92:67:
+        b0:8b:71:4b:56:3b:24:f2:48:c7:e9:02:4b:7a:51:b6:f4:a9:
+        d1:ee:09:16:8d:d6:17:0b:b2:3e:98:33:ab:f0:da:c2:63:af:
+        85:51:30:98:5c:6d:82:b7:09:73:d8:3f:45:62:1a:fe:48:88:
+        4c:bd:01:69:bc:65:e7:49:2a:2f:aa:13:b5:22:e4:44:f3:89:
+        25:80:9a:42
 -----BEGIN OCSP RESPONSE-----
-MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBuAoBAKCCAbEwggGtBgkrBgEFBQcwAQEEggGeMIIBmjCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQEFA4GBAKLTycjRgk6pnHDWU/qewJ9autKmffb9muWBBavN7saoeWYsNE0n
-DnXckSIdhmmx7aBWDxWulTe1iOSTBshI/CpSmyP5biXaqLQu931G7x5ANJEXEpaRIXA+fTvZQF2
-532akBzQNMIZF5Xyv1s2kPHKmUD0aWRE99e/YveGVinlo
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQEFA4IBAQBAI+HXlizQ2//deHBvjaeNsQXU329PDKIKvCCoufNcmj2/Osw2
+SUmLt4OBWuclfsO3e2lRB/Jk2Mrjxp6m34sxFZnGitkArPg/mqPljgnrdlkN5C/fwuhhzXKhq8b
+H3OVrlCbWHapQm7l0nPKlwxWFRCTWnEufvjoxIxsC0Xjk3vSWJCXHaTi/cPf3c/wOJF1pvR8mDt
+Gx/5hjprRuoSolCfa8OYcZfpcGoelxGzDDos5ckmewi3FLVjsk8kjH6QJLelG29KnR7gkWjdYXC
+7I+mDOr8NrCY6+FUTCYXG2Ctwlz2D9FYhr+SIhMvQFpvGXnSSovqhO1IuRE84klgJpC
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/good_response_next_update.pem b/pki/testdata/ocsp_unittest/good_response_next_update.pem
index b92b2eb..ac9073b 100644
--- a/pki/testdata/ocsp_unittest/good_response_next_update.pem
+++ b/pki/testdata/ocsp_unittest/good_response_next_update.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -19,21 +19,31 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        c1:c9:58:e0:1b:9d:fe:87:ea:16:b7:57:c8:74:ca:3f:24:cf:
-        4a:43:c4:b8:a1:f2:48:59:9b:9c:30:4e:5f:0d:b5:c2:39:f8:
-        5b:07:3c:5c:fc:5c:06:29:45:4b:f0:73:20:97:62:b7:10:d8:
-        79:4b:1b:e8:9a:cb:6d:4b:0a:44:65:a9:0b:3e:aa:b6:8a:3a:
-        3c:90:03:1a:f8:95:ac:3f:7b:c3:87:b0:d3:fd:db:15:c0:aa:
-        24:e1:21:e7:03:d5:1b:5b:82:36:4a:0f:6b:48:eb:08:63:6c:
-        e7:f0:a3:45:67:99:3c:a0:30:b4:9e:46:b1:11:b3:14:3e:ec:
-        a1:bc
+        b9:82:cd:40:47:7f:ff:2a:71:66:11:45:14:60:09:33:aa:bc:
+        69:d6:47:98:8a:ef:a3:25:7f:4c:0a:f2:2e:61:5a:31:0e:84:
+        8a:08:24:2d:b7:2d:ef:76:0b:d6:b4:6a:42:5b:04:f1:f5:26:
+        e2:42:cf:c6:96:dc:e7:1b:ec:e4:ff:1b:49:f4:ad:cf:d3:27:
+        99:80:6e:6b:48:3d:04:a3:01:19:76:68:a2:53:46:80:0a:4f:
+        42:bd:02:ed:b7:0c:87:00:75:fe:f7:91:57:cf:e3:63:73:d2:
+        24:0c:ff:be:b9:33:c3:0e:79:9e:a2:5d:1c:58:0c:84:06:8c:
+        cd:cd:57:32:56:8d:2f:af:9b:e1:0b:28:41:a1:9a:68:10:4e:
+        0f:71:2a:1c:3e:22:d8:19:95:1f:77:89:83:f8:99:8b:12:e7:
+        1f:93:af:ae:00:4a:70:70:59:e3:1e:87:0b:8a:30:84:cd:19:
+        f3:1e:0d:b3:33:63:f0:be:c0:79:62:17:23:2b:72:55:4c:bd:
+        43:a6:9e:40:a4:4a:49:27:97:df:38:58:18:05:6d:a6:61:62:
+        f6:41:46:e9:2e:9b:6c:49:5c:17:51:46:ae:f1:d3:c9:ce:bc:
+        7c:6b:df:83:99:eb:61:1c:b2:00:61:9d:00:2d:b4:d0:24:62:
+        b5:15:b5:89
 -----BEGIN OCSP RESPONSE-----
-MIIBSgoBAKCCAUMwggE/BgkrBgEFBQcwAQEEggEwMIIBLDCBmKEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBywoBAKCCAcQwggHABgkrBgEFBQcwAQEEggGxMIIBrTCBmKEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowYjBgMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FqgERgPMjAxNzA2MDEwMDAwMDBaMAsGCSqGSIb3DQEBBQOBgQDByVjgG53+h+oWt1fIdMo/JM9K
-Q8S4ofJIWZucME5fDbXCOfhbBzxc/FwGKUVL8HMgl2K3ENh5SxvomsttSwpEZakLPqq2ijo8kAM
-a+JWsP3vDh7DT/dsVwKok4SHnA9UbW4I2Sg9rSOsIY2zn8KNFZ5k8oDC0nkaxEbMUPuyhvA==
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FqgERgPMjAxNzA2MDEwMDAwMDBaMAsGCSqGSIb3DQEBBQOCAQEAuYLNQEd//ypxZhFFFGAJM6q8
+adZHmIrvoyV/TAryLmFaMQ6EiggkLbct73YL1rRqQlsE8fUm4kLPxpbc5xvs5P8bSfStz9MnmYB
+ua0g9BKMBGXZoolNGgApPQr0C7bcMhwB1/veRV8/jY3PSJAz/vrkzww55nqJdHFgMhAaMzc1XMl
+aNL6+b4QsoQaGaaBBOD3EqHD4i2BmVH3eJg/iZixLnH5OvrgBKcHBZ4x6HC4owhM0Z8x4NszNj8
+L7AeWIXIytyVUy9Q6aeQKRKSSeX3zhYGAVtpmFi9kFG6S6bbElcF1FGrvHTyc68fGvfg5nrYRyy
+AGGdAC200CRitRW1iQ==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -49,37 +59,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -95,37 +126,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -138,9 +190,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/good_response_sha256.pem b/pki/testdata/ocsp_unittest/good_response_sha256.pem
index 2d7c0f2..13844b9 100644
--- a/pki/testdata/ocsp_unittest/good_response_sha256.pem
+++ b/pki/testdata/ocsp_unittest/good_response_sha256.pem
@@ -11,28 +11,37 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        86:6e:22:23:c2:17:50:62:e3:f4:f3:c6:e0:fb:f4:8f:e5:f7:
-        33:38:2b:65:75:22:5d:6c:a9:4e:fb:95:b7:90:09:8d:40:72:
-        68:03:a0:2a:47:82:4a:58:5b:0d:c1:c8:17:be:12:46:df:c2:
-        93:89:ec:7f:5f:0a:45:8a:73:e4:ff:bd:42:1c:5e:61:4a:da:
-        4c:1d:4d:fa:c3:b1:e9:3a:e8:1d:8d:e5:12:de:05:19:db:56:
-        ec:14:0d:a7:95:9e:ab:7b:c2:09:f1:4f:30:13:e8:e0:13:ed:
-        01:2f:07:31:68:59:15:e8:04:d2:e0:52:4b:fc:e7:76:2e:fe:
-        ae:66
+        6a:df:2c:5e:07:cd:4e:42:59:31:15:16:f7:a4:25:50:3b:3b:
+        f0:8f:e4:97:e9:76:37:ce:6d:1e:fb:47:17:69:41:90:6d:89:
+        2b:5b:76:5c:31:b9:d4:76:db:d9:55:7b:04:86:f4:66:a4:1b:
+        32:54:16:f4:16:09:f8:af:ed:00:dc:34:30:f7:bb:19:8d:37:
+        3c:ca:52:e2:f3:09:38:1d:25:ab:eb:05:a1:42:a7:d2:a0:5a:
+        bb:76:77:19:a1:80:dc:42:92:41:da:d9:40:f9:b6:45:06:d5:
+        a5:39:ca:ad:0a:46:38:ce:48:1e:28:b5:09:ba:ac:c5:0c:b9:
+        3e:5d:09:ad:66:98:6f:2b:f7:60:c7:8c:12:e4:4a:87:61:f5:
+        8b:d8:81:6e:4d:84:00:b2:94:f2:5f:02:db:91:11:84:72:c3:
+        ad:10:78:50:04:a5:19:fe:5b:16:29:5d:51:b8:84:7d:77:29:
+        88:42:20:5e:62:b6:a9:42:c6:d5:2e:1c:0e:9b:29:c5:e1:00:
+        07:60:8b:bc:3b:3d:85:8c:ca:8b:a3:9d:f8:02:26:e0:ee:07:
+        b6:2e:0c:00:85:39:f3:91:0e:e4:dc:37:35:ea:eb:f9:51:78:
+        f9:00:00:f5:78:72:f3:bf:01:e9:e5:77:d8:da:64:4c:8b:33:
+        e7:a5:2e:b2
 -----BEGIN OCSP RESPONSE-----
-MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBuAoBAKCCAbEwggGtBgkrBgEFBQcwAQEEggGeMIIBmjCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQELA4GBAIZuIiPCF1Bi4/TzxuD79I/l9zM4K2V1Il1sqU77lbeQCY1AcmgD
-oCpHgkpYWw3ByBe+EkbfwpOJ7H9fCkWKc+T/vUIcXmFK2kwdTfrDsek66B2N5RLeBRnbVuwUDae
-Vnqt7wgnxTzAT6OAT7QEvBzFoWRXoBNLgUkv853Yu/q5m
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQELA4IBAQBq3yxeB81OQlkxFRb3pCVQOzvwj+SX6XY3zm0e+0cXaUGQbYkr
+W3ZcMbnUdtvZVXsEhvRmpBsyVBb0Fgn4r+0A3DQw97sZjTc8ylLi8wk4HSWr6wWhQqfSoFq7dnc
+ZoYDcQpJB2tlA+bZFBtWlOcqtCkY4zkgeKLUJuqzFDLk+XQmtZphvK/dgx4wS5EqHYfWL2IFuTY
+QAspTyXwLbkRGEcsOtEHhQBKUZ/lsWKV1RuIR9dymIQiBeYrapQsbVLhwOmynF4QAHYIu8Oz2Fj
+MqLo534Aibg7ge2LgwAhTnzkQ7k3Dc16uv5UXj5AAD1eHLzvwHp5XfY2mRMizPnpS6y
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem b/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem
index 75c53cf..3e7ac60 100644
--- a/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -21,22 +21,31 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        38:34:83:cd:47:3d:aa:62:0d:87:88:ed:bd:be:6b:00:7f:a1:
-        b1:f9:1b:b3:47:50:35:d8:f0:51:34:4e:18:fb:0b:3b:19:b4:
-        80:77:e9:08:14:01:85:be:07:cd:f5:44:74:2e:8a:61:ed:50:
-        d3:26:2a:5a:a0:26:f5:8c:f2:6d:6a:cf:7f:21:37:8b:07:27:
-        f0:4a:7f:fe:be:45:e7:11:e0:3a:02:c0:76:ba:c9:f8:d1:30:
-        ab:c2:c1:28:ce:c1:dc:d9:cd:0b:07:f5:80:50:8c:31:bc:29:
-        96:d8:4e:a9:05:2c:11:b8:6c:f8:63:db:ae:b5:05:ce:79:42:
-        34:11
+        c2:54:76:60:ba:78:01:8c:cd:1a:dc:8a:38:02:b7:5e:be:57:
+        93:d7:87:ce:27:c8:b6:de:d5:08:68:bf:0a:21:62:ef:61:4b:
+        35:e0:20:81:64:ad:ea:07:98:95:c3:4a:d5:d1:2d:4c:8f:8a:
+        50:0d:ee:0c:f0:86:fb:bc:9c:d2:9f:30:c4:c2:d8:1f:d1:a2:
+        cc:6a:a6:cc:28:46:f1:55:86:25:80:91:ea:f0:3f:24:7e:7d:
+        8b:14:66:2f:7f:c0:9c:d8:2b:fd:11:d7:6b:46:b5:27:95:51:
+        8a:c8:1f:d4:a4:89:a7:29:53:8e:81:70:1a:3a:b0:bb:83:5e:
+        73:09:36:54:b5:05:63:2c:b2:ef:e6:13:dd:f4:14:e1:37:4e:
+        59:a1:a6:02:d3:0a:4b:1e:76:54:27:25:ee:19:27:0f:09:08:
+        11:89:5e:9d:f5:73:52:47:35:5e:c1:02:0e:21:50:fe:67:ba:
+        8d:5f:51:e1:72:7f:8f:c0:14:78:36:f8:9e:9d:ca:97:1a:d9:
+        c9:16:13:15:5f:b3:c4:24:2b:87:97:59:0c:39:1f:89:18:2d:
+        79:af:4e:70:a2:a9:f0:1f:08:8e:a4:b9:4e:bb:18:f8:d3:22:
+        73:c1:34:29:da:6c:e3:c5:09:50:7f:b8:0a:3d:57:c7:be:ec:
+        76:0d:ef:be
 -----BEGIN OCSP RESPONSE-----
-MIIBVgoBAKCCAU8wggFLBgkrBgEFBQcwAQEEggE8MIIBODCBpKEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIB1woBAKCCAdAwggHMBgkrBgEFBQcwAQEEggG9MIIBuTCBpKEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowbjBsMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FqhHTAbMBkGCisGAQQB1nkCBAUBAf8ECERFQURCRUVGMAsGCSqGSIb3DQEBBQOBgQA4NIPNRz2q
-Yg2HiO29vmsAf6Gx+RuzR1A12PBRNE4Y+ws7GbSAd+kIFAGFvgfN9UR0Loph7VDTJipaoCb1jPJ
-tas9/ITeLByfwSn/+vkXnEeA6AsB2usn40TCrwsEozsHc2c0LB/WAUIwxvCmW2E6pBSwRuGz4Y9
-uutQXOeUI0EQ==
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FqhHTAbMBkGCisGAQQB1nkCBAUBAf8ECERFQURCRUVGMAsGCSqGSIb3DQEBBQOCAQEAwlR2YLp4
+AYzNGtyKOAK3Xr5Xk9eHzifItt7VCGi/CiFi72FLNeAggWSt6geYlcNK1dEtTI+KUA3uDPCG+7y
+c0p8wxMLYH9GizGqmzChG8VWGJYCR6vA/JH59ixRmL3/AnNgr/RHXa0a1J5VRisgf1KSJpylTjo
+FwGjqwu4Necwk2VLUFYyyy7+YT3fQU4TdOWaGmAtMKSx52VCcl7hknDwkIEYlenfVzUkc1XsECD
+iFQ/me6jV9R4XJ/j8AUeDb4np3KlxrZyRYTFV+zxCQrh5dZDDkfiRgtea9OcKKp8B8IjqS5TrsY
++NMic8E0Kdps48UJUH+4Cj1Xx77sdg3vvg==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -52,37 +61,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -98,37 +128,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -141,9 +192,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/has_critical_response_extension.pem b/pki/testdata/ocsp_unittest/has_critical_response_extension.pem
index 23acafc..8c3cd1c 100644
--- a/pki/testdata/ocsp_unittest/has_critical_response_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_critical_response_extension.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -21,22 +21,31 @@
             DEADBEEF
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        4c:4e:48:fb:68:5a:79:7d:76:c3:e5:ed:c1:dc:c5:79:22:0f:
-        a0:d9:3b:36:92:16:5f:8d:b7:ff:db:67:ef:5d:9b:00:f4:51:
-        5c:df:43:8f:b8:a8:b9:5c:13:52:a9:ad:99:a2:f7:bd:34:65:
-        9c:c9:c0:7b:85:e4:2c:a5:69:39:9b:73:c9:7d:b2:b3:c1:dc:
-        00:ed:6a:0b:79:09:d8:6d:b4:16:c3:cf:23:9c:fc:da:4f:f6:
-        d9:ff:1b:dd:f1:03:04:65:16:fa:42:92:e3:26:b2:83:1b:47:
-        9f:e6:52:6b:b2:76:be:39:41:0d:c0:a4:8b:68:81:46:7f:5f:
-        dc:a9
+        8d:97:35:d0:c9:24:3c:1e:f4:82:98:12:58:3a:75:fa:88:7f:
+        07:f6:a5:22:73:b5:02:2b:7b:f0:ae:d1:45:5f:ef:a0:4d:b6:
+        85:38:26:12:85:1e:0d:4b:69:04:2b:a4:bf:96:80:f0:0e:aa:
+        70:8f:ff:32:11:02:69:21:d8:14:31:5f:54:9b:7a:69:87:01:
+        f2:d7:fd:c6:6c:fd:c3:6b:94:6d:63:52:a9:18:48:65:71:5e:
+        a7:a0:c9:e5:ac:20:56:28:ca:40:9c:63:2b:61:eb:2d:02:ff:
+        90:61:00:8e:9e:a6:91:c8:73:4c:be:eb:8b:e4:67:8f:22:ae:
+        bb:d8:b4:d2:ba:a9:63:bb:2d:e2:a7:77:16:e1:6b:e4:ce:a2:
+        cc:54:dd:b2:f3:f0:5a:6f:4f:74:60:b5:12:ff:d8:a5:cb:bf:
+        f8:53:96:f5:57:9e:d5:38:d7:7a:97:a0:db:9e:61:5b:1d:b7:
+        fd:75:12:12:65:2d:35:32:77:fd:3a:f5:29:cf:24:b1:8a:e9:
+        d3:72:04:3d:6a:3f:5d:93:a7:8b:ba:11:73:07:4c:65:49:be:
+        04:37:ed:a0:db:62:b5:ed:94:29:6f:be:ff:69:4d:2f:8a:0f:
+        1f:bd:90:af:ea:cc:d0:f3:dd:51:7e:00:a5:2b:59:0b:03:c3:
+        78:45:8d:02
 -----BEGIN OCSP RESPONSE-----
-MIIBTwoBAKCCAUgwggFEBgkrBgEFBQcwAQEEggE1MIIBMTCBnaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIB0AoBAKCCAckwggHFBgkrBgEFBQcwAQEEggG2MIIBsjCBnaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FqhFjAUMBIGAyoDBAEB/wQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4GBAExOSPtoWnl9dsPl7cHc
-xXkiD6DZOzaSFl+Nt//bZ+9dmwD0UVzfQ4+4qLlcE1KprZmi9700ZZzJwHuF5CylaTmbc8l9srP
-B3ADtagt5CdhttBbDzyOc/NpP9tn/G93xAwRlFvpCkuMmsoMbR5/mUmuydr45QQ3ApItogUZ/X9
-yp
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FqhFjAUMBIGAyoDBAEB/wQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4IBAQCNlzXQySQ8HvSCmBJY
+OnX6iH8H9qUic7UCK3vwrtFFX++gTbaFOCYShR4NS2kEK6S/loDwDqpwj/8yEQJpIdgUMV9Um3p
+phwHy1/3GbP3Da5RtY1KpGEhlcV6noMnlrCBWKMpAnGMrYestAv+QYQCOnqaRyHNMvuuL5GePIq
+672LTSuqljuy3ip3cW4WvkzqLMVN2y8/Bab090YLUS/9ily7/4U5b1V57VONd6l6DbnmFbHbf9d
+RISZS01Mnf9OvUpzySxiunTcgQ9aj9dk6eLuhFzB0xlSb4EN+2g22K17ZQpb77/aU0vig8fvZCv
+6szQ891RfgClK1kLA8N4RY0C
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -52,37 +61,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -98,37 +128,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -141,9 +192,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/has_critical_single_extension.pem b/pki/testdata/ocsp_unittest/has_critical_single_extension.pem
index 5d358a0..932942a 100644
--- a/pki/testdata/ocsp_unittest/has_critical_single_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_critical_single_extension.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -21,22 +21,31 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        17:9a:92:80:07:85:b4:65:dc:43:be:a2:a4:9b:ab:4f:0d:11:
-        70:e8:79:88:bf:a5:ad:3e:a4:15:76:b7:53:27:eb:1d:2d:a7:
-        27:d3:0d:ea:26:e8:79:ed:7f:41:9e:b3:b6:ac:a4:b8:c5:b0:
-        59:90:17:49:11:2d:13:88:b8:7a:20:75:d5:a0:0d:cd:8c:ad:
-        a5:c5:5a:c1:8d:b9:3c:09:ef:9d:f0:1a:3a:57:5f:44:2a:ad:
-        d8:f5:12:55:8b:37:21:80:7e:2d:83:73:0b:be:38:0c:4f:58:
-        77:c4:a3:28:bb:f7:b5:e6:94:55:b6:e7:d9:f0:4e:5b:ab:74:
-        57:93
+        47:fe:8e:56:fd:d9:4b:d6:2f:40:06:e1:1c:7b:c2:7f:cd:a5:
+        d3:63:5f:28:88:d8:3d:8d:cc:20:76:25:dc:53:63:dc:07:31:
+        7b:04:be:cf:b8:28:11:81:cb:9e:09:1f:9c:6d:1f:8b:2a:17:
+        0b:c6:84:30:67:d0:c0:be:c7:bb:46:92:65:0e:5e:00:a2:4e:
+        de:00:d7:ac:b5:e5:be:a5:24:6f:dc:51:73:65:e0:62:8b:f4:
+        8b:0a:34:64:d4:f3:ad:4b:67:0d:5b:3b:0c:8b:47:c7:1a:b2:
+        67:1c:41:65:b7:1b:12:f8:b2:f9:21:65:e4:2f:2b:ea:44:46:
+        00:a4:be:61:86:f9:30:a2:20:8f:39:25:2e:ed:c1:3e:bb:91:
+        19:da:78:f5:f4:33:58:7c:f8:ec:21:22:d5:8b:a1:c5:c5:88:
+        c0:64:3a:5b:ec:15:cb:27:17:98:06:4c:6f:41:5c:a0:72:c5:
+        ee:5e:b0:7b:fa:bb:15:b3:b0:ef:1f:fc:69:4c:13:b6:82:f1:
+        63:31:30:5c:ec:c4:03:f9:c2:61:39:71:8e:db:64:58:22:34:
+        7c:0f:8a:02:4c:44:5b:37:19:37:4a:bc:c3:7f:cc:a0:82:00:
+        6e:c1:a2:a1:6c:d4:bb:01:70:6c:f1:58:0e:5e:b6:a6:1f:ba:
+        aa:ce:66:a0
 -----BEGIN OCSP RESPONSE-----
-MIIBTwoBAKCCAUgwggFEBgkrBgEFBQcwAQEEggE1MIIBMTCBnaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIB0AoBAKCCAckwggHFBgkrBgEFBQcwAQEEggG2MIIBsjCBnaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowZzBlMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FqhFjAUMBIGAyoDBAEB/wQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4GBABeakoAHhbRl3EO+oqSb
-q08NEXDoeYi/pa0+pBV2t1Mn6x0tpyfTDeom6Hntf0Ges7aspLjFsFmQF0kRLROIuHogddWgDc2
-MraXFWsGNuTwJ753wGjpXX0Qqrdj1ElWLNyGAfi2Dcwu+OAxPWHfEoyi797XmlFW259nwTlurdF
-eT
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FqhFjAUMBIGAyoDBAEB/wQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4IBAQBH/o5W/dlL1i9ABuEc
+e8J/zaXTY18oiNg9jcwgdiXcU2PcBzF7BL7PuCgRgcueCR+cbR+LKhcLxoQwZ9DAvse7RpJlDl4
+Aok7eANesteW+pSRv3FFzZeBii/SLCjRk1POtS2cNWzsMi0fHGrJnHEFltxsS+LL5IWXkLyvqRE
+YApL5hhvkwoiCPOSUu7cE+u5EZ2nj19DNYfPjsISLVi6HFxYjAZDpb7BXLJxeYBkxvQVygcsXuX
+rB7+rsVs7DvH/xpTBO2gvFjMTBc7MQD+cJhOXGO22RYIjR8D4oCTERbNxk3SrzDf8ygggBuwaKh
+bNS7AXBs8VgOXramH7qqzmag
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -52,37 +61,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -98,37 +128,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -141,9 +192,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/has_extension.pem b/pki/testdata/ocsp_unittest/has_extension.pem
index e4c5af1..32c7663 100644
--- a/pki/testdata/ocsp_unittest/has_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_extension.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -21,21 +21,31 @@
             DEADBEEF
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        69:2e:fb:8b:d5:d5:31:af:30:95:2c:51:de:d5:54:df:12:6d:
-        43:e1:de:c5:f1:de:e3:87:b6:cd:b1:1a:48:bd:16:06:48:70:
-        72:3b:11:fa:a8:87:8b:cd:5f:3c:2e:fe:b9:24:7f:7e:4a:88:
-        71:44:8c:0c:2c:f9:f3:29:9b:e5:e3:02:82:d2:21:df:5f:d6:
-        0a:21:79:d4:d9:92:2d:60:36:a2:6b:09:e0:b4:9a:14:1d:a2:
-        d9:3b:d5:4c:20:fe:54:ec:f6:f1:6a:6b:4f:e9:eb:77:9f:d3:
-        1b:7b:be:a3:a4:8e:19:2b:e2:2d:30:ea:20:a4:68:a5:3d:82:
-        8d:ce
+        4f:1f:94:80:08:9a:ea:6c:0a:d8:87:ca:97:45:e8:d3:17:f4:
+        54:8d:1a:8f:3e:74:a5:3c:a0:a4:df:7b:d7:49:25:c8:70:31:
+        3d:f3:a8:1e:a7:a5:98:40:30:61:24:36:77:46:68:ac:a1:87:
+        1e:45:f2:ae:96:c8:4f:a0:d4:d0:db:88:87:24:82:34:c1:cd:
+        08:15:d9:5f:6e:7c:bc:38:75:be:f9:84:13:e7:9e:67:f1:13:
+        d1:5a:f8:c4:7f:2e:dd:26:8d:be:32:26:27:a9:2b:6f:e3:75:
+        53:91:40:28:aa:c6:64:3a:47:a2:f5:24:02:ce:e9:be:29:b9:
+        0e:72:f8:68:70:0d:16:48:a5:c6:18:7b:83:1b:95:46:d7:22:
+        be:02:1e:49:49:5c:b5:72:fc:e9:22:c4:9c:b2:a2:d0:00:3a:
+        c0:c2:07:e5:bd:4b:47:81:db:d0:47:ea:2c:db:c8:be:b4:1b:
+        a5:0e:bc:7a:07:d2:0a:f6:04:4e:a6:ac:fd:1c:11:0d:61:e1:
+        2d:10:9a:60:96:6e:4a:8e:d5:90:0a:dc:15:76:e5:31:72:f2:
+        7b:e0:2d:ea:23:11:3e:72:01:bb:16:78:97:2e:8e:c7:3b:a3:
+        f1:aa:73:51:bc:c5:65:34:de:5d:a5:31:93:e8:18:75:ec:c7:
+        c1:b7:e2:65
 -----BEGIN OCSP RESPONSE-----
-MIIBTAoBAKCCAUUwggFBBgkrBgEFBQcwAQEEggEyMIIBLjCBmqEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBzQoBAKCCAcYwggHCBgkrBgEFBQcwAQEEggGzMIIBrzCBmqEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FqhEzARMA8GAyoDBAQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4GBAGku+4vV1TGvMJUsUd7VVN8S
-bUPh3sXx3uOHts2xGki9FgZIcHI7Efqoh4vNXzwu/rkkf35KiHFEjAws+fMpm+XjAoLSId9f1go
-hedTZki1gNqJrCeC0mhQdotk71Uwg/lTs9vFqa0/p63ef0xt7vqOkjhkr4i0w6iCkaKU9go3O
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FqhEzARMA8GAyoDBAQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4IBAQBPH5SACJrqbArYh8qXRejT
+F/RUjRqPPnSlPKCk33vXSSXIcDE986gep6WYQDBhJDZ3RmisoYceRfKulshPoNTQ24iHJII0wc0
+IFdlfbny8OHW++YQT555n8RPRWvjEfy7dJo2+MiYnqStv43VTkUAoqsZkOkei9SQCzum+KbkOcv
+hocA0WSKXGGHuDG5VG1yK+Ah5JSVy1cvzpIsScsqLQADrAwgflvUtHgdvQR+os28i+tBulDrx6B
+9IK9gROpqz9HBENYeEtEJpglm5KjtWQCtwVduUxcvJ74C3qIxE+cgG7FniXLo7HO6PxqnNRvMVl
+NN5dpTGT6Bh17MfBt+Jl
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -51,37 +61,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -97,37 +128,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -140,9 +192,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/has_single_extension.pem b/pki/testdata/ocsp_unittest/has_single_extension.pem
index 8d71846..6ce3343 100644
--- a/pki/testdata/ocsp_unittest/has_single_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_single_extension.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -21,21 +21,31 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        90:77:87:15:44:3a:3e:b0:d8:7c:cd:00:e3:0c:4e:c6:0c:0c:
-        63:fb:47:7e:46:4c:fb:24:7a:01:e1:9c:17:a9:dd:52:20:ea:
-        d2:f5:3e:1e:08:18:51:61:a0:f3:bf:d6:4f:d8:10:ef:60:1e:
-        37:29:f9:cc:65:2a:e6:72:10:1f:4a:3f:1f:5e:8a:51:17:36:
-        43:aa:5f:fe:20:3f:72:e5:a4:e9:99:90:85:1b:7a:4d:38:10:
-        d5:ec:aa:c6:89:fd:ae:0b:8d:b9:6a:ca:14:15:57:df:5c:7b:
-        99:94:91:4f:94:f4:bb:9d:6b:95:36:f0:27:a6:25:ad:2a:91:
-        22:37
+        b3:51:ca:54:c8:7f:6b:5b:ed:55:32:06:d4:f3:6e:a2:cb:05:
+        92:3f:0a:c8:6a:e2:1a:4f:7d:de:8b:5a:5e:d2:76:39:43:9e:
+        0a:91:b9:16:3b:23:c0:7d:f6:a0:61:21:1b:28:d4:4e:fd:62:
+        f5:1d:26:bf:08:53:f6:19:98:5e:be:90:24:81:94:87:69:5c:
+        7d:ef:bc:dc:e9:43:1c:44:10:38:77:b0:16:c3:0e:ae:3d:53:
+        d3:7e:0b:ef:df:77:a9:43:3b:e5:62:a8:0c:0b:66:16:89:73:
+        b2:93:8e:2b:ab:9e:66:ef:7b:87:70:ae:89:ac:d9:11:e4:95:
+        3b:ba:55:e9:c8:0c:ed:9a:26:90:11:4c:5c:fc:95:ea:8b:3a:
+        83:2e:fc:5f:69:0c:86:8c:a4:9f:68:0f:9b:87:bb:3f:02:7d:
+        bc:51:9b:28:a7:9d:75:bf:89:ae:8b:79:b3:97:90:16:c4:12:
+        8d:00:f7:a4:05:70:8b:c8:a3:c5:97:46:90:55:45:6b:af:a6:
+        ec:bc:29:74:88:56:2b:85:c3:95:c5:bf:e4:17:4c:43:fd:8c:
+        45:dd:64:bc:b3:a5:d6:d5:de:7b:12:39:8b:03:3e:7c:a6:20:
+        f1:ea:ca:bf:19:cf:1d:92:1a:d0:71:d5:55:4c:fe:e4:b9:26:
+        89:db:90:6f
 -----BEGIN OCSP RESPONSE-----
-MIIBTAoBAKCCAUUwggFBBgkrBgEFBQcwAQEEggEyMIIBLjCBmqEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBzQoBAKCCAcYwggHCBgkrBgEFBQcwAQEEggGzMIIBrzCBmqEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowZDBiMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FqhEzARMA8GAyoDBAQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4GBAJB3hxVEOj6w2HzNAOMMTsYM
-DGP7R35GTPskegHhnBep3VIg6tL1Ph4IGFFhoPO/1k/YEO9gHjcp+cxlKuZyEB9KPx9eilEXNkO
-qX/4gP3LlpOmZkIUbek04ENXsqsaJ/a4LjblqyhQVV99ce5mUkU+U9Luda5U28CemJa0qkSI3
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FqhEzARMA8GAyoDBAQIREVBREJFRUYwCwYJKoZIhvcNAQEFA4IBAQCzUcpUyH9rW+1VMgbU826i
+ywWSPwrIauIaT33ei1pe0nY5Q54KkbkWOyPAffagYSEbKNRO/WL1HSa/CFP2GZhevpAkgZSHaVx
+977zc6UMcRBA4d7AWww6uPVPTfgvv33epQzvlYqgMC2YWiXOyk44rq55m73uHcK6JrNkR5JU7ul
+XpyAztmiaQEUxc/JXqizqDLvxfaQyGjKSfaA+bh7s/An28UZsop511v4mui3mzl5AWxBKNAPekB
+XCLyKPFl0aQVUVrr6bsvCl0iFYrhcOVxb/kF0xD/YxF3WS8s6XW1d57EjmLAz58piDx6sq/Gc8d
+khrQcdVVTP7kuSaJ25Bv
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -51,37 +61,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -97,37 +128,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -140,9 +192,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/has_version.pem b/pki/testdata/ocsp_unittest/has_version.pem
index 902e28d..8a02a89 100644
--- a/pki/testdata/ocsp_unittest/has_version.pem
+++ b/pki/testdata/ocsp_unittest/has_version.pem
@@ -11,28 +11,37 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        a2:d3:c9:c8:d1:82:4e:a9:9c:70:d6:53:fa:9e:c0:9f:5a:ba:
-        d2:a6:7d:f6:fd:9a:e5:81:05:ab:cd:ee:c6:a8:79:66:2c:34:
-        4d:27:0e:75:dc:91:22:1d:86:69:b1:ed:a0:56:0f:15:ae:95:
-        37:b5:88:e4:93:06:c8:48:fc:2a:52:9b:23:f9:6e:25:da:a8:
-        b4:2e:f7:7d:46:ef:1e:40:34:91:17:12:96:91:21:70:3e:7d:
-        3b:d9:40:5d:b9:df:66:a4:07:34:0d:30:86:45:e5:7c:af:d6:
-        cd:a4:3c:72:a6:50:3d:1a:59:11:3d:f5:ef:d8:bd:e1:95:8a:
-        79:68
+        40:23:e1:d7:96:2c:d0:db:ff:dd:78:70:6f:8d:a7:8d:b1:05:
+        d4:df:6f:4f:0c:a2:0a:bc:20:a8:b9:f3:5c:9a:3d:bf:3a:cc:
+        36:49:49:8b:b7:83:81:5a:e7:25:7e:c3:b7:7b:69:51:07:f2:
+        64:d8:ca:e3:c6:9e:a6:df:8b:31:15:99:c6:8a:d9:00:ac:f8:
+        3f:9a:a3:e5:8e:09:eb:76:59:0d:e4:2f:df:c2:e8:61:cd:72:
+        a1:ab:c6:c7:dc:e5:6b:94:26:d6:1d:aa:50:9b:b9:74:9c:f2:
+        a5:c3:15:85:44:24:d6:9c:4b:9f:be:3a:31:23:1b:02:d1:78:
+        e4:de:f4:96:24:25:c7:69:38:bf:70:f7:f7:73:fc:0e:24:5d:
+        69:bd:1f:26:0e:d1:b1:ff:98:63:a6:b4:6e:a1:2a:25:09:f6:
+        bc:39:87:19:7e:97:06:a1:e9:71:1b:30:c3:a2:ce:5c:92:67:
+        b0:8b:71:4b:56:3b:24:f2:48:c7:e9:02:4b:7a:51:b6:f4:a9:
+        d1:ee:09:16:8d:d6:17:0b:b2:3e:98:33:ab:f0:da:c2:63:af:
+        85:51:30:98:5c:6d:82:b7:09:73:d8:3f:45:62:1a:fe:48:88:
+        4c:bd:01:69:bc:65:e7:49:2a:2f:aa:13:b5:22:e4:44:f3:89:
+        25:80:9a:42
 -----BEGIN OCSP RESPONSE-----
-MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBuAoBAKCCAbEwggGtBgkrBgEFBQcwAQEEggGeMIIBmjCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQEFA4GBAKLTycjRgk6pnHDWU/qewJ9autKmffb9muWBBavN7saoeWYsNE0n
-DnXckSIdhmmx7aBWDxWulTe1iOSTBshI/CpSmyP5biXaqLQu931G7x5ANJEXEpaRIXA+fTvZQF2
-532akBzQNMIZF5Xyv1s2kPHKmUD0aWRE99e/YveGVinlo
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQEFA4IBAQBAI+HXlizQ2//deHBvjaeNsQXU329PDKIKvCCoufNcmj2/Osw2
+SUmLt4OBWuclfsO3e2lRB/Jk2Mrjxp6m34sxFZnGitkArPg/mqPljgnrdlkN5C/fwuhhzXKhq8b
+H3OVrlCbWHapQm7l0nPKlwxWFRCTWnEufvjoxIxsC0Xjk3vSWJCXHaTi/cPf3c/wOJF1pvR8mDt
+Gx/5hjprRuoSolCfa8OYcZfpcGoelxGzDDos5ckmewi3FLVjsk8kjH6QJLelG29KnR7gkWjdYXC
+7I+mDOr8NrCY6+FUTCYXG2Ctwlz2D9FYhr+SIhMvQFpvGXnSSovqhO1IuRE84klgJpC
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/make_ocsp.py b/pki/testdata/ocsp_unittest/make_ocsp.py
index 9190029..84b57d3 100755
--- a/pki/testdata/ocsp_unittest/make_ocsp.py
+++ b/pki/testdata/ocsp_unittest/make_ocsp.py
@@ -63,7 +63,7 @@
 
 def CreateCert(name, signer=None, ocsp=False):
   global NEXT_SERIAL
-  private_key = rsa.generate_private_key(public_exponent=65537, key_size=1024)
+  private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
   subject = x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, name)])
 
   if signer:
@@ -132,7 +132,7 @@
   rid = rfc2560.ResponderID()
   spk = c[0].getComponentByName('tbsCertificate').getComponentByName(
       'subjectPublicKeyInfo').getComponentByName('subjectPublicKey')
-  keyHash = hashlib.sha1(encoder.encode(spk)[4:]).digest()
+  keyHash = hashlib.sha1(spk.asOctets()).digest()
   rid.setComponentByName('byKey', keyHash)
   return rid
 
@@ -151,9 +151,8 @@
   name_hash = hashlib.sha1(
       encoder.encode(issuer_tbs.getComponentByName('subject'))).digest()
   key_hash = hashlib.sha1(
-      encoder.encode(
-          issuer_tbs.getComponentByName('subjectPublicKeyInfo')
-          .getComponentByName('subjectPublicKey'))[4:]).digest()
+      issuer_tbs.getComponentByName('subjectPublicKeyInfo')
+      .getComponentByName('subjectPublicKey').asOctets()).digest()
   sn = tbs.getComponentByName('serialNumber')
 
   ha = cid.setComponentByName('hashAlgorithm').getComponentByName(
diff --git a/pki/testdata/ocsp_unittest/malformed_request.pem b/pki/testdata/ocsp_unittest/malformed_request.pem
index de8e368..c15d11b 100644
--- a/pki/testdata/ocsp_unittest/malformed_request.pem
+++ b/pki/testdata/ocsp_unittest/malformed_request.pem
@@ -20,37 +20,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -66,37 +87,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -109,9 +151,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/missing_response.pem b/pki/testdata/ocsp_unittest/missing_response.pem
index fe8c85d..bdd7289 100644
--- a/pki/testdata/ocsp_unittest/missing_response.pem
+++ b/pki/testdata/ocsp_unittest/missing_response.pem
@@ -10,20 +10,29 @@
     Responses:
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        25:f7:8d:dd:51:6d:2f:1f:a0:54:64:d1:33:17:cd:21:fe:92:
-        8e:17:c5:3e:2c:5d:5b:bb:eb:06:0c:de:62:42:0a:f7:24:40:
-        4a:30:0b:4f:22:8d:7e:9e:10:1b:76:98:d5:d3:5c:45:d1:41:
-        45:85:ec:47:fc:3c:8a:56:27:04:de:d4:9c:bd:60:da:c0:54:
-        95:08:07:32:a8:e2:7e:95:53:1d:e0:a5:d6:94:c6:7f:cf:e5:
-        85:c3:db:d6:f7:01:71:17:d9:a6:22:a2:c7:98:24:ce:07:df:
-        4d:b0:4f:90:32:30:26:40:1e:6b:08:f9:51:19:b7:b1:05:4c:
-        42:31
+        99:ed:bf:42:90:59:ed:ef:93:ef:20:a3:7d:af:82:c1:16:9c:
+        e5:a3:5b:08:9a:45:92:6c:b8:e3:d0:73:8b:2d:5e:f1:c3:e5:
+        e8:e3:e8:56:34:39:6c:72:be:e3:56:5a:4e:1f:2f:56:7d:6f:
+        b4:9d:f7:c5:2b:82:46:78:9f:f7:b0:f5:93:98:a9:d4:12:80:
+        5c:d0:4f:6f:3f:d7:ca:01:d7:1e:a9:14:3e:8a:a0:6a:fd:82:
+        50:70:71:4a:3c:ef:9c:ef:f6:ab:22:18:87:c7:02:e6:8e:fc:
+        dc:a6:e2:2c:85:a6:64:a4:bb:0f:51:ce:50:10:ba:19:07:36:
+        11:88:2e:c0:77:d6:c8:54:fa:1a:f7:9b:d9:9f:77:3c:aa:96:
+        cb:5c:88:65:81:78:d4:83:d6:1d:5e:4a:d8:79:57:7d:8f:3a:
+        d1:2f:40:9b:ee:88:03:01:22:cc:92:e7:57:a4:ed:b5:89:88:
+        54:65:3e:4b:39:18:de:04:a5:61:de:60:46:a3:84:51:65:ae:
+        96:6a:03:a1:a8:71:91:d6:45:b1:81:56:80:e5:94:b6:46:12:
+        74:23:4b:f4:0f:23:f0:16:0e:23:d3:81:03:d8:70:f8:29:0c:
+        cc:44:e3:27:c1:f4:b9:20:d5:44:fa:fe:ed:97:d9:71:93:b4:
+        1f:04:ef:31
 -----BEGIN OCSP RESPONSE-----
-MIHjCgEAoIHdMIHaBgkrBgEFBQcwAQEEgcwwgckwNqEhMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJ
-tZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowADALBgkqhkiG9w0BAQUDgYEAJfeN3VFtLx+gVG
-TRMxfNIf6SjhfFPixdW7vrBgzeYkIK9yRASjALTyKNfp4QG3aY1dNcRdFBRYXsR/w8ilYnBN7Un
-L1g2sBUlQgHMqjifpVTHeCl1pTGf8/lhcPb1vcBcRfZpiKix5gkzgffTbBPkDIwJkAeawj5URm3
-sQVMQjE=
+MIIBaAoBAKCCAWEwggFdBgkrBgEFBQcwAQEEggFOMIIBSjA2oSEwHzEdMBsGA1UEAwwUVGVzdCB
+JbnRlcm1lZGlhdGUgQ0EYDzIwMTcwMzAyMDAwMDAwWjAAMAsGCSqGSIb3DQEBBQOCAQEAme2/Qp
+BZ7e+T7yCjfa+CwRac5aNbCJpFkmy449Bziy1e8cPl6OPoVjQ5bHK+41ZaTh8vVn1vtJ33xSuCR
+nif97D1k5ip1BKAXNBPbz/XygHXHqkUPoqgav2CUHBxSjzvnO/2qyIYh8cC5o783KbiLIWmZKS7
+D1HOUBC6GQc2EYguwHfWyFT6Gveb2Z93PKqWy1yIZYF41IPWHV5K2HlXfY860S9Am+6IAwEizJL
+nV6TttYmIVGU+SzkY3gSlYd5gRqOEUWWulmoDoahxkdZFsYFWgOWUtkYSdCNL9A8j8BYOI9OBA9
+hw+CkMzETjJ8H0uSDVRPr+7ZfZcZO0HwTvMQ==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -39,37 +48,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -85,37 +115,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -128,9 +179,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/multiple_response.pem b/pki/testdata/ocsp_unittest/multiple_response.pem
index 9f32c33..521ce0a 100644
--- a/pki/testdata/ocsp_unittest/multiple_response.pem
+++ b/pki/testdata/ocsp_unittest/multiple_response.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -19,30 +19,39 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: unknown
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        45:30:ed:5f:51:77:0d:67:6d:aa:3a:5f:dc:d2:84:96:33:aa:
-        84:52:d1:3a:5a:3b:77:60:fe:01:0f:a0:a1:dd:70:22:89:fc:
-        11:07:8e:57:9a:c7:3f:a0:a7:5b:37:d7:f9:45:52:8a:a0:dd:
-        f0:1c:28:c0:50:9b:70:90:01:03:02:1d:17:b0:d2:71:88:f2:
-        17:97:87:e6:d6:f7:68:04:51:2d:a0:68:8c:26:15:59:22:d1:
-        2c:3d:1d:c3:c7:b5:cc:27:06:25:e9:ae:35:2f:2c:d1:9c:1d:
-        7b:d5:ae:62:5b:45:43:73:ae:7c:3f:6d:36:5f:51:75:bf:ec:
-        27:81
+        6f:d8:12:20:ab:31:6c:90:80:c2:d5:ad:41:c2:9d:6f:06:dc:
+        c9:8a:97:1c:28:80:2c:3b:a1:e3:f5:91:a8:97:9f:8d:43:77:
+        46:16:d0:2d:81:df:55:6e:fe:34:c4:73:f6:b2:33:af:d7:3d:
+        f4:3a:91:e8:42:e7:cf:34:d7:cc:d8:7a:95:f0:af:06:d7:de:
+        9f:34:f2:3b:08:2e:bc:2c:1b:42:2c:c5:3e:d0:29:60:d4:78:
+        e5:db:0f:0b:f2:f0:2b:52:15:fc:9c:46:da:38:75:85:b2:ec:
+        69:73:e5:59:78:ab:39:91:21:c6:82:69:55:f9:82:90:bd:c8:
+        1b:b4:d1:64:34:3c:78:de:d6:54:b1:36:29:13:23:39:c0:8b:
+        15:d9:75:2f:fe:33:90:99:ce:c6:4b:05:28:c9:a6:50:53:51:
+        ee:db:24:e2:cd:d8:74:2a:3e:5f:b3:df:68:6a:2b:63:d1:f8:
+        09:98:95:3a:4d:5c:4f:5f:bd:fe:f3:d0:e2:00:21:ab:96:cb:
+        14:44:b6:47:22:e9:f7:10:94:72:d4:20:60:c5:4b:e4:e8:1b:
+        9d:37:68:ec:77:42:c5:98:f2:c7:29:0b:c8:d3:db:96:2b:ec:
+        e5:c3:b5:77:db:19:36:10:39:67:1d:e7:36:75:06:00:c9:bd:
+        4a:c6:35:86
 -----BEGIN OCSP RESPONSE-----
-MIIBhwoBAKCCAYAwggF8BgkrBgEFBQcwAQEEggFtMIIBaTCB1aEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIICCAoBAKCCAgEwggH9BgkrBgEFBQcwAQEEggHuMIIB6jCB1aEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowgZ4wTTA4MAcGBSsOAwIaBBREmxxbMc
-bpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9iwCKjpiwu6mECAQWAABgPMjAxNzAzMDEwMDAwM
-DBaME0wODAHBgUrDgMCGgQURJscWzHG6ZkJZlI+ScP3c8AkGQoEFE0aTOZaM+k2oWs/YsAio6Ys
-LuphAgEFggAYDzIwMTcwMzAxMDAwMDAwWjALBgkqhkiG9w0BAQUDgYEARTDtX1F3DWdtqjpf3NK
-EljOqhFLROlo7d2D+AQ+god1wIon8EQeOV5rHP6CnWzfX+UVSiqDd8BwowFCbcJABAwIdF7DScY
-jyF5eH5tb3aARRLaBojCYVWSLRLD0dw8e1zCcGJemuNS8s0Zwde9WuYltFQ3OufD9tNl9Rdb/sJ
-4E=
+bpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAvdqUESIz0jILgCAQWAABgPMjAxNzAzMDEwMDAwM
+DBaME0wODAHBgUrDgMCGgQURJscWzHG6ZkJZlI+ScP3c8AkGQoEFCqGAHHJsaIHw7AL3alBEiM9
+IyC4AgEFggAYDzIwMTcwMzAxMDAwMDAwWjALBgkqhkiG9w0BAQUDggEBAG/YEiCrMWyQgMLVrUH
+CnW8G3MmKlxwogCw7oeP1kaiXn41Dd0YW0C2B31Vu/jTEc/ayM6/XPfQ6kehC588018zYepXwrw
+bX3p808jsILrwsG0IsxT7QKWDUeOXbDwvy8CtSFfycRto4dYWy7Glz5Vl4qzmRIcaCaVX5gpC9y
+Bu00WQ0PHje1lSxNikTIznAixXZdS/+M5CZzsZLBSjJplBTUe7bJOLN2HQqPl+z32hqK2PR+AmY
+lTpNXE9fvf7z0OIAIauWyxREtkci6fcQlHLUIGDFS+ToG503aOx3QsWY8scpC8jT25Yr7OXDtXf
+bGTYQOWcd5zZ1BgDJvUrGNYY=
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -58,37 +67,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -104,37 +134,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -147,9 +198,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/no_response.pem b/pki/testdata/ocsp_unittest/no_response.pem
index 47c766f..715c3b1 100644
--- a/pki/testdata/ocsp_unittest/no_response.pem
+++ b/pki/testdata/ocsp_unittest/no_response.pem
@@ -10,20 +10,29 @@
     Responses:
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        25:f7:8d:dd:51:6d:2f:1f:a0:54:64:d1:33:17:cd:21:fe:92:
-        8e:17:c5:3e:2c:5d:5b:bb:eb:06:0c:de:62:42:0a:f7:24:40:
-        4a:30:0b:4f:22:8d:7e:9e:10:1b:76:98:d5:d3:5c:45:d1:41:
-        45:85:ec:47:fc:3c:8a:56:27:04:de:d4:9c:bd:60:da:c0:54:
-        95:08:07:32:a8:e2:7e:95:53:1d:e0:a5:d6:94:c6:7f:cf:e5:
-        85:c3:db:d6:f7:01:71:17:d9:a6:22:a2:c7:98:24:ce:07:df:
-        4d:b0:4f:90:32:30:26:40:1e:6b:08:f9:51:19:b7:b1:05:4c:
-        42:31
+        99:ed:bf:42:90:59:ed:ef:93:ef:20:a3:7d:af:82:c1:16:9c:
+        e5:a3:5b:08:9a:45:92:6c:b8:e3:d0:73:8b:2d:5e:f1:c3:e5:
+        e8:e3:e8:56:34:39:6c:72:be:e3:56:5a:4e:1f:2f:56:7d:6f:
+        b4:9d:f7:c5:2b:82:46:78:9f:f7:b0:f5:93:98:a9:d4:12:80:
+        5c:d0:4f:6f:3f:d7:ca:01:d7:1e:a9:14:3e:8a:a0:6a:fd:82:
+        50:70:71:4a:3c:ef:9c:ef:f6:ab:22:18:87:c7:02:e6:8e:fc:
+        dc:a6:e2:2c:85:a6:64:a4:bb:0f:51:ce:50:10:ba:19:07:36:
+        11:88:2e:c0:77:d6:c8:54:fa:1a:f7:9b:d9:9f:77:3c:aa:96:
+        cb:5c:88:65:81:78:d4:83:d6:1d:5e:4a:d8:79:57:7d:8f:3a:
+        d1:2f:40:9b:ee:88:03:01:22:cc:92:e7:57:a4:ed:b5:89:88:
+        54:65:3e:4b:39:18:de:04:a5:61:de:60:46:a3:84:51:65:ae:
+        96:6a:03:a1:a8:71:91:d6:45:b1:81:56:80:e5:94:b6:46:12:
+        74:23:4b:f4:0f:23:f0:16:0e:23:d3:81:03:d8:70:f8:29:0c:
+        cc:44:e3:27:c1:f4:b9:20:d5:44:fa:fe:ed:97:d9:71:93:b4:
+        1f:04:ef:31
 -----BEGIN OCSP RESPONSE-----
-MIHjCgEAoIHdMIHaBgkrBgEFBQcwAQEEgcwwgckwNqEhMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJ
-tZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowADALBgkqhkiG9w0BAQUDgYEAJfeN3VFtLx+gVG
-TRMxfNIf6SjhfFPixdW7vrBgzeYkIK9yRASjALTyKNfp4QG3aY1dNcRdFBRYXsR/w8ilYnBN7Un
-L1g2sBUlQgHMqjifpVTHeCl1pTGf8/lhcPb1vcBcRfZpiKix5gkzgffTbBPkDIwJkAeawj5URm3
-sQVMQjE=
+MIIBaAoBAKCCAWEwggFdBgkrBgEFBQcwAQEEggFOMIIBSjA2oSEwHzEdMBsGA1UEAwwUVGVzdCB
+JbnRlcm1lZGlhdGUgQ0EYDzIwMTcwMzAyMDAwMDAwWjAAMAsGCSqGSIb3DQEBBQOCAQEAme2/Qp
+BZ7e+T7yCjfa+CwRac5aNbCJpFkmy449Bziy1e8cPl6OPoVjQ5bHK+41ZaTh8vVn1vtJ33xSuCR
+nif97D1k5ip1BKAXNBPbz/XygHXHqkUPoqgav2CUHBxSjzvnO/2qyIYh8cC5o783KbiLIWmZKS7
+D1HOUBC6GQc2EYguwHfWyFT6Gveb2Z93PKqWy1yIZYF41IPWHV5K2HlXfY860S9Am+6IAwEizJL
+nV6TttYmIVGU+SzkY3gSlYd5gRqOEUWWulmoDoahxkdZFsYFWgOWUtkYSdCNL9A8j8BYOI9OBA9
+hw+CkMzETjJ8H0uSDVRPr+7ZfZcZO0HwTvMQ==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -39,37 +48,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -85,37 +115,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -128,9 +179,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem b/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem
index f63ae9f..02f29d9 100644
--- a/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem
@@ -11,21 +11,28 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        a2:d3:c9:c8:d1:82:4e:a9:9c:70:d6:53:fa:9e:c0:9f:5a:ba:
-        d2:a6:7d:f6:fd:9a:e5:81:05:ab:cd:ee:c6:a8:79:66:2c:34:
-        4d:27:0e:75:dc:91:22:1d:86:69:b1:ed:a0:56:0f:15:ae:95:
-        37:b5:88:e4:93:06:c8:48:fc:2a:52:9b:23:f9:6e:25:da:a8:
-        b4:2e:f7:7d:46:ef:1e:40:34:91:17:12:96:91:21:70:3e:7d:
-        3b:d9:40:5d:b9:df:66:a4:07:34:0d:30:86:45:e5:7c:af:d6:
-        cd:a4:3c:72:a6:50:3d:1a:59:11:3d:f5:ef:d8:bd:e1:95:8a:
-        79:68
+        40:23:e1:d7:96:2c:d0:db:ff:dd:78:70:6f:8d:a7:8d:b1:05:
+        d4:df:6f:4f:0c:a2:0a:bc:20:a8:b9:f3:5c:9a:3d:bf:3a:cc:
+        36:49:49:8b:b7:83:81:5a:e7:25:7e:c3:b7:7b:69:51:07:f2:
+        64:d8:ca:e3:c6:9e:a6:df:8b:31:15:99:c6:8a:d9:00:ac:f8:
+        3f:9a:a3:e5:8e:09:eb:76:59:0d:e4:2f:df:c2:e8:61:cd:72:
+        a1:ab:c6:c7:dc:e5:6b:94:26:d6:1d:aa:50:9b:b9:74:9c:f2:
+        a5:c3:15:85:44:24:d6:9c:4b:9f:be:3a:31:23:1b:02:d1:78:
+        e4:de:f4:96:24:25:c7:69:38:bf:70:f7:f7:73:fc:0e:24:5d:
+        69:bd:1f:26:0e:d1:b1:ff:98:63:a6:b4:6e:a1:2a:25:09:f6:
+        bc:39:87:19:7e:97:06:a1:e9:71:1b:30:c3:a2:ce:5c:92:67:
+        b0:8b:71:4b:56:3b:24:f2:48:c7:e9:02:4b:7a:51:b6:f4:a9:
+        d1:ee:09:16:8d:d6:17:0b:b2:3e:98:33:ab:f0:da:c2:63:af:
+        85:51:30:98:5c:6d:82:b7:09:73:d8:3f:45:62:1a:fe:48:88:
+        4c:bd:01:69:bc:65:e7:49:2a:2f:aa:13:b5:22:e4:44:f3:89:
+        25:80:9a:42
 Certificate:
     Data:
         Version: 3 (0x2)
@@ -38,38 +45,60 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 ~~~~~BEGIN CERTIFICATE~~~~~
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0
 IENBMB4XDTE3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwU
-VGVzdCBJbnRlcm1lZGlhdGUgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
-ANFzw7GxkIPHyVQPYBW61z//rnNslORfKaJjC7wQMclAwSHG2jPrXWo6tOIbr1Ed
-XhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CDtDIxuUxpM3GlgOvuxkO/
-yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQYJKoZIhvcN
-AQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpV
-xa6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKeze
-QgDK+qFJYEah2kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+VGVzdCBJbnRlcm1lZGlhdGUgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJPBz2Tcren1paX5jWdOcg9+rE10YZCkcr
+UI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq+dwU1KPYObb+x4N4y9Iq
+7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYRF9lEwzZAu
+ukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pb
+RTTE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZ
+dy5vrhPDemtodIZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6
+zmKcogxYivdPmwS0zhL14MAiDwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt
++jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOTFQfrED0mobn40nYUZorvZCRfS8kql
+ezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0q2UrhJ6rxVbvM6ku5B
+52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWxv3PM9eR
+sEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif
+6P8BarNs/N5RSWwLd2E=
 ~~~~~END CERTIFICATE~~~~~
 Certificate:
     Data:
@@ -83,66 +112,99 @@
         Subject: CN=Test OCSP Signer
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:b2:fd:f9:40:09:ff:0c:66:82:72:2c:23:82:b7:
-                    da:c4:23:b6:63:b9:2c:b7:26:a2:3e:53:8f:2c:85:
-                    c8:b5:16:00:09:8f:81:f6:a8:ac:a5:5d:ed:0c:78:
-                    03:13:12:ff:3e:cb:c0:fa:09:9a:e2:d5:e0:ba:8b:
-                    58:f8:d7:65:0e:2d:24:ed:94:53:ff:a7:6c:b4:70:
-                    90:25:ee:ce:ba:bb:46:dc:2e:25:8f:6b:9b:ba:7e:
-                    f6:0d:33:d3:8b:22:d2:40:c2:2d:bf:fa:5b:56:fa:
-                    fd:15:03:23:a4:3b:8d:e7:2c:b2:74:6b:24:7c:f1:
-                    18:47:32:4b:b6:a1:cc:b5:73
+                    00:a0:7b:5a:fb:b7:3e:82:37:d5:07:ca:c0:19:08:
+                    b7:56:db:2e:c7:2c:01:48:cc:9b:b2:c3:8f:bc:83:
+                    a3:48:ab:39:c2:0d:fa:78:85:8f:23:e3:7d:f2:a1:
+                    f4:c5:fa:f0:4b:bc:1a:c1:62:ec:b5:66:1c:84:bc:
+                    a2:79:47:30:06:35:f4:33:58:ae:16:9f:2e:9b:ea:
+                    e4:a2:f8:ec:23:39:0a:38:9a:42:98:30:ef:f0:6b:
+                    5a:e6:1b:af:bb:b7:aa:bc:7c:6c:8a:50:95:b5:9c:
+                    20:73:b4:61:a6:68:53:17:95:6c:fb:41:99:8c:5e:
+                    61:75:3a:f6:f9:4f:d5:e1:34:b2:b5:d9:34:f0:16:
+                    8d:37:3b:0f:70:9e:b1:96:12:be:84:54:df:cc:7c:
+                    9b:b8:a3:89:77:49:12:4b:58:14:1c:9f:b1:e3:0c:
+                    74:37:46:fa:05:33:15:02:03:5a:3a:ec:75:45:6a:
+                    d9:a4:c2:5d:c1:cd:1c:0c:2c:a4:d2:bf:7b:e0:1e:
+                    a3:62:38:56:15:20:f3:14:35:11:ce:61:92:5a:3f:
+                    42:61:a8:72:09:b8:ef:ce:50:6a:13:3b:f5:e0:d7:
+                    ea:e4:d1:55:4c:86:41:f7:60:b3:af:70:61:70:02:
+                    67:d5:93:3a:e8:47:60:07:1e:b2:b7:6d:7a:33:3a:
+                    5d:f1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Extended Key Usage: 
                 OCSP Signing
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        49:0b:94:e6:c2:3f:a7:7d:8e:82:2a:c7:0c:40:9f:32:55:f9:
-        c3:39:dd:1d:f4:ba:42:8a:d5:3a:5a:37:29:41:f4:a1:44:1a:
-        bd:e5:8f:1c:80:b8:02:25:d7:c2:80:61:03:6c:25:35:a0:64:
-        be:ba:2d:4a:5e:1f:f5:77:f6:db:34:29:d3:97:3f:44:77:3a:
-        d4:3c:88:74:63:67:de:e7:f7:75:af:56:d0:dc:ff:0c:07:e6:
-        92:67:b1:17:17:a9:aa:e3:31:d3:3b:16:9f:72:56:f2:1f:31:
-        9f:5d:5d:12:87:9e:4a:e3:45:89:4c:89:3d:88:69:05:29:9a:
-        df:7e
+        c9:f9:a9:6a:a1:cc:f7:62:43:13:f5:70:72:63:a1:11:41:76:
+        71:1e:b3:a0:91:11:19:26:61:48:85:57:0d:c4:73:25:59:69:
+        d2:d9:a2:2b:78:ca:df:7b:97:01:d2:27:9c:17:47:0a:f7:7c:
+        af:a0:12:27:67:ef:0e:62:16:75:ca:c6:94:18:b6:59:e5:49:
+        b9:b3:be:41:6d:19:51:fe:ee:37:0a:03:c4:86:d2:d8:67:61:
+        3b:05:78:27:20:e6:01:3d:32:23:97:46:3d:c5:78:53:14:54:
+        bd:bc:00:35:22:aa:1c:6a:09:81:34:ba:ac:9f:31:45:0f:01:
+        51:9f:6e:08:1a:35:c3:bd:b7:3c:9c:d6:99:9b:62:32:b6:1f:
+        99:42:7d:d2:ce:91:f2:c8:7a:a5:c5:ff:bc:fb:ea:67:77:55:
+        d2:e6:fc:59:db:d5:18:e1:0e:ef:c9:c9:a0:93:b6:1c:18:87:
+        35:4b:cf:b2:03:f5:22:04:04:73:82:9b:60:54:e9:a3:98:2b:
+        32:7b:21:ae:22:49:48:57:97:7d:e3:62:ba:36:a5:eb:22:d5:
+        0c:5a:05:50:86:f1:c1:dd:c0:a4:5d:0d:08:bb:39:1f:bf:7f:
+        47:ff:7b:0c:9c:44:fa:49:d0:d6:dc:91:76:ca:45:9c:38:65:
+        f9:bf:83:e6
 ~~~~~BEGIN CERTIFICATE~~~~~
-MIIBxzCCATCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0
+MIICzDCCAbSgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0
 IEludGVybWVkaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBa
-MBsxGTAXBgNVBAMMEFRlc3QgT0NTUCBTaWduZXIwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBALL9+UAJ/wxmgnIsI4K32sQjtmO5LLcmoj5TjyyFyLUWAAmPgfao
-rKVd7Qx4AxMS/z7LwPoJmuLV4LqLWPjXZQ4tJO2UU/+nbLRwkCXuzrq7RtwuJY9r
-m7p+9g0z04si0kDCLb/6W1b6/RUDI6Q7jecssnRrJHzxGEcyS7ahzLVzAgMBAAGj
-FzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4GBAEkLlObC
-P6d9joIqxwxAnzJV+cM53R30ukKK1TpaNylB9KFEGr3ljxyAuAIl18KAYQNsJTWg
-ZL66LUpeH/V39ts0KdOXP0R3OtQ8iHRjZ97n93WvVtDc/wwH5pJnsRcXqarjMdM7
-Fp9yVvIfMZ9dXRKHnkrjRYlMiT2IaQUpmt9+
+MBsxGTAXBgNVBAMMEFRlc3QgT0NTUCBTaWduZXIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCge1r7tz6CN9UHysAZCLdW2y7HLAFIzJuyw4+8g6NIqznC
+Dfp4hY8j433yofTF+vBLvBrBYuy1ZhyEvKJ5RzAGNfQzWK4Wny6b6uSi+OwjOQo4
+mkKYMO/wa1rmG6+7t6q8fGyKUJW1nCBztGGmaFMXlWz7QZmMXmF1Ovb5T9XhNLK1
+2TTwFo03Ow9wnrGWEr6EVN/MfJu4o4l3SRJLWBQcn7HjDHQ3RvoFMxUCA1o67HVF
+atmkwl3BzRwMLKTSv3vgHqNiOFYVIPMUNRHOYZJaP0JhqHIJuO/OUGoTO/Xg1+rk
+0VVMhkH3YLOvcGFwAmfVkzroR2AHHrK3bXozOl3xAgMBAAGjFzAVMBMGA1UdJQQM
+MAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQDJ+alqocz3YkMT9XByY6ER
+QXZxHrOgkREZJmFIhVcNxHMlWWnS2aIreMrfe5cB0iecF0cK93yvoBInZ+8OYhZ1
+ysaUGLZZ5Um5s75BbRlR/u43CgPEhtLYZ2E7BXgnIOYBPTIjl0Y9xXhTFFS9vAA1
+IqocagmBNLqsnzFFDwFRn24IGjXDvbc8nNaZm2Iyth+ZQn3SzpHyyHqlxf+8++pn
+d1XS5vxZ29UY4Q7vycmgk7YcGIc1S8+yA/UiBARzgptgVOmjmCsyeyGuIklIV5d9
+42K6NqXrItUMWgVQhvHB3cCkXQ0Iuzkfv39H/3sMnET6SdDW3JF2ykWcOGX5v4Pm
 ~~~~~END CERTIFICATE~~~~~
 -----BEGIN OCSP RESPONSE-----
-MIIEswoBAKCCBKwwggSoBgkrBgEFBQcwAQEEggSZMIIElTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIHPgoBAKCCBzcwggczBgkrBgEFBQcwAQEEggckMIIHIDCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQEFA4GBAKLTycjRgk6pnHDWU/qewJ9autKmffb9muWBBavN7saoeWYsNE0n
-DnXckSIdhmmx7aBWDxWulTe1iOSTBshI/CpSmyP5biXaqLQu931G7x5ANJEXEpaRIXA+fTvZQF2
-532akBzQNMIZF5Xyv1s2kPHKmUD0aWRE99e/YveGVinlooIIDeDCCA3QwggGlMIIBDqADAgECAg
-ECMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMTcwMTAxMDAwMDAwWhcNM
-TgwMTAxMDAwMDAwWjAfMR0wGwYDVQQDDBRUZXN0IEludGVybWVkaWF0ZSBDQTCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA0XPDsbGQg8fJVA9gFbrXP/+uc2yU5F8pomMLvBAxyUDBIcbaM+t
-dajq04huvUR1eE73Rro57FOBIjmuaQx0G4RXuI0gqbM8IAveI150fwIO0MjG5TGkzcaWA6+7GQ7
-/IEtymeM4BNXzYM2ArEhvyo/jdv0fqVi80oD+PvwwulD0CAwEAATANBgkqhkiG9w0BAQsFAAOBg
-QB7xKYy5ijzCjX98ky0EFeyTQ3jrPhuBFqRBgaY5FJvoIIKualmClXFro1coooztBNo3xcddL0A
-Acci343PWBz0w70CY9aL/HQxcjougdJfaBxBx1Ap7N5CAMr6oUlgRqHaQ0eaLDJEhLvx2ssT1Zx
-WZBBmebHi8G+Gm2RCVCZ6pDCCAccwggEwoAMCAQICAQMwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1
-UEAwwUVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNMTcwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwW
-jAbMRkwFwYDVQQDDBBUZXN0IE9DU1AgU2lnbmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQCy/flACf8MZoJyLCOCt9rEI7ZjuSy3JqI+U48shci1FgAJj4H2qKylXe0MeAMTEv8+y8D6CZr
-i1eC6i1j412UOLSTtlFP/p2y0cJAl7s66u0bcLiWPa5u6fvYNM9OLItJAwi2/+ltW+v0VAyOkO4
-3nLLJ0ayR88RhHMku2ocy1cwIDAQABoxcwFTATBgNVHSUEDDAKBggrBgEFBQcDCTANBgkqhkiG9
-w0BAQsFAAOBgQBJC5Tmwj+nfY6CKscMQJ8yVfnDOd0d9LpCitU6WjcpQfShRBq95Y8cgLgCJdfC
-gGEDbCU1oGS+ui1KXh/1d/bbNCnTlz9EdzrUPIh0Y2fe5/d1r1bQ3P8MB+aSZ7EXF6mq4zHTOxa
-fclbyHzGfXV0Sh55K40WJTIk9iGkFKZrffg==
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQEFA4IBAQBAI+HXlizQ2//deHBvjaeNsQXU329PDKIKvCCoufNcmj2/Osw2
+SUmLt4OBWuclfsO3e2lRB/Jk2Mrjxp6m34sxFZnGitkArPg/mqPljgnrdlkN5C/fwuhhzXKhq8b
+H3OVrlCbWHapQm7l0nPKlwxWFRCTWnEufvjoxIxsC0Xjk3vSWJCXHaTi/cPf3c/wOJF1pvR8mDt
+Gx/5hjprRuoSolCfa8OYcZfpcGoelxGzDDos5ckmewi3FLVjsk8kjH6QJLelG29KnR7gkWjdYXC
+7I+mDOr8NrCY6+FUTCYXG2Ctwlz2D9FYhr+SIhMvQFpvGXnSSovqhO1IuRE84klgJpCoIIFgjCC
+BX4wggKqMIIBkqADAgECAgECMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNVBAMMB1Rlc3QgQ0EwHhc
+NMTcwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjAfMR0wGwYDVQQDDBRUZXN0IEludGVybWVkaW
+F0ZSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4ixZ4nQN+mmX6yUh6v4Vd78
+Uk8HPZNyt6fWlpfmNZ05yD36sTXRhkKRytQjgSA6+ZuNZX4gtDrIVAI4ggUQHtPBpKB0i5ZoCiC
+uer53BTUo9g5tv7Hg3jL0irtb5o6CadlQ2Zj1GeQoB9nynOMrfnUxWcCO5QGrv8r3lyBNHavUTR
+BhEX2UTDNkC66RAcIHYUS82Ws8/WyjEpxVIRO37d8hJe+tHGZDy1PNTwBV0uOf/SYNRupiB1Lul
+tFNMTmlFCzNqp9OEAlOEbxeFLar2NUQNIG5YS5pqZGqSMEwjMQWWNZHzk3LelMl1l3Lm+uE8N6a
+2h0hmrIKLhfOj0cTlMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnDrOYpyiDFiK90+bBLTOEvXg
+wCIPB2eRkHFE7I7RS9eBD8LqMI4gFWqqqxOn/sLCQy36OXeDMLPAdgt8TZlhdYaWRbphRcdRiFl
+45MVB+sQPSahufjSdhRmiu9kJF9LySqV7NVQKuNaP+FziEJ0K7MihErBvmsvFw9ap7C5n5ndZzr
+xDSrZSuEnqvFVu8zqS7kHnY7SMxo+TYggID92E/m3jFfsLOjtkq04ynChx6z4t/phpP5SNxz3Wu
+FbG/c8z15GwS+oGFZpfGCHPWWfVBhWEFGwt+10PjzKHbzWqD9HvenWGx9eRowbrQk34NDJg6J/o
+/wFqs2z83lFJbAt3YTCCAswwggG0oAMCAQICAQMwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAww
+UVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNMTcwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjAbMR
+kwFwYDVQQDDBBUZXN0IE9DU1AgU2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCA
+QEAoHta+7c+gjfVB8rAGQi3VtsuxywBSMybssOPvIOjSKs5wg36eIWPI+N98qH0xfrwS7wawWLs
+tWYchLyieUcwBjX0M1iuFp8um+rkovjsIzkKOJpCmDDv8Gta5huvu7eqvHxsilCVtZwgc7Rhpmh
+TF5Vs+0GZjF5hdTr2+U/V4TSytdk08BaNNzsPcJ6xlhK+hFTfzHybuKOJd0kSS1gUHJ+x4wx0N0
+b6BTMVAgNaOux1RWrZpMJdwc0cDCyk0r974B6jYjhWFSDzFDURzmGSWj9CYahyCbjvzlBqEzv14
+Nfq5NFVTIZB92Czr3BhcAJn1ZM66EdgBx6yt216Mzpd8QIDAQABoxcwFTATBgNVHSUEDDAKBggr
+BgEFBQcDCTANBgkqhkiG9w0BAQsFAAOCAQEAyfmpaqHM92JDE/VwcmOhEUF2cR6zoJERGSZhSIV
+XDcRzJVlp0tmiK3jK33uXAdInnBdHCvd8r6ASJ2fvDmIWdcrGlBi2WeVJubO+QW0ZUf7uNwoDxI
+bS2GdhOwV4JyDmAT0yI5dGPcV4UxRUvbwANSKqHGoJgTS6rJ8xRQ8BUZ9uCBo1w723PJzWmZtiM
+rYfmUJ90s6R8sh6pcX/vPvqZ3dV0ub8WdvVGOEO78nJoJO2HBiHNUvPsgP1IgQEc4KbYFTpo5gr
+MnshriJJSFeXfeNiujal6yLVDFoFUIbxwd3ApF0NCLs5H79/R/97DJxE+knQ1tyRdspFnDhl+b+
+D5g==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -158,37 +220,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -204,37 +287,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -247,9 +351,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem b/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem
index 2aea2f8..3e0d464 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem
@@ -11,21 +11,28 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        13:97:35:03:45:c1:c9:b0:e2:66:b8:ad:ab:27:2f:55:56:37:
-        8c:04:c1:8e:27:1e:00:7b:0c:a4:a4:dc:b5:a7:3c:2f:0b:3e:
-        12:80:81:13:13:cd:39:10:0a:05:2c:9d:4c:09:a0:07:e4:79:
-        79:5a:ff:12:bd:38:03:c1:26:25:03:f2:14:a7:d6:f8:99:14:
-        80:d8:2e:5e:a3:6b:2d:bb:2e:16:30:5f:fb:02:b9:1f:aa:03:
-        b8:b0:86:3f:01:5f:31:20:78:c1:56:23:7a:09:fa:00:9e:ad:
-        7c:c4:09:e3:6e:35:8b:1e:ee:d0:31:f3:f2:eb:6f:da:72:30:
-        81:7a
+        37:cf:6b:84:19:f6:ff:af:6f:1f:41:2d:04:c2:85:26:fa:b8:
+        9f:9a:2d:8d:0a:7d:e1:25:5a:89:ae:3a:a1:9f:45:f5:ce:d1:
+        c2:bc:5b:f5:25:bc:62:86:b3:42:23:48:c9:fc:85:08:bd:66:
+        2c:df:7e:d1:a9:1a:2e:fb:b1:03:ee:d3:db:16:55:cc:8a:69:
+        83:ee:e1:d8:d0:16:dd:3f:ac:91:2c:4a:ef:90:19:a8:e3:98:
+        5d:46:83:f8:48:fc:f2:7b:ba:2e:d1:46:42:48:32:c7:e6:59:
+        bc:de:8a:de:7d:df:60:a7:fa:3c:20:74:10:51:36:10:a3:d3:
+        dd:c4:ad:56:5a:ef:e5:72:90:35:44:5e:09:7d:19:3f:e9:a1:
+        ce:62:f5:7c:e3:30:43:76:8f:1a:6e:2a:78:39:a7:eb:1d:1e:
+        68:f2:26:5c:72:01:ad:91:01:a2:35:f9:f9:e6:c9:95:e0:77:
+        a1:36:c6:30:9f:92:70:a9:4a:f4:b1:e8:9c:b5:c6:38:64:98:
+        3d:0e:e4:a2:b7:42:4e:24:78:44:cb:b7:03:a9:0d:04:61:86:
+        aa:24:c1:bf:e4:49:8a:3d:33:76:cd:1a:fa:57:a3:41:1e:20:
+        48:d3:a4:75:7d:65:3f:66:5a:d6:f4:cb:fe:9f:64:e1:94:1c:
+        ac:bc:e4:68
 Certificate:
     Data:
         Version: 3 (0x2)
@@ -38,55 +45,83 @@
         Subject: CN=Test False OCSP Signer
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:db:b0:d0:fd:f3:30:25:c4:87:d0:a1:8a:36:16:
-                    e8:23:db:1c:b8:09:2f:6f:97:64:c4:52:36:2e:45:
-                    df:02:3c:77:d1:e4:a4:09:b1:67:78:59:7c:6c:b8:
-                    02:56:a5:24:6a:4c:fc:bf:49:b1:6b:95:d6:a7:7f:
-                    73:f2:eb:61:70:f3:ca:c1:19:98:19:92:9b:59:4f:
-                    e7:c5:86:92:17:2a:9a:7c:1d:c8:a6:92:19:72:3b:
-                    43:c2:56:79:b9:29:9c:ee:c7:74:d0:78:17:9e:d3:
-                    d1:09:74:2f:0f:d1:6a:e3:9c:5d:c0:e6:5b:32:f5:
-                    3e:48:90:fc:77:ea:d7:ee:23
+                    00:dc:6e:a6:cc:a1:75:f8:e3:15:ab:6b:49:70:63:
+                    6c:20:5f:ca:c3:51:93:e6:7f:a0:2d:3b:53:7b:d6:
+                    bd:2d:6c:6f:db:a4:c7:51:04:de:77:4e:90:44:0c:
+                    28:1c:0a:e5:bd:e1:74:56:72:dc:1c:30:d0:20:0a:
+                    b6:cb:f7:09:a5:47:ce:bc:9d:ce:59:86:c0:c5:69:
+                    bd:b0:e2:db:28:c8:ef:56:0c:59:31:b2:e9:6c:3c:
+                    a7:c9:ea:27:54:ec:d2:2c:83:82:3e:f7:22:6f:1e:
+                    c7:e4:e8:11:94:23:46:d7:e8:a8:a9:81:40:84:ff:
+                    10:f6:07:a5:a7:1f:3f:0e:95:ed:92:23:bb:49:d5:
+                    df:aa:22:58:b2:0f:1f:aa:1a:a4:16:66:d6:81:cd:
+                    c3:71:dd:d5:06:9a:e7:9b:89:86:80:18:a0:a0:04:
+                    52:9a:5e:17:02:62:cd:5b:7b:ba:78:38:3c:b9:97:
+                    bf:53:77:d4:51:91:25:6e:74:7e:52:6c:9e:12:2a:
+                    17:a7:33:ad:4f:4a:75:ad:3c:44:e4:e3:56:0d:e5:
+                    18:84:19:ee:2c:7c:c7:f7:63:b6:57:b4:5f:c0:77:
+                    d6:f0:fe:47:ac:b3:dc:72:53:23:99:be:6d:8d:2b:
+                    b3:d2:d1:08:74:43:28:b6:b7:b0:56:91:30:bc:1c:
+                    61:df
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        29:35:b5:80:b9:76:94:d6:94:31:61:1f:41:a2:4e:f6:f5:aa:
-        55:94:a4:40:2c:87:a6:3a:be:3e:cb:e5:20:d4:39:23:6a:6d:
-        ef:45:30:db:4f:20:47:45:62:af:cf:9a:06:46:f4:28:55:af:
-        5c:bb:13:ec:91:c3:4d:98:9e:56:26:26:33:e0:dc:e0:56:13:
-        ce:1c:39:45:f2:f9:2a:96:bf:00:f5:0b:89:17:fd:84:b6:09:
-        c1:e4:83:95:a7:52:90:4f:bc:e0:b7:f8:9b:92:bc:ae:96:cb:
-        3f:a3:2e:7a:53:b1:91:0c:e0:95:6e:ae:28:2e:49:3e:f2:42:
-        01:b9
+        2f:e8:b9:d3:b5:10:c5:18:fe:85:2d:5c:1c:93:01:0a:68:ae:
+        38:5a:0e:bd:8a:27:24:d7:c5:d3:dc:3a:42:29:0e:30:ed:a8:
+        be:ae:02:d5:1f:35:a4:8a:e2:9d:ce:f4:2a:15:21:50:2c:63:
+        06:67:e4:93:0d:47:9d:c9:91:ae:74:d7:12:d4:17:ed:87:3b:
+        01:0a:28:ee:45:fd:bf:4b:4d:93:1c:22:29:56:b2:c9:ff:d4:
+        99:39:dd:dc:b6:0d:13:37:7f:46:1d:85:1f:8c:a7:c0:52:8c:
+        09:07:2d:de:9f:4a:f4:91:4e:5a:5b:58:79:a8:40:1c:be:23:
+        e3:47:03:1b:54:1f:c9:80:42:69:fe:d8:78:37:40:d4:8c:4f:
+        b0:00:55:60:be:a3:55:5d:0c:b4:f9:9f:a7:a2:5c:02:a4:af:
+        11:bd:68:df:e7:44:85:9e:60:9a:a8:c6:fb:e5:6f:24:c8:80:
+        b3:97:e3:77:b9:4f:51:46:b0:b5:db:cb:ef:ea:26:12:0f:8c:
+        61:82:60:13:32:34:99:5e:87:b1:d2:60:78:39:a7:3d:f8:46:
+        65:c3:27:ce:3b:d3:65:6a:1b:ca:db:58:ce:af:9d:34:b9:de:
+        aa:cc:ee:c9:83:62:8e:df:00:a4:66:42:62:6f:eb:03:09:17:
+        00:ce:04:66
 ~~~~~BEGIN CERTIFICATE~~~~~
-MIIBtDCCAR2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0
+MIICuTCCAaGgAwIBAgIBBDANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0
 IEludGVybWVkaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBa
-MCExHzAdBgNVBAMMFlRlc3QgRmFsc2UgT0NTUCBTaWduZXIwgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBANuw0P3zMCXEh9ChijYW6CPbHLgJL2+XZMRSNi5F3wI8
-d9HkpAmxZ3hZfGy4AlalJGpM/L9JsWuV1qd/c/LrYXDzysEZmBmSm1lP58WGkhcq
-mnwdyKaSGXI7Q8JWebkpnO7HdNB4F57T0Ql0Lw/RauOcXcDmWzL1PkiQ/Hfq1+4j
-AgMBAAEwDQYJKoZIhvcNAQELBQADgYEAKTW1gLl2lNaUMWEfQaJO9vWqVZSkQCyH
-pjq+PsvlINQ5I2pt70Uw208gR0Vir8+aBkb0KFWvXLsT7JHDTZieViYmM+Dc4FYT
-zhw5RfL5Kpa/APULiRf9hLYJweSDladSkE+84Lf4m5K8rpbLP6MuelOxkQzglW6u
-KC5JPvJCAbk=
+MCExHzAdBgNVBAMMFlRlc3QgRmFsc2UgT0NTUCBTaWduZXIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDcbqbMoXX44xWra0lwY2wgX8rDUZPmf6AtO1N7
+1r0tbG/bpMdRBN53TpBEDCgcCuW94XRWctwcMNAgCrbL9wmlR868nc5ZhsDFab2w
+4tsoyO9WDFkxsulsPKfJ6idU7NIsg4I+9yJvHsfk6BGUI0bX6KipgUCE/xD2B6Wn
+Hz8Ole2SI7tJ1d+qIliyDx+qGqQWZtaBzcNx3dUGmuebiYaAGKCgBFKaXhcCYs1b
+e7p4ODy5l79Td9RRkSVudH5SbJ4SKhenM61PSnWtPETk41YN5RiEGe4sfMf3Y7ZX
+tF/Ad9bw/kess9xyUyOZvm2NK7PS0Qh0Qyi2t7BWkTC8HGHfAgMBAAEwDQYJKoZI
+hvcNAQELBQADggEBAC/oudO1EMUY/oUtXByTAQporjhaDr2KJyTXxdPcOkIpDjDt
+qL6uAtUfNaSK4p3O9CoVIVAsYwZn5JMNR53Jka501xLUF+2HOwEKKO5F/b9LTZMc
+IilWssn/1Jk53dy2DRM3f0YdhR+Mp8BSjAkHLd6fSvSRTlpbWHmoQBy+I+NHAxtU
+H8mAQmn+2Hg3QNSMT7AAVWC+o1VdDLT5n6eiXAKkrxG9aN/nRIWeYJqoxvvlbyTI
+gLOX43e5T1FGsLXby+/qJhIPjGGCYBMyNJleh7HSYHg5pz34RmXDJ84702VqG8rb
+WM6vnTS53qrM7smDYo7fAKRmQmJv6wMJFwDOBGY=
 ~~~~~END CERTIFICATE~~~~~
 -----BEGIN OCSP RESPONSE-----
-MIIC+QoBAKCCAvIwggLuBgkrBgEFBQcwAQEEggLfMIIC2zCBh6EjMCExHzAdBgNVBAMMFlRlc3Q
+MIIEfwoBAKCCBHgwggR0BgkrBgEFBQcwAQEEggRlMIIEYTCBh6EjMCExHzAdBgNVBAMMFlRlc3Q
 gRmFsc2UgT0NTUCBTaWduZXIYDzIwMTcwMzAyMDAwMDAwWjBPME0wODAHBgUrDgMCGgQURJscWz
-HG6ZkJZlI+ScP3c8AkGQoEFE0aTOZaM+k2oWs/YsAio6YsLuphAgEFgAAYDzIwMTcwMzAxMDAwM
-DAwWjALBgkqhkiG9w0BAQUDgYEAE5c1A0XBybDiZritqycvVVY3jATBjiceAHsMpKTctac8Lws+
-EoCBExPNORAKBSydTAmgB+R5eVr/Er04A8EmJQPyFKfW+JkUgNguXqNrLbsuFjBf+wK5H6oDuLC
-GPwFfMSB4wVYjegn6AJ6tfMQJ4241ix7u0DHz8utv2nIwgXqgggG8MIIBuDCCAbQwggEdoAMCAQ
-ICAQQwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNM
-TcwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjAhMR8wHQYDVQQDDBZUZXN0IEZhbHNlIE9DU1Ag
-U2lnbmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbsND98zAlxIfQoYo2Fugj2xy4CS9
-vl2TEUjYuRd8CPHfR5KQJsWd4WXxsuAJWpSRqTPy/SbFrldanf3Py62Fw88rBGZgZkptZT+fFhp
-IXKpp8HcimkhlyO0PCVnm5KZzux3TQeBee09EJdC8P0WrjnF3A5lsy9T5IkPx36tfuIwIDAQABM
-A0GCSqGSIb3DQEBCwUAA4GBACk1tYC5dpTWlDFhH0GiTvb1qlWUpEAsh6Y6vj7L5SDUOSNqbe9F
-MNtPIEdFYq/PmgZG9ChVr1y7E+yRw02YnlYmJjPg3OBWE84cOUXy+SqWvwD1C4kX/YS2CcHkg5W
-nUpBPvOC3+JuSvK6Wyz+jLnpTsZEM4JVuriguST7yQgG5
+HG6ZkJZlI+ScP3c8AkGQoEFCqGAHHJsaIHw7AL3alBEiM9IyC4AgEFgAAYDzIwMTcwMzAxMDAwM
+DAwWjALBgkqhkiG9w0BAQUDggEBADfPa4QZ9v+vbx9BLQTChSb6uJ+aLY0KfeElWomuOqGfRfXO
+0cK8W/UlvGKGs0IjSMn8hQi9ZizfftGpGi77sQPu09sWVcyKaYPu4djQFt0/rJEsSu+QGajjmF1
+Gg/hI/PJ7ui7RRkJIMsfmWbzeit5932Cn+jwgdBBRNhCj093ErVZa7+VykDVEXgl9GT/poc5i9X
+zjMEN2jxpuKng5p+sdHmjyJlxyAa2RAaI1+fnmyZXgd6E2xjCfknCpSvSx6Jy1xjhkmD0O5KK3Q
+k4keETLtwOpDQRhhqokwb/kSYo9M3bNGvpXo0EeIEjTpHV9ZT9mWtb0y/6fZOGUHKy85GigggLB
+MIICvTCCArkwggGhoAMCAQICAQQwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUVGVzdCBJbnR
+lcm1lZGlhdGUgQ0EwHhcNMTcwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjAhMR8wHQYDVQQDDB
+ZUZXN0IEZhbHNlIE9DU1AgU2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3
+G6mzKF1+OMVq2tJcGNsIF/Kw1GT5n+gLTtTe9a9LWxv26THUQTed06QRAwoHArlveF0VnLcHDDQ
+IAq2y/cJpUfOvJ3OWYbAxWm9sOLbKMjvVgxZMbLpbDynyeonVOzSLIOCPvcibx7H5OgRlCNG1+i
+oqYFAhP8Q9gelpx8/DpXtkiO7SdXfqiJYsg8fqhqkFmbWgc3Dcd3VBprnm4mGgBigoARSml4XAm
+LNW3u6eDg8uZe/U3fUUZElbnR+UmyeEioXpzOtT0p1rTxE5ONWDeUYhBnuLHzH92O2V7RfwHfW8
+P5HrLPcclMjmb5tjSuz0tEIdEMotrewVpEwvBxh3wIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAv
+6LnTtRDFGP6FLVwckwEKaK44Wg69iick18XT3DpCKQ4w7ai+rgLVHzWkiuKdzvQqFSFQLGMGZ+S
+TDUedyZGudNcS1BfthzsBCijuRf2/S02THCIpVrLJ/9SZOd3ctg0TN39GHYUfjKfAUowJBy3en0
+r0kU5aW1h5qEAcviPjRwMbVB/JgEJp/th4N0DUjE+wAFVgvqNVXQy0+Z+nolwCpK8RvWjf50SFn
+mCaqMb75W8kyICzl+N3uU9RRrC128vv6iYSD4xhgmATMjSZXoex0mB4Oac9+EZlwyfOO9NlahvK
+21jOr500ud6qzO7Jg2KO3wCkZkJib+sDCRcAzgRm
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -102,37 +137,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -148,37 +204,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -191,9 +268,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem b/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem
index 90f110e..5149ef4 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem
@@ -11,28 +11,37 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        a2:d3:c9:c8:d1:82:4e:a9:9c:70:d6:53:fa:9e:c0:9f:5a:ba:
-        d2:a6:7d:f6:fd:9a:e5:81:05:ab:cd:ee:c6:a8:79:66:2c:34:
-        4d:27:0e:75:dc:91:22:1d:86:69:b1:ed:a0:56:0f:15:ae:95:
-        37:b5:88:e4:93:06:c8:48:fc:2a:52:9b:23:f9:6e:25:da:a8:
-        b4:2e:f7:7d:46:ef:1e:40:34:91:17:12:96:91:21:70:3e:7d:
-        3b:d9:40:5d:b9:df:66:a4:07:34:0d:30:86:45:e5:7c:af:d6:
-        cd:a4:3c:72:a6:50:3d:1a:59:11:3d:f5:ef:d8:bd:e1:95:8a:
-        79:68
+        40:23:e1:d7:96:2c:d0:db:ff:dd:78:70:6f:8d:a7:8d:b1:05:
+        d4:df:6f:4f:0c:a2:0a:bc:20:a8:b9:f3:5c:9a:3d:bf:3a:cc:
+        36:49:49:8b:b7:83:81:5a:e7:25:7e:c3:b7:7b:69:51:07:f2:
+        64:d8:ca:e3:c6:9e:a6:df:8b:31:15:99:c6:8a:d9:00:ac:f8:
+        3f:9a:a3:e5:8e:09:eb:76:59:0d:e4:2f:df:c2:e8:61:cd:72:
+        a1:ab:c6:c7:dc:e5:6b:94:26:d6:1d:aa:50:9b:b9:74:9c:f2:
+        a5:c3:15:85:44:24:d6:9c:4b:9f:be:3a:31:23:1b:02:d1:78:
+        e4:de:f4:96:24:25:c7:69:38:bf:70:f7:f7:73:fc:0e:24:5d:
+        69:bd:1f:26:0e:d1:b1:ff:98:63:a6:b4:6e:a1:2a:25:09:f6:
+        bc:39:87:19:7e:97:06:a1:e9:71:1b:30:c3:a2:ce:5c:92:67:
+        b0:8b:71:4b:56:3b:24:f2:48:c7:e9:02:4b:7a:51:b6:f4:a9:
+        d1:ee:09:16:8d:d6:17:0b:b2:3e:98:33:ab:f0:da:c2:63:af:
+        85:51:30:98:5c:6d:82:b7:09:73:d8:3f:45:62:1a:fe:48:88:
+        4c:bd:01:69:bc:65:e7:49:2a:2f:aa:13:b5:22:e4:44:f3:89:
+        25:80:9a:42
 -----BEGIN OCSP RESPONSE-----
-MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBuAoBAKCCAbEwggGtBgkrBgEFBQcwAQEEggGeMIIBmjCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQEFA4GBAKLTycjRgk6pnHDWU/qewJ9autKmffb9muWBBavN7saoeWYsNE0n
-DnXckSIdhmmx7aBWDxWulTe1iOSTBshI/CpSmyP5biXaqLQu931G7x5ANJEXEpaRIXA+fTvZQF2
-532akBzQNMIZF5Xyv1s2kPHKmUD0aWRE99e/YveGVinlo
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQEFA4IBAQBAI+HXlizQ2//deHBvjaeNsQXU329PDKIKvCCoufNcmj2/Osw2
+SUmLt4OBWuclfsO3e2lRB/Jk2Mrjxp6m34sxFZnGitkArPg/mqPljgnrdlkN5C/fwuhhzXKhq8b
+H3OVrlCbWHapQm7l0nPKlwxWFRCTWnEufvjoxIxsC0Xjk3vSWJCXHaTi/cPf3c/wOJF1pvR8mDt
+Gx/5hjprRuoSolCfa8OYcZfpcGoelxGzDDos5ckmewi3FLVjsk8kjH6QJLelG29KnR7gkWjdYXC
+7I+mDOr8NrCY6+FUTCYXG2Ctwlz2D9FYhr+SIhMvQFpvGXnSSovqhO1IuRE84klgJpC
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem b/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem
index 77be3ad..1995e4e 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem
@@ -11,21 +11,28 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        85:22:7d:bb:89:34:3e:66:73:10:68:1d:21:d2:a9:70:4e:54:
-        1c:9a:90:fa:79:b1:e0:35:34:c5:3c:4c:03:d3:b8:34:6c:62:
-        a6:67:14:9b:9a:ed:b6:ef:85:9e:b2:8c:4b:f9:af:87:db:49:
-        84:88:0d:00:49:8b:49:29:a2:bb:52:5c:17:0a:1b:6c:73:35:
-        74:42:fe:ba:09:f4:a4:2d:ad:83:0d:28:17:52:40:d8:aa:56:
-        8b:e6:96:8a:ff:68:d6:08:8f:79:09:60:87:89:b0:2b:f3:9c:
-        43:0e:41:c4:21:68:96:dd:35:fb:b0:83:e9:9f:5d:01:72:c2:
-        25:42
+        03:7f:dc:4f:62:ae:a8:ed:b6:97:10:f0:c6:84:d2:28:6f:e7:
+        92:2d:18:7a:c5:33:77:2b:17:95:a7:93:20:6a:93:02:d8:57:
+        f8:b4:c3:9a:aa:0e:9f:d6:80:b8:31:df:35:a6:d4:06:e2:fb:
+        6e:96:7b:b9:0f:97:23:6b:10:86:89:7e:fc:e6:54:11:e8:1f:
+        a2:a2:5f:67:e4:49:2c:40:d3:98:9f:97:f6:50:37:6c:39:d1:
+        df:39:fd:d2:ba:48:9b:b1:c4:c4:b3:dd:8c:9e:9e:0d:24:f3:
+        df:7e:28:d3:33:77:a9:43:a8:52:ad:01:c5:8d:c7:cb:7a:3e:
+        b0:59:80:72:5a:80:87:73:82:9e:b4:d4:d6:af:da:71:56:c5:
+        8e:1e:9c:16:f6:94:d2:8e:a6:bc:1f:4f:cd:6c:b8:1b:7a:a1:
+        dc:de:c9:97:2f:1e:23:85:ce:33:b4:2a:57:b6:7e:bf:3e:c5:
+        1e:2f:d5:4b:97:04:ea:2d:ab:2e:e0:88:d6:49:de:92:76:5c:
+        e7:bf:98:71:9e:e0:c2:f8:b0:8c:4f:34:e5:87:0a:dd:9b:59:
+        14:38:60:1c:c4:5a:0b:fc:d5:79:1a:4c:6d:af:9a:a6:c6:dc:
+        c3:f6:80:7b:ff:f9:63:3a:21:e8:ce:ed:ad:31:a5:97:25:6a:
+        b0:1f:89:7f
 Certificate:
     Data:
         Version: 3 (0x2)
@@ -38,58 +45,86 @@
         Subject: CN=Test OCSP Signer
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:b2:fd:f9:40:09:ff:0c:66:82:72:2c:23:82:b7:
-                    da:c4:23:b6:63:b9:2c:b7:26:a2:3e:53:8f:2c:85:
-                    c8:b5:16:00:09:8f:81:f6:a8:ac:a5:5d:ed:0c:78:
-                    03:13:12:ff:3e:cb:c0:fa:09:9a:e2:d5:e0:ba:8b:
-                    58:f8:d7:65:0e:2d:24:ed:94:53:ff:a7:6c:b4:70:
-                    90:25:ee:ce:ba:bb:46:dc:2e:25:8f:6b:9b:ba:7e:
-                    f6:0d:33:d3:8b:22:d2:40:c2:2d:bf:fa:5b:56:fa:
-                    fd:15:03:23:a4:3b:8d:e7:2c:b2:74:6b:24:7c:f1:
-                    18:47:32:4b:b6:a1:cc:b5:73
+                    00:a0:7b:5a:fb:b7:3e:82:37:d5:07:ca:c0:19:08:
+                    b7:56:db:2e:c7:2c:01:48:cc:9b:b2:c3:8f:bc:83:
+                    a3:48:ab:39:c2:0d:fa:78:85:8f:23:e3:7d:f2:a1:
+                    f4:c5:fa:f0:4b:bc:1a:c1:62:ec:b5:66:1c:84:bc:
+                    a2:79:47:30:06:35:f4:33:58:ae:16:9f:2e:9b:ea:
+                    e4:a2:f8:ec:23:39:0a:38:9a:42:98:30:ef:f0:6b:
+                    5a:e6:1b:af:bb:b7:aa:bc:7c:6c:8a:50:95:b5:9c:
+                    20:73:b4:61:a6:68:53:17:95:6c:fb:41:99:8c:5e:
+                    61:75:3a:f6:f9:4f:d5:e1:34:b2:b5:d9:34:f0:16:
+                    8d:37:3b:0f:70:9e:b1:96:12:be:84:54:df:cc:7c:
+                    9b:b8:a3:89:77:49:12:4b:58:14:1c:9f:b1:e3:0c:
+                    74:37:46:fa:05:33:15:02:03:5a:3a:ec:75:45:6a:
+                    d9:a4:c2:5d:c1:cd:1c:0c:2c:a4:d2:bf:7b:e0:1e:
+                    a3:62:38:56:15:20:f3:14:35:11:ce:61:92:5a:3f:
+                    42:61:a8:72:09:b8:ef:ce:50:6a:13:3b:f5:e0:d7:
+                    ea:e4:d1:55:4c:86:41:f7:60:b3:af:70:61:70:02:
+                    67:d5:93:3a:e8:47:60:07:1e:b2:b7:6d:7a:33:3a:
+                    5d:f1
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Extended Key Usage: 
                 OCSP Signing
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        49:0b:94:e6:c2:3f:a7:7d:8e:82:2a:c7:0c:40:9f:32:55:f9:
-        c3:39:dd:1d:f4:ba:42:8a:d5:3a:5a:37:29:41:f4:a1:44:1a:
-        bd:e5:8f:1c:80:b8:02:25:d7:c2:80:61:03:6c:25:35:a0:64:
-        be:ba:2d:4a:5e:1f:f5:77:f6:db:34:29:d3:97:3f:44:77:3a:
-        d4:3c:88:74:63:67:de:e7:f7:75:af:56:d0:dc:ff:0c:07:e6:
-        92:67:b1:17:17:a9:aa:e3:31:d3:3b:16:9f:72:56:f2:1f:31:
-        9f:5d:5d:12:87:9e:4a:e3:45:89:4c:89:3d:88:69:05:29:9a:
-        df:7e
+        c9:f9:a9:6a:a1:cc:f7:62:43:13:f5:70:72:63:a1:11:41:76:
+        71:1e:b3:a0:91:11:19:26:61:48:85:57:0d:c4:73:25:59:69:
+        d2:d9:a2:2b:78:ca:df:7b:97:01:d2:27:9c:17:47:0a:f7:7c:
+        af:a0:12:27:67:ef:0e:62:16:75:ca:c6:94:18:b6:59:e5:49:
+        b9:b3:be:41:6d:19:51:fe:ee:37:0a:03:c4:86:d2:d8:67:61:
+        3b:05:78:27:20:e6:01:3d:32:23:97:46:3d:c5:78:53:14:54:
+        bd:bc:00:35:22:aa:1c:6a:09:81:34:ba:ac:9f:31:45:0f:01:
+        51:9f:6e:08:1a:35:c3:bd:b7:3c:9c:d6:99:9b:62:32:b6:1f:
+        99:42:7d:d2:ce:91:f2:c8:7a:a5:c5:ff:bc:fb:ea:67:77:55:
+        d2:e6:fc:59:db:d5:18:e1:0e:ef:c9:c9:a0:93:b6:1c:18:87:
+        35:4b:cf:b2:03:f5:22:04:04:73:82:9b:60:54:e9:a3:98:2b:
+        32:7b:21:ae:22:49:48:57:97:7d:e3:62:ba:36:a5:eb:22:d5:
+        0c:5a:05:50:86:f1:c1:dd:c0:a4:5d:0d:08:bb:39:1f:bf:7f:
+        47:ff:7b:0c:9c:44:fa:49:d0:d6:dc:91:76:ca:45:9c:38:65:
+        f9:bf:83:e6
 ~~~~~BEGIN CERTIFICATE~~~~~
-MIIBxzCCATCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0
+MIICzDCCAbSgAwIBAgIBAzANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0
 IEludGVybWVkaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBa
-MBsxGTAXBgNVBAMMEFRlc3QgT0NTUCBTaWduZXIwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBALL9+UAJ/wxmgnIsI4K32sQjtmO5LLcmoj5TjyyFyLUWAAmPgfao
-rKVd7Qx4AxMS/z7LwPoJmuLV4LqLWPjXZQ4tJO2UU/+nbLRwkCXuzrq7RtwuJY9r
-m7p+9g0z04si0kDCLb/6W1b6/RUDI6Q7jecssnRrJHzxGEcyS7ahzLVzAgMBAAGj
-FzAVMBMGA1UdJQQMMAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4GBAEkLlObC
-P6d9joIqxwxAnzJV+cM53R30ukKK1TpaNylB9KFEGr3ljxyAuAIl18KAYQNsJTWg
-ZL66LUpeH/V39ts0KdOXP0R3OtQ8iHRjZ97n93WvVtDc/wwH5pJnsRcXqarjMdM7
-Fp9yVvIfMZ9dXRKHnkrjRYlMiT2IaQUpmt9+
+MBsxGTAXBgNVBAMMEFRlc3QgT0NTUCBTaWduZXIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCge1r7tz6CN9UHysAZCLdW2y7HLAFIzJuyw4+8g6NIqznC
+Dfp4hY8j433yofTF+vBLvBrBYuy1ZhyEvKJ5RzAGNfQzWK4Wny6b6uSi+OwjOQo4
+mkKYMO/wa1rmG6+7t6q8fGyKUJW1nCBztGGmaFMXlWz7QZmMXmF1Ovb5T9XhNLK1
+2TTwFo03Ow9wnrGWEr6EVN/MfJu4o4l3SRJLWBQcn7HjDHQ3RvoFMxUCA1o67HVF
+atmkwl3BzRwMLKTSv3vgHqNiOFYVIPMUNRHOYZJaP0JhqHIJuO/OUGoTO/Xg1+rk
+0VVMhkH3YLOvcGFwAmfVkzroR2AHHrK3bXozOl3xAgMBAAGjFzAVMBMGA1UdJQQM
+MAoGCCsGAQUFBwMJMA0GCSqGSIb3DQEBCwUAA4IBAQDJ+alqocz3YkMT9XByY6ER
+QXZxHrOgkREZJmFIhVcNxHMlWWnS2aIreMrfe5cB0iecF0cK93yvoBInZ+8OYhZ1
+ysaUGLZZ5Um5s75BbRlR/u43CgPEhtLYZ2E7BXgnIOYBPTIjl0Y9xXhTFFS9vAA1
+IqocagmBNLqsnzFFDwFRn24IGjXDvbc8nNaZm2Iyth+ZQn3SzpHyyHqlxf+8++pn
+d1XS5vxZ29UY4Q7vycmgk7YcGIc1S8+yA/UiBARzgptgVOmjmCsyeyGuIklIV5d9
+42K6NqXrItUMWgVQhvHB3cCkXQ0Iuzkfv39H/3sMnET6SdDW3JF2ykWcOGX5v4Pm
 ~~~~~END CERTIFICATE~~~~~
 -----BEGIN OCSP RESPONSE-----
-MIIDBgoBAKCCAv8wggL7BgkrBgEFBQcwAQEEggLsMIIC6DCBgaEdMBsxGTAXBgNVBAMMEFRlc3Q
+MIIEjAoBAKCCBIUwggSBBgkrBgEFBQcwAQEEggRyMIIEbjCBgaEdMBsxGTAXBgNVBAMMEFRlc3Q
 gT0NTUCBTaWduZXIYDzIwMTcwMzAyMDAwMDAwWjBPME0wODAHBgUrDgMCGgQURJscWzHG6ZkJZl
-I+ScP3c8AkGQoEFE0aTOZaM+k2oWs/YsAio6YsLuphAgEFgAAYDzIwMTcwMzAxMDAwMDAwWjALB
-gkqhkiG9w0BAQUDgYEAhSJ9u4k0PmZzEGgdIdKpcE5UHJqQ+nmx4DU0xTxMA9O4NGxipmcUm5rt
-tu+FnrKMS/mvh9tJhIgNAEmLSSmiu1JcFwobbHM1dEL+ugn0pC2tgw0oF1JA2KpWi+aWiv9o1gi
-PeQlgh4mwK/OcQw5BxCFolt01+7CD6Z9dAXLCJUKgggHPMIIByzCCAccwggEwoAMCAQICAQMwDQ
-YJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNMTcwMTAxM
-DAwMDAwWhcNMTgwMTAxMDAwMDAwWjAbMRkwFwYDVQQDDBBUZXN0IE9DU1AgU2lnbmVyMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCy/flACf8MZoJyLCOCt9rEI7ZjuSy3JqI+U48shci1FgA
-Jj4H2qKylXe0MeAMTEv8+y8D6CZri1eC6i1j412UOLSTtlFP/p2y0cJAl7s66u0bcLiWPa5u6fv
-YNM9OLItJAwi2/+ltW+v0VAyOkO43nLLJ0ayR88RhHMku2ocy1cwIDAQABoxcwFTATBgNVHSUED
-DAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsFAAOBgQBJC5Tmwj+nfY6CKscMQJ8yVfnDOd0d9LpC
-itU6WjcpQfShRBq95Y8cgLgCJdfCgGEDbCU1oGS+ui1KXh/1d/bbNCnTlz9EdzrUPIh0Y2fe5/d
-1r1bQ3P8MB+aSZ7EXF6mq4zHTOxafclbyHzGfXV0Sh55K40WJTIk9iGkFKZrffg==
+I+ScP3c8AkGQoEFCqGAHHJsaIHw7AL3alBEiM9IyC4AgEFgAAYDzIwMTcwMzAxMDAwMDAwWjALB
+gkqhkiG9w0BAQUDggEBAAN/3E9irqjttpcQ8MaE0ihv55ItGHrFM3crF5WnkyBqkwLYV/i0w5qq
+Dp/WgLgx3zWm1Abi+26We7kPlyNrEIaJfvzmVBHoH6KiX2fkSSxA05ifl/ZQN2w50d85/dK6SJu
+xxMSz3Yyeng0k899+KNMzd6lDqFKtAcWNx8t6PrBZgHJagIdzgp601Nav2nFWxY4enBb2lNKOpr
+wfT81suBt6odzeyZcvHiOFzjO0Kle2fr8+xR4v1UuXBOotqy7giNZJ3pJ2XOe/mHGe4ML4sIxPN
+OWHCt2bWRQ4YBzEWgv81XkaTG2vmqbG3MP2gHv/+WM6IejO7a0xpZclarAfiX+gggLUMIIC0DCC
+AswwggG0oAMCAQICAQMwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGl
+hdGUgQ0EwHhcNMTcwMTAxMDAwMDAwWhcNMTgwMTAxMDAwMDAwWjAbMRkwFwYDVQQDDBBUZXN0IE
+9DU1AgU2lnbmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoHta+7c+gjfVB8rAG
+Qi3VtsuxywBSMybssOPvIOjSKs5wg36eIWPI+N98qH0xfrwS7wawWLstWYchLyieUcwBjX0M1iu
+Fp8um+rkovjsIzkKOJpCmDDv8Gta5huvu7eqvHxsilCVtZwgc7RhpmhTF5Vs+0GZjF5hdTr2+U/
+V4TSytdk08BaNNzsPcJ6xlhK+hFTfzHybuKOJd0kSS1gUHJ+x4wx0N0b6BTMVAgNaOux1RWrZpM
+Jdwc0cDCyk0r974B6jYjhWFSDzFDURzmGSWj9CYahyCbjvzlBqEzv14Nfq5NFVTIZB92Czr3Bhc
+AJn1ZM66EdgBx6yt216Mzpd8QIDAQABoxcwFTATBgNVHSUEDDAKBggrBgEFBQcDCTANBgkqhkiG
+9w0BAQsFAAOCAQEAyfmpaqHM92JDE/VwcmOhEUF2cR6zoJERGSZhSIVXDcRzJVlp0tmiK3jK33u
+XAdInnBdHCvd8r6ASJ2fvDmIWdcrGlBi2WeVJubO+QW0ZUf7uNwoDxIbS2GdhOwV4JyDmAT0yI5
+dGPcV4UxRUvbwANSKqHGoJgTS6rJ8xRQ8BUZ9uCBo1w723PJzWmZtiMrYfmUJ90s6R8sh6pcX/v
+PvqZ3dV0ub8WdvVGOEO78nJoJO2HBiHNUvPsgP1IgQEc4KbYFTpo5grMnshriJJSFeXfeNiujal
+6yLVDFoFUIbxwd3ApF0NCLs5H79/R/97DJxE+knQ1tyRdspFnDhl+b+D5g==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -105,37 +140,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -151,37 +207,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -194,9 +271,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem b/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem
index 7618f00..965c549 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem
@@ -11,28 +11,37 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        85:22:7d:bb:89:34:3e:66:73:10:68:1d:21:d2:a9:70:4e:54:
-        1c:9a:90:fa:79:b1:e0:35:34:c5:3c:4c:03:d3:b8:34:6c:62:
-        a6:67:14:9b:9a:ed:b6:ef:85:9e:b2:8c:4b:f9:af:87:db:49:
-        84:88:0d:00:49:8b:49:29:a2:bb:52:5c:17:0a:1b:6c:73:35:
-        74:42:fe:ba:09:f4:a4:2d:ad:83:0d:28:17:52:40:d8:aa:56:
-        8b:e6:96:8a:ff:68:d6:08:8f:79:09:60:87:89:b0:2b:f3:9c:
-        43:0e:41:c4:21:68:96:dd:35:fb:b0:83:e9:9f:5d:01:72:c2:
-        25:42
+        03:7f:dc:4f:62:ae:a8:ed:b6:97:10:f0:c6:84:d2:28:6f:e7:
+        92:2d:18:7a:c5:33:77:2b:17:95:a7:93:20:6a:93:02:d8:57:
+        f8:b4:c3:9a:aa:0e:9f:d6:80:b8:31:df:35:a6:d4:06:e2:fb:
+        6e:96:7b:b9:0f:97:23:6b:10:86:89:7e:fc:e6:54:11:e8:1f:
+        a2:a2:5f:67:e4:49:2c:40:d3:98:9f:97:f6:50:37:6c:39:d1:
+        df:39:fd:d2:ba:48:9b:b1:c4:c4:b3:dd:8c:9e:9e:0d:24:f3:
+        df:7e:28:d3:33:77:a9:43:a8:52:ad:01:c5:8d:c7:cb:7a:3e:
+        b0:59:80:72:5a:80:87:73:82:9e:b4:d4:d6:af:da:71:56:c5:
+        8e:1e:9c:16:f6:94:d2:8e:a6:bc:1f:4f:cd:6c:b8:1b:7a:a1:
+        dc:de:c9:97:2f:1e:23:85:ce:33:b4:2a:57:b6:7e:bf:3e:c5:
+        1e:2f:d5:4b:97:04:ea:2d:ab:2e:e0:88:d6:49:de:92:76:5c:
+        e7:bf:98:71:9e:e0:c2:f8:b0:8c:4f:34:e5:87:0a:dd:9b:59:
+        14:38:60:1c:c4:5a:0b:fc:d5:79:1a:4c:6d:af:9a:a6:c6:dc:
+        c3:f6:80:7b:ff:f9:63:3a:21:e8:ce:ed:ad:31:a5:97:25:6a:
+        b0:1f:89:7f
 -----BEGIN OCSP RESPONSE-----
-MIIBMwoBAKCCASwwggEoBgkrBgEFBQcwAQEEggEZMIIBFTCBgaEdMBsxGTAXBgNVBAMMEFRlc3Q
+MIIBtAoBAKCCAa0wggGpBgkrBgEFBQcwAQEEggGaMIIBljCBgaEdMBsxGTAXBgNVBAMMEFRlc3Q
 gT0NTUCBTaWduZXIYDzIwMTcwMzAyMDAwMDAwWjBPME0wODAHBgUrDgMCGgQURJscWzHG6ZkJZl
-I+ScP3c8AkGQoEFE0aTOZaM+k2oWs/YsAio6YsLuphAgEFgAAYDzIwMTcwMzAxMDAwMDAwWjALB
-gkqhkiG9w0BAQUDgYEAhSJ9u4k0PmZzEGgdIdKpcE5UHJqQ+nmx4DU0xTxMA9O4NGxipmcUm5rt
-tu+FnrKMS/mvh9tJhIgNAEmLSSmiu1JcFwobbHM1dEL+ugn0pC2tgw0oF1JA2KpWi+aWiv9o1gi
-PeQlgh4mwK/OcQw5BxCFolt01+7CD6Z9dAXLCJUI=
+I+ScP3c8AkGQoEFCqGAHHJsaIHw7AL3alBEiM9IyC4AgEFgAAYDzIwMTcwMzAxMDAwMDAwWjALB
+gkqhkiG9w0BAQUDggEBAAN/3E9irqjttpcQ8MaE0ihv55ItGHrFM3crF5WnkyBqkwLYV/i0w5qq
+Dp/WgLgx3zWm1Abi+26We7kPlyNrEIaJfvzmVBHoH6KiX2fkSSxA05ifl/ZQN2w50d85/dK6SJu
+xxMSz3Yyeng0k899+KNMzd6lDqFKtAcWNx8t6PrBZgHJagIdzgp601Nav2nFWxY4enBb2lNKOpr
+wfT81suBt6odzeyZcvHiOFzjO0Kle2fr8+xR4v1UuXBOotqy7giNZJ3pJ2XOe/mHGe4ML4sIxPN
+OWHCt2bWRQ4YBzEWgv81XkaTG2vmqbG3MP2gHv/+WM6IejO7a0xpZclarAfiX8=
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/other_response.pem b/pki/testdata/ocsp_unittest/other_response.pem
index 7955e8e..da1b1ad 100644
--- a/pki/testdata/ocsp_unittest/other_response.pem
+++ b/pki/testdata/ocsp_unittest/other_response.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 00F1CA5C7F4C394343B0D13EB6F6941F464C16C4
-      Issuer Key Hash: AAA51ACB83F631013018F584C75208BABA6F6849
+      Issuer Key Hash: 0820C74D8A1E60E7B90868067CD88336AE57C09F
       Serial Number: 06
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
@@ -19,7 +19,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 00F1CA5C7F4C394343B0D13EB6F6941F464C16C4
-      Issuer Key Hash: AAA51ACB83F631013018F584C75208BABA6F6849
+      Issuer Key Hash: 0820C74D8A1E60E7B90868067CD88336AE57C09F
       Serial Number: 06
     Cert Status: revoked
     Revocation Time: Feb  1 00:00:00 2017 GMT
@@ -27,23 +27,32 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        94:53:ad:e5:be:87:ed:10:ea:73:f1:d8:5e:ea:c0:40:08:86:
-        c3:57:a3:7e:15:fa:9c:63:ad:3f:63:d8:aa:a8:e9:ba:c4:a5:
-        d3:11:ea:2f:86:43:da:a1:36:cf:55:0d:6d:4a:28:13:2e:ed:
-        1f:2e:62:d0:d6:71:0f:54:c2:22:03:8e:af:c1:4d:85:26:8b:
-        da:53:cf:20:c0:b6:37:19:8a:ec:89:ee:f3:61:d9:78:a6:82:
-        2a:db:4a:e1:75:dc:91:a1:6c:db:5e:d5:1e:bc:ff:1a:a1:00:
-        62:af:07:af:df:b8:9d:13:59:b6:27:13:a3:d0:ad:d8:c8:34:
-        99:6d
+        b6:d5:54:fd:d4:70:10:99:a7:fd:23:be:e3:d3:ea:9d:5e:00:
+        bd:4e:11:34:4e:97:68:ec:15:49:1b:ff:50:89:bb:8e:0d:e5:
+        54:30:1d:ec:d0:5f:2f:ca:ef:4e:7f:fb:6a:8b:8a:ac:c6:67:
+        b1:a8:16:de:b2:37:32:ea:93:7d:e4:20:33:49:07:46:44:f2:
+        63:be:0b:6c:07:66:d6:c1:bf:96:f2:a9:22:1a:2e:a5:5d:65:
+        35:db:9f:6a:25:0a:02:ee:79:a7:06:4f:1f:0e:05:c6:6a:04:
+        7f:df:b8:f2:23:c1:ab:54:15:96:63:4d:f7:7a:9b:66:4a:75:
+        97:98:3e:12:5a:c0:17:f9:da:3a:0e:61:02:1a:04:65:4c:b8:
+        90:82:1b:64:11:fa:0c:0e:d4:aa:7d:6b:10:82:7d:4d:3c:2b:
+        d8:b4:72:6b:6d:7b:25:8b:fb:58:0d:a0:94:21:32:ac:0f:b8:
+        1c:df:e1:26:b3:c2:10:84:bc:1b:a9:62:e7:4e:cb:8f:8e:f4:
+        9f:24:7e:89:f7:39:65:0b:1c:59:d6:3c:c3:50:cc:85:65:5a:
+        fb:99:16:51:d1:da:6a:67:fa:fc:20:2e:16:40:51:f3:15:7b:
+        35:f4:60:c6:e9:d0:39:22:1f:22:ad:46:28:98:b1:08:75:80:
+        4e:4c:ec:4d
 -----BEGIN OCSP RESPONSE-----
-MIIBmAoBAKCCAZEwggGNBgkrBgEFBQcwAQEEggF+MIIBejCB5qEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIICGQoBAKCCAhIwggIOBgkrBgEFBQcwAQEEggH/MIIB+zCB5qEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowga8wTTA4MAcGBSsOAwIaBBQA8cpcf0
-w5Q0Ow0T629pQfRkwWxAQUqqUay4P2MQEwGPWEx1IIurpvaEkCAQaAABgPMjAxNzAzMDEwMDAwM
-DBaMF4wODAHBgUrDgMCGgQUAPHKXH9MOUNDsNE+tvaUH0ZMFsQEFKqlGsuD9jEBMBj1hMdSCLq6
-b2hJAgEGoREYDzIwMTcwMjAxMDAwMDAwWhgPMjAxNzAzMDEwMDAwMDBaMAsGCSqGSIb3DQEBBQO
-BgQCUU63lvoftEOpz8dhe6sBACIbDV6N+FfqcY60/Y9iqqOm6xKXTEeovhkPaoTbPVQ1tSigTLu
-0fLmLQ1nEPVMIiA46vwU2FJovaU88gwLY3GYrsie7zYdl4poIq20rhddyRoWzbXtUevP8aoQBir
-wev37idE1m2JxOj0K3YyDSZbQ==
+w5Q0Ow0T629pQfRkwWxAQUCCDHTYoeYOe5CGgGfNiDNq5XwJ8CAQaAABgPMjAxNzAzMDEwMDAwM
+DBaMF4wODAHBgUrDgMCGgQUAPHKXH9MOUNDsNE+tvaUH0ZMFsQEFAggx02KHmDnuQhoBnzYgzau
+V8CfAgEGoREYDzIwMTcwMjAxMDAwMDAwWhgPMjAxNzAzMDEwMDAwMDBaMAsGCSqGSIb3DQEBBQO
+CAQEAttVU/dRwEJmn/SO+49PqnV4AvU4RNE6XaOwVSRv/UIm7jg3lVDAd7NBfL8rvTn/7aouKrM
+ZnsagW3rI3MuqTfeQgM0kHRkTyY74LbAdm1sG/lvKpIhoupV1lNdufaiUKAu55pwZPHw4FxmoEf
+9+48iPBq1QVlmNN93qbZkp1l5g+ElrAF/naOg5hAhoEZUy4kIIbZBH6DA7Uqn1rEIJ9TTwr2LRy
+a217JYv7WA2glCEyrA+4HN/hJrPCEIS8G6li507Lj470nyR+ifc5ZQscWdY8w1DMhWVa+5kWUdH
+aamf6/CAuFkBR8xV7NfRgxunQOSIfIq1GKJixCHWATkzsTQ==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -59,37 +68,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -105,37 +135,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -148,9 +199,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/responder_id.pem b/pki/testdata/ocsp_unittest/responder_id.pem
index 38a7f1f..5abc8e9 100644
--- a/pki/testdata/ocsp_unittest/responder_id.pem
+++ b/pki/testdata/ocsp_unittest/responder_id.pem
@@ -5,34 +5,43 @@
     OCSP Response Status: successful (0x0)
     Response Type: Basic OCSP Response
     Version: 1 (0x0)
-    Responder Id: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+    Responder Id: 2A860071C9B1A207C3B00BDDA94112233D2320B8
     Produced At: Mar  2 00:00:00 2017 GMT
     Responses:
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        a5:3b:c6:c4:6f:5a:47:87:32:6d:b1:bd:c1:c7:a0:9e:47:66:
-        52:2d:6d:b0:e8:5b:7c:66:81:53:65:90:42:0e:31:b4:62:b9:
-        24:73:56:b7:a3:a4:1a:e5:dc:03:23:22:f8:d5:dc:61:9c:3f:
-        e3:df:a6:37:94:b5:55:9f:96:39:3e:a5:a7:c6:c5:a9:b7:d7:
-        a6:4a:00:72:93:a6:91:c7:9c:69:dd:16:df:99:e0:71:04:93:
-        c7:a7:74:fe:43:fa:cf:74:e1:16:ba:16:a0:d9:97:fc:b4:be:
-        d2:9e:fd:bc:b2:ff:6a:8c:2d:ae:12:a4:bd:6f:b9:47:9f:aa:
-        38:1d
+        cf:cb:20:da:62:e8:e2:da:91:ac:47:7b:3e:75:58:c4:1e:d3:
+        4d:dd:4d:33:16:1d:bc:66:0f:6b:8a:22:bc:3b:db:7b:94:e2:
+        31:3b:c7:9e:4e:33:ab:d1:80:b8:75:41:64:6c:7d:0e:39:41:
+        45:44:77:48:ec:27:1f:cd:49:3c:1a:46:dc:83:3d:9d:09:e8:
+        0b:44:b6:99:ad:c2:2f:e9:d7:10:23:ee:95:d7:7d:99:48:9c:
+        1b:11:0c:2f:0d:6d:b7:7f:44:d9:0a:21:1c:7f:be:e2:ff:85:
+        b4:e2:7b:2b:8c:16:60:83:6a:b1:80:49:e9:e5:b5:cc:99:62:
+        5a:7d:36:e3:75:c9:71:79:d2:14:6b:0c:ab:18:51:18:4f:a3:
+        5e:21:73:55:7b:f8:8a:6f:a9:dc:8a:f4:17:d1:8f:c5:ee:3a:
+        92:ba:71:a5:9a:88:4f:f1:05:82:25:73:e8:83:9e:58:fc:04:
+        c2:fe:8a:48:19:19:b1:fd:01:75:4d:55:7a:37:cd:00:3f:4b:
+        3a:52:fc:b9:ba:2b:72:69:9e:9a:a0:e1:ac:0e:56:3d:14:d5:
+        b2:89:d9:ea:00:9c:7f:13:aa:e5:c1:16:cf:61:e4:61:50:32:
+        18:00:9c:93:2b:ab:b9:76:c5:19:d9:8d:88:06:84:ff:1e:e5:
+        00:a9:68:c4
 -----BEGIN OCSP RESPONSE-----
-MIIBKwoBAKCCASQwggEgBgkrBgEFBQcwAQEEggERMIIBDTB6ohYEFE0aTOZaM+k2oWs/YsAio6Y
-sLuphGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxumZCWZSPknD93PAJB
-kKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwMFowCwYJKoZIhvcNA
-QEFA4GBAKU7xsRvWkeHMm2xvcHHoJ5HZlItbbDoW3xmgVNlkEIOMbRiuSRzVrejpBrl3AMjIvjV
-3GGcP+PfpjeUtVWfljk+pafGxam316ZKAHKTppHHnGndFt+Z4HEEk8endP5D+s904Ra6FqDZl/y
-0vtKe/byy/2qMLa4SpL1vuUefqjgd
+MIIBrAoBAKCCAaUwggGhBgkrBgEFBQcwAQEEggGSMIIBjjB6ohYEFCqGAHHJsaIHw7AL3alBEiM
+9IyC4GA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxumZCWZSPknD93PAJB
+kKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwMFowCwYJKoZIhvcNA
+QEFA4IBAQDPyyDaYuji2pGsR3s+dVjEHtNN3U0zFh28Zg9riiK8O9t7lOIxO8eeTjOr0YC4dUFk
+bH0OOUFFRHdI7CcfzUk8Gkbcgz2dCegLRLaZrcIv6dcQI+6V132ZSJwbEQwvDW23f0TZCiEcf77
+i/4W04nsrjBZgg2qxgEnp5bXMmWJafTbjdclxedIUawyrGFEYT6NeIXNVe/iKb6ncivQX0Y/F7j
+qSunGlmohP8QWCJXPog55Y/ATC/opIGRmx/QF1TVV6N80AP0s6Uvy5uityaZ6aoOGsDlY9FNWyi
+dnqAJx/E6rlwRbPYeRhUDIYAJyTK6u5dsUZ2Y2IBoT/HuUAqWjE
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/responder_name.pem b/pki/testdata/ocsp_unittest/responder_name.pem
index c77d419..7113c6a 100644
--- a/pki/testdata/ocsp_unittest/responder_name.pem
+++ b/pki/testdata/ocsp_unittest/responder_name.pem
@@ -11,28 +11,37 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: good
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        a2:d3:c9:c8:d1:82:4e:a9:9c:70:d6:53:fa:9e:c0:9f:5a:ba:
-        d2:a6:7d:f6:fd:9a:e5:81:05:ab:cd:ee:c6:a8:79:66:2c:34:
-        4d:27:0e:75:dc:91:22:1d:86:69:b1:ed:a0:56:0f:15:ae:95:
-        37:b5:88:e4:93:06:c8:48:fc:2a:52:9b:23:f9:6e:25:da:a8:
-        b4:2e:f7:7d:46:ef:1e:40:34:91:17:12:96:91:21:70:3e:7d:
-        3b:d9:40:5d:b9:df:66:a4:07:34:0d:30:86:45:e5:7c:af:d6:
-        cd:a4:3c:72:a6:50:3d:1a:59:11:3d:f5:ef:d8:bd:e1:95:8a:
-        79:68
+        40:23:e1:d7:96:2c:d0:db:ff:dd:78:70:6f:8d:a7:8d:b1:05:
+        d4:df:6f:4f:0c:a2:0a:bc:20:a8:b9:f3:5c:9a:3d:bf:3a:cc:
+        36:49:49:8b:b7:83:81:5a:e7:25:7e:c3:b7:7b:69:51:07:f2:
+        64:d8:ca:e3:c6:9e:a6:df:8b:31:15:99:c6:8a:d9:00:ac:f8:
+        3f:9a:a3:e5:8e:09:eb:76:59:0d:e4:2f:df:c2:e8:61:cd:72:
+        a1:ab:c6:c7:dc:e5:6b:94:26:d6:1d:aa:50:9b:b9:74:9c:f2:
+        a5:c3:15:85:44:24:d6:9c:4b:9f:be:3a:31:23:1b:02:d1:78:
+        e4:de:f4:96:24:25:c7:69:38:bf:70:f7:f7:73:fc:0e:24:5d:
+        69:bd:1f:26:0e:d1:b1:ff:98:63:a6:b4:6e:a1:2a:25:09:f6:
+        bc:39:87:19:7e:97:06:a1:e9:71:1b:30:c3:a2:ce:5c:92:67:
+        b0:8b:71:4b:56:3b:24:f2:48:c7:e9:02:4b:7a:51:b6:f4:a9:
+        d1:ee:09:16:8d:d6:17:0b:b2:3e:98:33:ab:f0:da:c2:63:af:
+        85:51:30:98:5c:6d:82:b7:09:73:d8:3f:45:62:1a:fe:48:88:
+        4c:bd:01:69:bc:65:e7:49:2a:2f:aa:13:b5:22:e4:44:f3:89:
+        25:80:9a:42
 -----BEGIN OCSP RESPONSE-----
-MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBuAoBAKCCAbEwggGtBgkrBgEFBQcwAQEEggGeMIIBmjCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYAAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQEFA4GBAKLTycjRgk6pnHDWU/qewJ9autKmffb9muWBBavN7saoeWYsNE0n
-DnXckSIdhmmx7aBWDxWulTe1iOSTBshI/CpSmyP5biXaqLQu931G7x5ANJEXEpaRIXA+fTvZQF2
-532akBzQNMIZF5Xyv1s2kPHKmUD0aWRE99e/YveGVinlo
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYAAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQEFA4IBAQBAI+HXlizQ2//deHBvjaeNsQXU329PDKIKvCCoufNcmj2/Osw2
+SUmLt4OBWuclfsO3e2lRB/Jk2Mrjxp6m34sxFZnGitkArPg/mqPljgnrdlkN5C/fwuhhzXKhq8b
+H3OVrlCbWHapQm7l0nPKlwxWFRCTWnEufvjoxIxsC0Xjk3vSWJCXHaTi/cPf3c/wOJF1pvR8mDt
+Gx/5hjprRuoSolCfa8OYcZfpcGoelxGzDDos5ckmewi3FLVjsk8kjH6QJLelG29KnR7gkWjdYXC
+7I+mDOr8NrCY6+FUTCYXG2Ctwlz2D9FYhr+SIhMvQFpvGXnSSovqhO1IuRE84klgJpC
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/revoke_response.pem b/pki/testdata/ocsp_unittest/revoke_response.pem
index 885cb3f..8730dd9 100644
--- a/pki/testdata/ocsp_unittest/revoke_response.pem
+++ b/pki/testdata/ocsp_unittest/revoke_response.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: revoked
     Revocation Time: Feb  1 00:00:00 2017 GMT
@@ -19,21 +19,31 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        42:97:68:70:51:65:fa:7d:a3:46:dd:cb:15:74:a7:1c:0d:86:
-        4b:39:38:74:24:9f:35:c0:d8:64:cb:5a:8d:b0:da:9d:f0:f3:
-        50:44:39:d0:30:f4:c5:89:34:52:57:18:72:d4:c6:63:9a:6c:
-        6a:de:ec:21:8e:79:48:49:c0:ab:34:95:be:dd:82:dd:21:01:
-        f8:dc:57:57:63:dd:97:24:57:fb:f5:af:3b:10:f5:7b:d3:b2:
-        22:98:dc:eb:91:26:bf:16:12:27:0d:f6:42:f9:b4:96:41:d6:
-        36:2b:d4:25:c6:b7:f2:84:b7:ab:98:f3:ca:7d:44:72:b5:81:
-        d2:db
+        63:67:4d:cb:70:18:1d:c8:99:2a:b6:dc:1d:27:8e:cb:27:c7:
+        8e:b5:b1:e0:f8:d5:fc:18:95:b9:ae:42:12:66:b7:a0:78:31:
+        ab:c1:4a:62:32:51:c9:47:30:e5:a8:c8:10:1d:ee:18:ac:1d:
+        92:52:ba:17:9b:ca:a9:eb:94:f6:05:f0:b6:14:6c:83:26:d3:
+        c2:a0:c6:68:d1:f6:4f:f7:ac:9d:a1:30:9a:b1:2c:7d:63:06:
+        a3:1f:82:fc:fa:30:ef:8f:a3:1b:80:d6:22:40:13:28:47:53:
+        10:6f:44:a3:a1:73:33:1b:5c:22:9f:66:9b:52:f9:b0:7e:39:
+        6e:34:bb:24:18:5f:98:cf:6b:a9:3b:ee:8b:ff:cc:2a:86:c4:
+        b8:61:7e:49:e3:27:05:03:e3:6e:ed:98:88:d8:56:6d:eb:8a:
+        12:8d:dc:88:f4:67:58:62:c1:bf:be:30:e4:90:41:39:2e:a3:
+        ce:82:03:21:57:55:1c:cc:ec:fd:48:e9:b3:f7:70:e1:a6:41:
+        a1:24:3e:e1:69:a0:28:f0:ee:bc:ff:06:21:f3:d6:08:b6:9d:
+        ad:c6:7a:ba:57:b0:20:51:11:93:9d:2c:31:36:33:bc:3d:cf:
+        a8:64:ec:d0:77:be:8b:6b:da:21:ac:97:f7:41:8e:26:21:5f:
+        dc:74:76:cc
 -----BEGIN OCSP RESPONSE-----
-MIIBSAoBAKCCAUEwggE9BgkrBgEFBQcwAQEEggEuMIIBKjCBlqEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIByQoBAKCCAcIwggG+BgkrBgEFBQcwAQEEggGvMIIBqzCBlqEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowYDBeMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBaERGA8yMDE3MDIwMTAwMDAwM
-FoYDzIwMTcwMzAxMDAwMDAwWjALBgkqhkiG9w0BAQUDgYEAQpdocFFl+n2jRt3LFXSnHA2GSzk4
-dCSfNcDYZMtajbDanfDzUEQ50DD0xYk0UlcYctTGY5psat7sIY55SEnAqzSVvt2C3SEB+NxXV2P
-dlyRX+/WvOxD1e9OyIpjc65EmvxYSJw32Qvm0lkHWNivUJca38oS3q5jzyn1EcrWB0ts=
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBaERGA8yMDE3MDIwMTAwMDAwM
+FoYDzIwMTcwMzAxMDAwMDAwWjALBgkqhkiG9w0BAQUDggEBAGNnTctwGB3ImSq23B0njssnx461
+seD41fwYlbmuQhJmt6B4MavBSmIyUclHMOWoyBAd7hisHZJSuhebyqnrlPYF8LYUbIMm08Kgxmj
+R9k/3rJ2hMJqxLH1jBqMfgvz6MO+PoxuA1iJAEyhHUxBvRKOhczMbXCKfZptS+bB+OW40uyQYX5
+jPa6k77ov/zCqGxLhhfknjJwUD427tmIjYVm3rihKN3Ij0Z1hiwb++MOSQQTkuo86CAyFXVRzM7
+P1I6bP3cOGmQaEkPuFpoCjw7rz/BiHz1gi2na3GerpXsCBREZOdLDE2M7w9z6hk7NB3votr2iGs
+l/dBjiYhX9x0dsw=
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -49,37 +59,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -95,37 +126,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -138,9 +190,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/revoke_response_reason.pem b/pki/testdata/ocsp_unittest/revoke_response_reason.pem
index 0a2823c..377d06a 100644
--- a/pki/testdata/ocsp_unittest/revoke_response_reason.pem
+++ b/pki/testdata/ocsp_unittest/revoke_response_reason.pem
@@ -11,7 +11,7 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: revoked
     Revocation Time: Feb  1 00:00:00 2017 GMT
@@ -20,22 +20,31 @@
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        a9:41:dc:18:d7:b7:8f:09:09:c2:c0:26:ae:0e:69:15:3b:be:
-        82:8c:e0:83:9c:17:b5:11:54:ab:98:dd:ea:0a:71:7b:49:ee:
-        20:22:db:e6:72:24:a0:ef:77:b2:e7:86:52:5f:0e:ae:53:f4:
-        23:cb:ca:93:a1:68:bd:95:12:2c:ff:80:f1:e5:7c:d0:43:ca:
-        e5:dc:73:08:e4:6f:b1:a6:f4:1b:f9:31:83:f6:0b:4d:f0:2c:
-        bd:38:23:cb:73:8f:1d:58:f2:5b:5c:7a:19:60:6a:6e:46:91:
-        81:39:a6:a0:bb:21:fb:54:5c:56:2b:e1:0f:6e:50:62:ab:f7:
-        0c:9c
+        42:83:b3:16:7f:af:df:dd:9b:66:c0:f6:d2:53:1d:dd:ef:cf:
+        93:56:7b:01:4f:ae:35:65:b9:6f:95:dc:81:e2:ae:b7:64:2d:
+        5d:cf:06:13:89:91:b0:95:ad:0d:5a:c4:5f:65:24:c9:79:ab:
+        ac:88:6e:67:98:60:cc:a8:d2:12:7e:e3:77:83:e9:8e:b9:54:
+        65:83:24:71:58:eb:b6:e5:c8:8f:e8:bf:b9:6d:43:97:0e:07:
+        14:af:98:e5:8e:07:7c:1b:a4:fd:63:20:20:23:78:b9:4f:7c:
+        1c:82:67:3b:29:33:22:ff:b8:04:c7:e8:d8:32:b1:e6:88:3c:
+        dc:ae:84:20:d5:19:42:34:91:61:50:4d:a4:96:fc:c0:98:0f:
+        64:f5:c7:9e:04:0a:8a:38:88:9d:7c:c7:83:01:74:fb:e0:03:
+        d3:f9:eb:7a:d2:7b:c8:93:f4:ae:b5:cc:4b:5c:f9:21:cd:c9:
+        51:b7:42:d0:9c:ae:da:a1:4d:25:7a:5d:46:c7:3e:c4:cb:01:
+        e5:7f:63:ed:9e:b8:dc:84:ee:ed:1c:34:f8:cf:2b:25:5c:da:
+        3f:ce:88:30:ff:41:28:c4:73:10:6e:57:17:d1:b6:14:e6:84:
+        8f:ac:59:0f:9f:f6:bb:61:be:e0:cc:7c:a0:07:d0:ea:bb:5a:
+        5e:28:56:98
 -----BEGIN OCSP RESPONSE-----
-MIIBTQoBAKCCAUYwggFCBgkrBgEFBQcwAQEEggEzMIIBLzCBm6EhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBzgoBAKCCAccwggHDBgkrBgEFBQcwAQEEggG0MIIBsDCBm6EhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowZTBjMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBaEWGA8yMDE3MDIwMTAwMDAwM
-FqgAwoBARgPMjAxNzAzMDEwMDAwMDBaMAsGCSqGSIb3DQEBBQOBgQCpQdwY17ePCQnCwCauDmkV
-O76CjOCDnBe1EVSrmN3qCnF7Se4gItvmciSg73ey54ZSXw6uU/Qjy8qToWi9lRIs/4Dx5XzQQ8r
-l3HMI5G+xpvQb+TGD9gtN8Cy9OCPLc48dWPJbXHoZYGpuRpGBOaaguyH7VFxWK+EPblBiq/cMnA
-==
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBaEWGA8yMDE3MDIwMTAwMDAwM
+FqgAwoBARgPMjAxNzAzMDEwMDAwMDBaMAsGCSqGSIb3DQEBBQOCAQEAQoOzFn+v392bZsD20lMd
+3e/Pk1Z7AU+uNWW5b5XcgeKut2QtXc8GE4mRsJWtDVrEX2UkyXmrrIhuZ5hgzKjSEn7jd4Ppjrl
+UZYMkcVjrtuXIj+i/uW1Dlw4HFK+Y5Y4HfBuk/WMgICN4uU98HIJnOykzIv+4BMfo2DKx5og83K
+6EINUZQjSRYVBNpJb8wJgPZPXHngQKijiInXzHgwF0++AD0/nretJ7yJP0rrXMS1z5Ic3JUbdC0
+Jyu2qFNJXpdRsc+xMsB5X9j7Z643ITu7Rw0+M8rJVzaP86IMP9BKMRzEG5XF9G2FOaEj6xZD5/2
+u2G+4Mx8oAfQ6rtaXihWmA==
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -51,37 +60,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -97,37 +127,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -140,9 +191,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----
diff --git a/pki/testdata/ocsp_unittest/unknown_response.pem b/pki/testdata/ocsp_unittest/unknown_response.pem
index 6cd33ce..b8c8d90 100644
--- a/pki/testdata/ocsp_unittest/unknown_response.pem
+++ b/pki/testdata/ocsp_unittest/unknown_response.pem
@@ -11,28 +11,37 @@
     Certificate ID:
       Hash Algorithm: sha1
       Issuer Name Hash: 449B1C5B31C6E9990966523E49C3F773C024190A
-      Issuer Key Hash: 4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+      Issuer Key Hash: 2A860071C9B1A207C3B00BDDA94112233D2320B8
       Serial Number: 05
     Cert Status: unknown
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
     Signature Value:
-        af:71:a8:a5:37:71:93:25:e5:90:d2:21:45:f5:60:df:55:33:
-        f1:3c:c2:32:f3:9f:9b:de:ba:4c:45:90:32:f2:46:69:09:50:
-        7a:8a:70:ab:a7:78:38:31:a0:a6:a7:06:9b:57:63:30:12:9e:
-        65:03:0e:db:76:2b:83:a2:7c:bb:46:48:f6:3b:d2:b0:ef:d4:
-        d9:f5:a2:3a:ac:a9:08:d1:4f:46:93:8f:3e:d0:ac:db:e6:91:
-        74:ea:aa:98:95:57:ed:b2:52:5f:4a:db:33:f8:16:a7:03:f3:
-        ba:fd:fb:04:3d:94:b3:87:77:b8:90:b4:9e:b7:ba:ce:45:cc:
-        39:4f
+        47:31:75:66:65:10:ba:23:82:31:84:05:c3:c2:78:93:c3:80:
+        80:73:21:5c:51:c5:aa:65:28:bd:1c:f1:91:10:33:90:a4:3f:
+        26:85:e5:6e:46:c4:2c:20:fb:3f:25:20:41:83:3e:7a:ec:cd:
+        7c:ca:f8:28:67:be:aa:65:79:e8:0b:65:58:26:d0:17:2f:b7:
+        68:fb:5d:a1:a8:99:09:6e:bd:13:7e:3b:4f:99:13:72:a7:f0:
+        a5:72:c2:e7:9e:50:78:c8:d9:29:3e:c6:93:52:73:1b:bb:f8:
+        f4:91:80:b3:8c:a6:98:35:62:04:08:93:2e:a7:d5:cd:ad:e2:
+        64:e2:03:f8:6e:29:2b:56:e1:1a:71:79:56:8c:36:ab:bf:dc:
+        a4:ab:af:db:1b:27:6b:fe:f8:17:85:cc:61:23:2e:33:8b:34:
+        66:e3:c2:2c:a3:23:d7:c5:00:95:01:fb:07:c1:b9:25:ce:2b:
+        c4:9a:db:a1:28:94:70:72:ea:d9:3c:da:23:6e:52:33:87:1a:
+        64:b6:4b:ba:ca:b0:dd:3c:58:49:ac:a4:7a:af:4e:62:74:3f:
+        2e:0b:94:bd:e9:c1:2d:71:36:3d:60:0d:8a:f7:da:df:94:80:
+        59:ba:00:d1:1c:e8:39:4e:65:6e:ac:76:15:67:ef:6d:4f:41:
+        2d:c9:b6:76
 -----BEGIN OCSP RESPONSE-----
-MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
+MIIBuAoBAKCCAbEwggGtBgkrBgEFBQcwAQEEggGeMIIBmjCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
-mZCWZSPknD93PAJBkKBBRNGkzmWjPpNqFrP2LAIqOmLC7qYQIBBYIAGA8yMDE3MDMwMTAwMDAwM
-FowCwYJKoZIhvcNAQEFA4GBAK9xqKU3cZMl5ZDSIUX1YN9VM/E8wjLzn5veukxFkDLyRmkJUHqK
-cKuneDgxoKanBptXYzASnmUDDtt2K4OifLtGSPY70rDv1Nn1ojqsqQjRT0aTjz7QrNvmkXTqqpi
-VV+2yUl9K2zP4FqcD87r9+wQ9lLOHd7iQtJ63us5FzDlP
+mZCWZSPknD93PAJBkKBBQqhgBxybGiB8OwC92pQRIjPSMguAIBBYIAGA8yMDE3MDMwMTAwMDAwM
+FowCwYJKoZIhvcNAQEFA4IBAQBHMXVmZRC6I4IxhAXDwniTw4CAcyFcUcWqZSi9HPGREDOQpD8m
+heVuRsQsIPs/JSBBgz567M18yvgoZ76qZXnoC2VYJtAXL7do+12hqJkJbr0TfjtPmRNyp/ClcsL
+nnlB4yNkpPsaTUnMbu/j0kYCzjKaYNWIECJMup9XNreJk4gP4bikrVuEacXlWjDarv9ykq6/bGy
+dr/vgXhcxhIy4zizRm48IsoyPXxQCVAfsHwbklzivEmtuhKJRwcurZPNojblIzhxpktku6yrDdP
+FhJrKR6r05idD8uC5S96cEtcTY9YA2K99rflIBZugDRHOg5TmVurHYVZ+9tT0EtybZ2
 -----END OCSP RESPONSE-----
 
 $ openssl x509 -text < [CA CERTIFICATE]
@@ -48,37 +57,58 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:d1:73:c3:b1:b1:90:83:c7:c9:54:0f:60:15:ba:
-                    d7:3f:ff:ae:73:6c:94:e4:5f:29:a2:63:0b:bc:10:
-                    31:c9:40:c1:21:c6:da:33:eb:5d:6a:3a:b4:e2:1b:
-                    af:51:1d:5e:13:bd:d1:ae:8e:7b:14:e0:48:8e:6b:
-                    9a:43:1d:06:e1:15:ee:23:48:2a:6c:cf:08:02:f7:
-                    88:d7:9d:1f:c0:83:b4:32:31:b9:4c:69:33:71:a5:
-                    80:eb:ee:c6:43:bf:c8:12:dc:a6:78:ce:01:35:7c:
-                    d8:33:60:2b:12:1b:f2:a3:f8:dd:bf:47:ea:56:2f:
-                    34:a0:3f:8f:bf:0c:2e:94:3d
+                    00:de:22:c5:9e:27:40:df:a6:99:7e:b2:52:1e:af:
+                    e1:57:7b:f1:49:3c:1c:f6:4d:ca:de:9f:5a:5a:5f:
+                    98:d6:74:e7:20:f7:ea:c4:d7:46:19:0a:47:2b:50:
+                    8e:04:80:eb:e6:6e:35:95:f8:82:d0:eb:21:50:08:
+                    e2:08:14:40:7b:4f:06:92:81:d2:2e:59:a0:28:82:
+                    b9:ea:f9:dc:14:d4:a3:d8:39:b6:fe:c7:83:78:cb:
+                    d2:2a:ed:6f:9a:3a:09:a7:65:43:66:63:d4:67:90:
+                    a0:1f:67:ca:73:8c:ad:f9:d4:c5:67:02:3b:94:06:
+                    ae:ff:2b:de:5c:81:34:76:af:51:34:41:84:45:f6:
+                    51:30:cd:90:2e:ba:44:07:08:1d:85:12:f3:65:ac:
+                    f3:f5:b2:8c:4a:71:54:84:4e:df:b7:7c:84:97:be:
+                    b4:71:99:0f:2d:4f:35:3c:01:57:4b:8e:7f:f4:98:
+                    35:1b:a9:88:1d:4b:ba:5b:45:34:c4:e6:94:50:b3:
+                    36:aa:7d:38:40:25:38:46:f1:78:52:da:af:63:54:
+                    40:d2:06:e5:84:b9:a6:a6:46:a9:23:04:c2:33:10:
+                    59:63:59:1f:39:37:2d:e9:4c:97:59:77:2e:6f:ae:
+                    13:c3:7a:6b:68:74:86:6a:c8:28:b8:5f:3a:3d:1c:
+                    4e:53
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        7b:c4:a6:32:e6:28:f3:0a:35:fd:f2:4c:b4:10:57:b2:4d:0d:
-        e3:ac:f8:6e:04:5a:91:06:06:98:e4:52:6f:a0:82:0a:b9:a9:
-        66:0a:55:c5:ae:8d:5c:a2:8a:33:b4:13:68:df:17:1d:74:bd:
-        00:01:c7:22:df:8d:cf:58:1c:f4:c3:bd:02:63:d6:8b:fc:74:
-        31:72:3a:2e:81:d2:5f:68:1c:41:c7:50:29:ec:de:42:00:ca:
-        fa:a1:49:60:46:a1:da:43:47:9a:2c:32:44:84:bb:f1:da:cb:
-        13:d5:9c:56:64:10:66:79:b1:e2:f0:6f:86:9b:64:42:54:26:
-        7a:a4
+        9c:3a:ce:62:9c:a2:0c:58:8a:f7:4f:9b:04:b4:ce:12:f5:e0:
+        c0:22:0f:07:67:91:90:71:44:ec:8e:d1:4b:d7:81:0f:c2:ea:
+        30:8e:20:15:6a:aa:ab:13:a7:fe:c2:c2:43:2d:fa:39:77:83:
+        30:b3:c0:76:0b:7c:4d:99:61:75:86:96:45:ba:61:45:c7:51:
+        88:59:78:e4:c5:41:fa:c4:0f:49:a8:6e:7e:34:9d:85:19:a2:
+        bb:d9:09:17:d2:f2:4a:a5:7b:35:54:0a:b8:d6:8f:f8:5c:e2:
+        10:9d:0a:ec:c8:a1:12:b0:6f:9a:cb:c5:c3:d6:a9:ec:2e:67:
+        e6:77:59:ce:bc:43:4a:b6:52:b8:49:ea:bc:55:6e:f3:3a:92:
+        ee:41:e7:63:b4:8c:c6:8f:93:62:08:08:0f:dd:84:fe:6d:e3:
+        15:fb:0b:3a:3b:64:ab:4e:32:9c:28:71:eb:3e:2d:fe:98:69:
+        3f:94:8d:c7:3d:d6:b8:56:c6:fd:cf:33:d7:91:b0:4b:ea:06:
+        15:9a:5f:18:21:cf:59:67:d5:06:15:84:14:6c:2d:fb:5d:0f:
+        8f:32:87:6f:35:aa:0f:d1:ef:7a:75:86:c7:d7:91:a3:06:eb:
+        42:4d:f8:34:32:60:e8:9f:e8:ff:01:6a:b3:6c:fc:de:51:49:
+        6c:0b:77:61
 -----BEGIN CA CERTIFICATE-----
-MIIBpTCCAQ6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
+MIICqjCCAZKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdUZXN0IENBMB4XDTE
 3MDEwMTAwMDAwMFoXDTE4MDEwMTAwMDAwMFowHzEdMBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdG
-UgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANFzw7GxkIPHyVQPYBW61z//rnNslORfK
-aJjC7wQMclAwSHG2jPrXWo6tOIbr1EdXhO90a6OexTgSI5rmkMdBuEV7iNIKmzPCAL3iNedH8CD
-tDIxuUxpM3GlgOvuxkO/yBLcpnjOATV82DNgKxIb8qP43b9H6lYvNKA/j78MLpQ9AgMBAAEwDQY
-JKoZIhvcNAQELBQADgYEAe8SmMuYo8wo1/fJMtBBXsk0N46z4bgRakQYGmORSb6CCCrmpZgpVxa
-6NXKKKM7QTaN8XHXS9AAHHIt+Nz1gc9MO9AmPWi/x0MXI6LoHSX2gcQcdQKezeQgDK+qFJYEah2
-kNHmiwyRIS78drLE9WcVmQQZnmx4vBvhptkQlQmeqQ=
+UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIsWeJ0Dfppl+slIer+FXe/FJP
+Bz2Tcren1paX5jWdOcg9+rE10YZCkcrUI4EgOvmbjWV+ILQ6yFQCOIIFEB7TwaSgdIuWaAogrnq
++dwU1KPYObb+x4N4y9Iq7W+aOgmnZUNmY9RnkKAfZ8pzjK351MVnAjuUBq7/K95cgTR2r1E0QYR
+F9lEwzZAuukQHCB2FEvNlrPP1soxKcVSETt+3fISXvrRxmQ8tTzU8AVdLjn/0mDUbqYgdS7pbRT
+TE5pRQszaqfThAJThG8XhS2q9jVEDSBuWEuaamRqkjBMIzEFljWR85Ny3pTJdZdy5vrhPDemtod
+IZqyCi4Xzo9HE5TAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJw6zmKcogxYivdPmwS0zhL14MAi
+DwdnkZBxROyO0UvXgQ/C6jCOIBVqqqsTp/7CwkMt+jl3gzCzwHYLfE2ZYXWGlkW6YUXHUYhZeOT
+FQfrED0mobn40nYUZorvZCRfS8kqlezVUCrjWj/hc4hCdCuzIoRKwb5rLxcPWqewuZ+Z3Wc68Q0
+q2UrhJ6rxVbvM6ku5B52O0jMaPk2IICA/dhP5t4xX7Czo7ZKtOMpwoces+Lf6YaT+Ujcc91rhWx
+v3PM9eRsEvqBhWaXxghz1ln1QYVhBRsLftdD48yh281qg/R73p1hsfXkaMG60JN+DQyYOif6P8B
+arNs/N5RSWwLd2E=
 -----END CA CERTIFICATE-----
 
 $ openssl x509 -text < [CERTIFICATE]
@@ -94,37 +124,58 @@
         Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:a7:33:5b:9e:8b:aa:9f:46:27:98:ba:1f:bb:29:
-                    b7:ee:9f:dc:04:7d:1d:b1:30:67:05:ec:2d:42:42:
-                    6d:fd:08:72:eb:2b:af:4c:1b:fc:48:8d:34:f1:83:
-                    5e:ea:9a:fe:6f:0e:2a:3c:19:b7:22:77:7d:a9:4b:
-                    9a:61:0c:a7:11:25:ba:2e:25:3a:c3:09:94:3d:30:
-                    94:98:01:02:0e:f3:f9:77:3b:11:d4:74:56:9b:09:
-                    b0:31:ca:0d:c5:81:7c:19:4d:0d:6b:5f:1f:7e:c9:
-                    40:fd:01:fe:75:9e:4d:fe:a7:07:5c:68:77:d0:3a:
-                    e5:67:b7:0f:6c:cf:1f:e7:4d
+                    00:9a:21:a4:62:e0:6e:af:0b:2d:44:00:f2:a9:68:
+                    b3:44:08:10:81:24:4e:8d:64:d1:35:18:a0:71:84:
+                    38:7a:f8:45:29:02:36:6e:f8:4e:34:22:ae:83:a4:
+                    40:b7:88:33:92:29:26:e4:79:4a:28:f2:f7:ee:91:
+                    24:64:34:20:b0:ee:67:e3:69:0c:42:80:cb:43:8e:
+                    d8:b8:70:45:db:e3:e9:37:6c:da:61:61:aa:57:e1:
+                    f4:58:b9:47:92:4a:80:25:e1:79:7b:7c:db:43:88:
+                    1d:34:da:2d:b1:d9:73:ae:5b:05:ac:5c:8f:91:2d:
+                    2b:4a:67:55:06:a7:84:94:31:e1:77:48:10:77:0a:
+                    40:55:17:fe:62:14:3e:68:23:c4:b3:95:44:2f:6a:
+                    38:9c:04:16:b4:67:37:80:29:78:f6:cc:ee:9c:e1:
+                    86:60:4f:8c:65:7d:28:8e:f2:36:46:54:e2:09:28:
+                    61:ad:cd:f4:68:83:67:2d:60:5c:a1:97:43:54:19:
+                    f5:fa:60:04:14:f8:a8:1f:02:86:a9:38:dc:da:fd:
+                    35:37:35:f5:ce:16:4d:6e:ec:90:ca:78:3b:65:dd:
+                    c7:1e:a1:32:69:d8:3a:84:8c:5a:bf:6b:24:0b:9f:
+                    5f:48:64:1d:cc:b9:a9:ba:ea:f1:34:1d:66:71:42:
+                    a9:db
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha256WithRSAEncryption
     Signature Value:
-        cb:f8:97:de:be:56:e8:8b:91:82:8c:9c:cb:47:6a:9e:75:6d:
-        6f:06:db:8b:23:07:37:2f:4d:92:f5:32:7c:4b:3d:3b:b1:ee:
-        d9:99:e8:65:bc:d8:57:73:5d:53:f6:a1:f7:a9:ea:c9:bd:41:
-        4f:59:23:b2:6f:b1:f6:da:11:30:7d:e3:c2:bb:69:68:d1:64:
-        b1:79:aa:49:36:59:a9:0d:2c:38:7d:ad:db:fb:66:99:07:37:
-        ed:95:80:d7:bd:af:d1:7c:fc:48:3a:54:53:b5:b0:42:92:b4:
-        ed:d4:56:e9:9b:a0:5a:bc:05:ec:c9:3b:55:97:ef:49:d7:c5:
-        fe:2e
+        77:5d:e9:cc:a7:aa:eb:90:6d:24:c1:6b:4d:2a:bd:95:30:40:
+        18:f2:ea:6a:b9:98:f6:78:f8:c2:0b:95:3a:8c:e4:2e:cd:ff:
+        47:01:48:5e:08:8d:e2:c6:4c:3c:be:ad:51:77:23:0d:4d:88:
+        74:e2:ff:89:01:26:f3:a3:99:bb:a9:7f:17:1a:61:d6:0f:1f:
+        eb:d8:02:a0:8a:b9:61:c4:e0:b3:20:df:b2:c5:1f:74:de:08:
+        53:32:cf:d3:0f:38:7e:d6:3c:64:b6:e3:f1:a6:44:53:bf:35:
+        5a:2b:93:07:1d:89:68:9d:10:07:b0:22:f0:b7:d6:69:f1:f8:
+        5b:d9:a1:86:96:b0:ff:02:1e:10:48:ed:74:6e:f5:43:08:89:
+        1b:19:4e:8e:63:c5:b4:1c:c6:33:bf:50:c3:6b:78:12:fb:cb:
+        e1:b2:a3:b5:c1:b8:8f:c1:ed:4c:c6:3a:bb:37:3f:94:be:11:
+        32:7d:a6:1a:07:b0:67:2a:0a:25:30:fa:06:3d:b2:d8:80:6c:
+        da:34:3c:ec:f9:fb:53:08:4a:7c:98:4c:0c:1a:0a:73:c5:81:
+        7f:c4:5d:23:be:60:18:d7:86:8e:9d:c8:27:30:34:1f:06:19:
+        4c:a1:d4:ba:4f:02:3b:41:bb:38:8e:b0:77:15:5c:9c:a5:d4:
+        c8:d2:ac:51
 -----BEGIN CERTIFICATE-----
-MIIBpzCCARCgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
+MIICrDCCAZSgAwIBAgIBBTANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAeFw0xNzAxMDEwMDAwMDBaFw0xODAxMDEwMDAwMDBaMBQxEjAQBgNVBAMMCVRlc3
-QgQ2VydDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApzNbnouqn0YnmLofuym37p/cBH0ds
-TBnBewtQkJt/Qhy6yuvTBv8SI008YNe6pr+bw4qPBm3Ind9qUuaYQynESW6LiU6wwmUPTCUmAEC
-DvP5dzsR1HRWmwmwMcoNxYF8GU0Na18ffslA/QH+dZ5N/qcHXGh30DrlZ7cPbM8f500CAwEAATA
-NBgkqhkiG9w0BAQsFAAOBgQDL+Jfevlboi5GCjJzLR2qedW1vBtuLIwc3L02S9TJ8Sz07se7Zme
-hlvNhXc11T9qH3qerJvUFPWSOyb7H22hEwfePCu2lo0WSxeapJNlmpDSw4fa3b+2aZBzftlYDXv
-a/RfPxIOlRTtbBCkrTt1Fbpm6BavAXsyTtVl+9J18X+Lg==
+QgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJohpGLgbq8LLUQA8qlos0QIE
+IEkTo1k0TUYoHGEOHr4RSkCNm74TjQiroOkQLeIM5IpJuR5Sijy9+6RJGQ0ILDuZ+NpDEKAy0OO
+2LhwRdvj6Tds2mFhqlfh9Fi5R5JKgCXheXt820OIHTTaLbHZc65bBaxcj5EtK0pnVQanhJQx4Xd
+IEHcKQFUX/mIUPmgjxLOVRC9qOJwEFrRnN4ApePbM7pzhhmBPjGV9KI7yNkZU4gkoYa3N9GiDZy
+1gXKGXQ1QZ9fpgBBT4qB8Chqk43Nr9NTc19c4WTW7skMp4O2Xdxx6hMmnYOoSMWr9rJAufX0hkH
+cy5qbrq8TQdZnFCqdsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAd13pzKeq65BtJMFrTSq9lTBA
+GPLqarmY9nj4wguVOozkLs3/RwFIXgiN4sZMPL6tUXcjDU2IdOL/iQEm86OZu6l/Fxph1g8f69g
+CoIq5YcTgsyDfssUfdN4IUzLP0w84ftY8ZLbj8aZEU781WiuTBx2JaJ0QB7Ai8LfWafH4W9mhhp
+aw/wIeEEjtdG71QwiJGxlOjmPFtBzGM79Qw2t4EvvL4bKjtcG4j8HtTMY6uzc/lL4RMn2mGgewZ
+yoKJTD6Bj2y2IBs2jQ87Pn7UwhKfJhMDBoKc8WBf8RdI75gGNeGjp3IJzA0HwYZTKHUuk8CO0G7
+OI6wdxVcnKXUyNKsUQ==
 -----END CERTIFICATE-----
 
 $ openssl asn1parse -i < [OCSP REQUEST]
@@ -137,9 +188,9 @@
    12:d=6  hl=2 l=   5 prim:       OBJECT            :sha1
    19:d=6  hl=2 l=   0 prim:       NULL              
    21:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:449B1C5B31C6E9990966523E49C3F773C024190A
-   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:4D1A4CE65A33E936A16B3F62C022A3A62C2EEA61
+   43:d=5  hl=2 l=  20 prim:      OCTET STRING      [HEX DUMP]:2A860071C9B1A207C3B00BDDA94112233D2320B8
    65:d=5  hl=2 l=   1 prim:      INTEGER           :05
 -----BEGIN OCSP REQUEST-----
-MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUTRpM5loz6Tahaz9
-iwCKjpiwu6mECAQU=
+MEIwQDA+MDwwOjAJBgUrDgMCGgUABBREmxxbMcbpmQlmUj5Jw/dzwCQZCgQUKoYAccmxogfDsAv
+dqUESIz0jILgCAQU=
 -----END OCSP REQUEST-----