Fix pki/testdata/ocsp_unittest/annotate_test_data.py for Python 3

Last time anyone ran this, it was still Python 2.

Change-Id: I00f9e98ed25258415aa592d42d31a2958172f3a6
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/91988
Presubmit-BoringSSL-Verified: Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Matt Mueller <mattm@google.com>
Commit-Queue: Matt Mueller <mattm@google.com>
diff --git a/pki/testdata/ocsp_unittest/annotate_test_data.py b/pki/testdata/ocsp_unittest/annotate_test_data.py
index 3cb97bf..46982ae 100755
--- a/pki/testdata/ocsp_unittest/annotate_test_data.py
+++ b/pki/testdata/ocsp_unittest/annotate_test_data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2016 The Chromium Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,11 +23,12 @@
 
 """
 
+import base64
 import glob
 import os
 import re
-import base64
 import subprocess
+import tempfile
 
 
 def Transform(file_data):
@@ -72,30 +73,31 @@
 
     # If pretty printing succeeded, return it.
     if p.returncode == 0:
-      stdout_data = stdout_data.strip()
+      stdout_data = stdout_data.decode('utf-8').strip()
       return '$ openssl x509 -text < [%s]\n%s' % (block_name, stdout_data)
 
   # Try pretty printing as OCSP Response.
   if block_name == "OCSP RESPONSE":
-    tmp_file_path = "tmp_ocsp.der"
-    WriteStringToFile(block_data, tmp_file_path)
-    p = subprocess.Popen(["openssl", "ocsp", "-noverify", "-resp_text",
-                          "-respin", tmp_file_path],
-                          stdin=subprocess.PIPE,
-                          stdout=subprocess.PIPE,
-                          stderr=subprocess.PIPE)
-    stdout_data, stderr_data = p.communicate(block_data)
-    os.remove(tmp_file_path)
+    with tempfile.NamedTemporaryFile(delete_on_close=False, prefix="ocsp",
+                                     suffix=".der") as tmp:
+      tmp.write(block_data)
+      tmp.close()
+      p = subprocess.Popen(["openssl", "ocsp", "-noverify", "-resp_text",
+                            "-respin", tmp.name],
+                            stdin=subprocess.PIPE,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE)
+      stdout_data, stderr_data = p.communicate(block_data)
 
     # If pretty printing succeeded, return it.
     if p.returncode == 0:
-      stdout_data = stdout_data.strip()
+      stdout_data = stdout_data.decode('utf-8').strip()
       # May contain embedded CERTIFICATE pem blocks. Escape these since
       # CERTIFICATE already has meaning in the test file.
       stdout_data = stdout_data.replace("-----", "~~~~~")
       return '$ openssl ocsp -resp_text -respin <([%s])\n%s' % (block_name,
                                                                 stdout_data)
-    print 'Error pretty printing OCSP response:\n',stderr_data
+    print('Error pretty printing OCSP response:\n', stderr_data.decode('utf-8'))
 
   # Otherwise try pretty printing using asn1parse.
 
@@ -103,8 +105,8 @@
                        stdout=subprocess.PIPE, stdin=subprocess.PIPE,
                        stderr=subprocess.PIPE)
   stdout_data, stderr_data = p.communicate(input=block_data)
-  generated_comment = '$ openssl asn1parse -i < [%s]\n%s' % (block_name,
-                                                             stdout_data)
+  generated_comment = '$ openssl asn1parse -i < [%s]\n%s' % (
+      block_name, stdout_data.decode('utf-8'))
 
   # The OCTET STRING encoded BasicOCSPResponse is also parsed out using
   #'openssl asn1parse'.
@@ -114,7 +116,7 @@
       response = response.replace('\n', '')
       if len(response) % 2 != 0:
         response = '0' + response
-      response = GenerateCommentForBlock('INNER', response.decode('hex'))
+      response = GenerateCommentForBlock('INNER', bytes.fromhex(response))
       response = response.split('\n', 1)[1]
       response = response.replace(': ', ':      ')
       generated_comment += '\n%s' % (response)
@@ -162,7 +164,7 @@
 
 
 def EncodeDataForPem(data):
-  result = base64.b64encode(data)
+  result = base64.b64encode(data).decode('utf-8')
   return WrapTextToLineWidth(result, 75)
 
 
@@ -215,12 +217,12 @@
 
 def main():
   for path in GetPemFilePaths():
-    print "Processing %s ..." % (path)
+    print("Processing %s ..." % (path))
     original_data = ReadFileToString(path)
     transformed_data = Transform(original_data)
     if original_data != transformed_data:
       WriteStringToFile(transformed_data, path)
-      print "Rewrote %s" % (path)
+      print("Rewrote %s" % (path))
 
 
 if __name__ == "__main__":
diff --git a/pki/testdata/ocsp_unittest/bad_ocsp_type.pem b/pki/testdata/ocsp_unittest/bad_ocsp_type.pem
index cfc9772..b8777c3 100644
--- a/pki/testdata/ocsp_unittest/bad_ocsp_type.pem
+++ b/pki/testdata/ocsp_unittest/bad_ocsp_type.pem
@@ -44,14 +44,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -64,14 +64,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -89,14 +90,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -109,14 +110,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/bad_signature.pem b/pki/testdata/ocsp_unittest/bad_signature.pem
index dbbc649..ef108ba 100644
--- a/pki/testdata/ocsp_unittest/bad_signature.pem
+++ b/pki/testdata/ocsp_unittest/bad_signature.pem
@@ -17,7 +17,8 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         de:ad:be:ef
+    Signature Value:
+        de:ad:be:ef
 -----BEGIN OCSP RESPONSE-----
 MIG2CgEAoIGwMIGtBgkrBgEFBQcwAQEEgZ8wgZwwgYWhITAfMR0wGwYDVQQDDBRUZXN0IEludGV
 ybWVkaWF0ZSBDQRgPMjAxNzAzMDIwMDAwMDBaME8wTTA4MAcGBSsOAwIaBBREmxxbMcbpmQlmUj
@@ -31,14 +32,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -51,14 +52,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -76,14 +78,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -96,14 +98,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/bad_status.pem b/pki/testdata/ocsp_unittest/bad_status.pem
index d06d87f..0fb21cc 100644
--- a/pki/testdata/ocsp_unittest/bad_status.pem
+++ b/pki/testdata/ocsp_unittest/bad_status.pem
@@ -13,14 +13,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -33,14 +33,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -58,14 +59,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -78,14 +79,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/good_response.pem b/pki/testdata/ocsp_unittest/good_response.pem
index 12ce77c..2dc0563 100644
--- a/pki/testdata/ocsp_unittest/good_response.pem
+++ b/pki/testdata/ocsp_unittest/good_response.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
-         74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
-         15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
-         9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
-         73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
-         18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
-         49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
-         1b:74
+    Signature Value:
+        9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
+        74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
+        15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
+        9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
+        73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
+        18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
+        49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
+        1b:74
 -----BEGIN OCSP RESPONSE-----
 MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/good_response_next_update.pem b/pki/testdata/ocsp_unittest/good_response_next_update.pem
index e6a8eef..efa741b 100644
--- a/pki/testdata/ocsp_unittest/good_response_next_update.pem
+++ b/pki/testdata/ocsp_unittest/good_response_next_update.pem
@@ -18,14 +18,15 @@
     Next Update: Jun  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         84:66:89:45:61:e1:78:07:e2:e0:09:4f:f1:14:d1:6a:72:09:
-         41:f9:4d:d9:51:55:2f:62:82:f7:09:59:e6:fd:17:35:2c:b1:
-         8d:02:4b:9c:39:1a:0b:f0:c0:0b:80:c5:55:eb:6f:c9:82:ab:
-         ac:c7:fe:40:c5:b4:1b:37:b6:4d:8c:50:97:e4:41:a2:c0:7d:
-         c7:de:12:fd:7c:8c:d6:2a:43:c8:cd:1e:c1:00:92:30:ed:84:
-         97:12:2c:a7:a4:20:99:44:d6:da:4f:7a:45:33:62:bb:9a:72:
-         33:2f:78:af:d1:09:0e:e7:0f:64:d4:d0:09:40:34:ca:1d:44:
-         3e:cd
+    Signature Value:
+        84:66:89:45:61:e1:78:07:e2:e0:09:4f:f1:14:d1:6a:72:09:
+        41:f9:4d:d9:51:55:2f:62:82:f7:09:59:e6:fd:17:35:2c:b1:
+        8d:02:4b:9c:39:1a:0b:f0:c0:0b:80:c5:55:eb:6f:c9:82:ab:
+        ac:c7:fe:40:c5:b4:1b:37:b6:4d:8c:50:97:e4:41:a2:c0:7d:
+        c7:de:12:fd:7c:8c:d6:2a:43:c8:cd:1e:c1:00:92:30:ed:84:
+        97:12:2c:a7:a4:20:99:44:d6:da:4f:7a:45:33:62:bb:9a:72:
+        33:2f:78:af:d1:09:0e:e7:0f:64:d4:d0:09:40:34:ca:1d:44:
+        3e:cd
 -----BEGIN OCSP RESPONSE-----
 MIIBSgoBAKCCAUMwggE/BgkrBgEFBQcwAQEEggEwMIIBLDCBmKEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowYjBgMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -41,14 +42,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -61,14 +62,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -86,14 +88,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -106,14 +108,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/good_response_sha256.pem b/pki/testdata/ocsp_unittest/good_response_sha256.pem
index 7bd7cfe..5a9614b 100644
--- a/pki/testdata/ocsp_unittest/good_response_sha256.pem
+++ b/pki/testdata/ocsp_unittest/good_response_sha256.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha256WithRSAEncryption
-         a0:b9:3b:45:a8:56:72:66:22:34:df:68:6c:39:46:e2:b1:f9:
-         2c:8f:3e:22:8b:c3:96:79:42:7e:29:f5:22:c9:e8:78:fc:2b:
-         31:7a:02:ad:6d:a5:5b:52:ac:1e:a2:81:72:c4:d3:d6:d5:75:
-         f9:11:ac:c1:21:79:cb:2c:9a:6b:d9:a9:9b:64:44:2c:ee:b3:
-         07:ce:ff:40:5a:45:26:ea:83:79:e3:63:9f:f9:56:04:58:2a:
-         93:7d:cc:03:46:08:a8:b4:9f:21:0c:f7:64:0b:2c:05:4f:b6:
-         df:5f:8f:1b:34:4b:8e:30:23:ca:8c:69:3d:95:6b:43:ab:20:
-         31:88
+    Signature Value:
+        a0:b9:3b:45:a8:56:72:66:22:34:df:68:6c:39:46:e2:b1:f9:
+        2c:8f:3e:22:8b:c3:96:79:42:7e:29:f5:22:c9:e8:78:fc:2b:
+        31:7a:02:ad:6d:a5:5b:52:ac:1e:a2:81:72:c4:d3:d6:d5:75:
+        f9:11:ac:c1:21:79:cb:2c:9a:6b:d9:a9:9b:64:44:2c:ee:b3:
+        07:ce:ff:40:5a:45:26:ea:83:79:e3:63:9f:f9:56:04:58:2a:
+        93:7d:cc:03:46:08:a8:b4:9f:21:0c:f7:64:0b:2c:05:4f:b6:
+        df:5f:8f:1b:34:4b:8e:30:23:ca:8c:69:3d:95:6b:43:ab:20:
+        31:88
 -----BEGIN OCSP RESPONSE-----
 MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem b/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem
index babfd33..1446304 100644
--- a/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_critical_ct_extension.pem
@@ -20,14 +20,15 @@
                 DEADBEEF
 
     Signature Algorithm: sha1WithRSAEncryption
-         3f:34:0c:f8:fc:b6:07:21:92:44:93:03:c9:a4:61:01:ba:eb:
-         c9:82:1e:75:e5:60:12:18:70:ac:51:c6:a8:94:a1:6e:25:18:
-         2a:e1:7d:1f:93:4a:04:b0:60:d1:14:2c:85:04:e3:7f:2b:d8:
-         eb:10:24:bd:c1:60:3a:fc:b3:4b:40:e8:46:6e:65:09:0f:d7:
-         d0:30:85:d1:58:c5:a1:56:57:2b:a6:a2:2d:f1:a5:78:27:1f:
-         cf:b5:4f:46:90:50:62:24:c3:9f:8a:30:42:9e:ea:12:70:51:
-         32:86:be:69:34:3b:d9:4b:2c:be:81:70:e3:0a:99:ae:ec:82:
-         53:0f
+    Signature Value:
+        3f:34:0c:f8:fc:b6:07:21:92:44:93:03:c9:a4:61:01:ba:eb:
+        c9:82:1e:75:e5:60:12:18:70:ac:51:c6:a8:94:a1:6e:25:18:
+        2a:e1:7d:1f:93:4a:04:b0:60:d1:14:2c:85:04:e3:7f:2b:d8:
+        eb:10:24:bd:c1:60:3a:fc:b3:4b:40:e8:46:6e:65:09:0f:d7:
+        d0:30:85:d1:58:c5:a1:56:57:2b:a6:a2:2d:f1:a5:78:27:1f:
+        cf:b5:4f:46:90:50:62:24:c3:9f:8a:30:42:9e:ea:12:70:51:
+        32:86:be:69:34:3b:d9:4b:2c:be:81:70:e3:0a:99:ae:ec:82:
+        53:0f
 -----BEGIN OCSP RESPONSE-----
 MIIBVgoBAKCCAU8wggFLBgkrBgEFBQcwAQEEggE8MIIBODCBpKEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowbjBsMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -44,14 +45,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -64,14 +65,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -89,14 +91,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -109,14 +111,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/has_critical_response_extension.pem b/pki/testdata/ocsp_unittest/has_critical_response_extension.pem
index fae7bcc..fa0b559 100644
--- a/pki/testdata/ocsp_unittest/has_critical_response_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_critical_response_extension.pem
@@ -20,14 +20,15 @@
         1.2.3.4: critical
             DEADBEEF
     Signature Algorithm: sha1WithRSAEncryption
-         83:54:d0:3f:1a:22:0b:1c:2f:7c:bc:11:ec:74:f9:8f:a4:48:
-         cf:6a:18:95:3c:3f:ba:88:ac:31:cc:fd:e4:b2:0d:6a:d5:ad:
-         97:9f:03:0e:e0:3d:08:4e:4b:ff:77:9d:1d:06:ae:bc:90:09:
-         28:71:78:47:a3:63:e1:75:d3:a6:92:43:8d:60:cf:cc:cf:0b:
-         5f:fe:b1:91:96:1f:81:5a:50:77:b0:c7:e3:be:98:9e:6c:64:
-         44:9d:67:82:d9:87:d8:f6:93:0b:4d:8f:44:d2:51:2d:d1:61:
-         d7:ec:5c:46:ad:9c:6d:f1:c8:61:91:83:2b:d0:83:e8:9c:22:
-         df:e1
+    Signature Value:
+        83:54:d0:3f:1a:22:0b:1c:2f:7c:bc:11:ec:74:f9:8f:a4:48:
+        cf:6a:18:95:3c:3f:ba:88:ac:31:cc:fd:e4:b2:0d:6a:d5:ad:
+        97:9f:03:0e:e0:3d:08:4e:4b:ff:77:9d:1d:06:ae:bc:90:09:
+        28:71:78:47:a3:63:e1:75:d3:a6:92:43:8d:60:cf:cc:cf:0b:
+        5f:fe:b1:91:96:1f:81:5a:50:77:b0:c7:e3:be:98:9e:6c:64:
+        44:9d:67:82:d9:87:d8:f6:93:0b:4d:8f:44:d2:51:2d:d1:61:
+        d7:ec:5c:46:ad:9c:6d:f1:c8:61:91:83:2b:d0:83:e8:9c:22:
+        df:e1
 -----BEGIN OCSP RESPONSE-----
 MIIBTwoBAKCCAUgwggFEBgkrBgEFBQcwAQEEggE1MIIBMTCBnaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -44,14 +45,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -64,14 +65,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -89,14 +91,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -109,14 +111,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/has_critical_single_extension.pem b/pki/testdata/ocsp_unittest/has_critical_single_extension.pem
index 6777d1c..44a11fe 100644
--- a/pki/testdata/ocsp_unittest/has_critical_single_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_critical_single_extension.pem
@@ -20,14 +20,15 @@
                 DEADBEEF
 
     Signature Algorithm: sha1WithRSAEncryption
-         5e:15:92:5e:47:1d:c2:7f:86:2f:46:d2:54:24:5f:0e:ad:a0:
-         04:9f:0b:10:e9:46:95:5d:90:10:50:d8:40:5b:2e:25:64:cb:
-         43:34:c9:90:49:a8:27:39:1d:f4:e8:42:d7:50:70:54:d4:fd:
-         8f:3a:b6:fe:52:00:4d:b9:52:f8:c8:7f:d0:94:2f:03:21:d9:
-         0f:5a:21:94:77:3c:86:f9:c3:34:ec:7e:4c:56:10:dd:0c:af:
-         87:3e:da:68:c6:98:72:97:62:5a:71:1a:84:a0:a1:79:9f:ff:
-         ec:76:c1:0e:24:03:21:9f:76:42:39:83:25:af:a1:93:a0:62:
-         20:b6
+    Signature Value:
+        5e:15:92:5e:47:1d:c2:7f:86:2f:46:d2:54:24:5f:0e:ad:a0:
+        04:9f:0b:10:e9:46:95:5d:90:10:50:d8:40:5b:2e:25:64:cb:
+        43:34:c9:90:49:a8:27:39:1d:f4:e8:42:d7:50:70:54:d4:fd:
+        8f:3a:b6:fe:52:00:4d:b9:52:f8:c8:7f:d0:94:2f:03:21:d9:
+        0f:5a:21:94:77:3c:86:f9:c3:34:ec:7e:4c:56:10:dd:0c:af:
+        87:3e:da:68:c6:98:72:97:62:5a:71:1a:84:a0:a1:79:9f:ff:
+        ec:76:c1:0e:24:03:21:9f:76:42:39:83:25:af:a1:93:a0:62:
+        20:b6
 -----BEGIN OCSP RESPONSE-----
 MIIBTwoBAKCCAUgwggFEBgkrBgEFBQcwAQEEggE1MIIBMTCBnaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowZzBlMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -44,14 +45,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -64,14 +65,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -89,14 +91,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -109,14 +111,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/has_extension.pem b/pki/testdata/ocsp_unittest/has_extension.pem
index e2712df..46b4017 100644
--- a/pki/testdata/ocsp_unittest/has_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_extension.pem
@@ -20,14 +20,15 @@
         1.2.3.4: 
             DEADBEEF
     Signature Algorithm: sha1WithRSAEncryption
-         25:fb:96:d4:5f:c8:d9:d5:27:92:8d:4b:4f:90:82:9b:22:0d:
-         fa:d5:c5:c5:75:f4:a0:a4:41:b6:8c:80:a7:0a:b4:f4:5c:53:
-         ff:cd:ef:77:06:4b:5a:50:17:b9:dc:8b:7f:af:7c:24:09:4a:
-         fc:46:72:8c:44:af:f2:a2:a3:7f:4e:62:85:1a:28:6c:8a:4d:
-         0d:f1:9a:a5:fc:df:1c:7a:8f:57:7a:ff:0e:17:7a:9a:4e:af:
-         9c:74:97:c6:a9:20:b9:d3:ee:a6:d5:44:73:62:61:db:3c:5d:
-         0d:7a:d9:5a:72:cf:e2:ba:b8:b3:cc:7b:98:c0:e5:97:32:4d:
-         8a:9d
+    Signature Value:
+        25:fb:96:d4:5f:c8:d9:d5:27:92:8d:4b:4f:90:82:9b:22:0d:
+        fa:d5:c5:c5:75:f4:a0:a4:41:b6:8c:80:a7:0a:b4:f4:5c:53:
+        ff:cd:ef:77:06:4b:5a:50:17:b9:dc:8b:7f:af:7c:24:09:4a:
+        fc:46:72:8c:44:af:f2:a2:a3:7f:4e:62:85:1a:28:6c:8a:4d:
+        0d:f1:9a:a5:fc:df:1c:7a:8f:57:7a:ff:0e:17:7a:9a:4e:af:
+        9c:74:97:c6:a9:20:b9:d3:ee:a6:d5:44:73:62:61:db:3c:5d:
+        0d:7a:d9:5a:72:cf:e2:ba:b8:b3:cc:7b:98:c0:e5:97:32:4d:
+        8a:9d
 -----BEGIN OCSP RESPONSE-----
 MIIBTAoBAKCCAUUwggFBBgkrBgEFBQcwAQEEggEyMIIBLjCBmqEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -43,14 +44,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -63,14 +64,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -88,14 +90,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -108,14 +110,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/has_single_extension.pem b/pki/testdata/ocsp_unittest/has_single_extension.pem
index f192e23..9a276ed 100644
--- a/pki/testdata/ocsp_unittest/has_single_extension.pem
+++ b/pki/testdata/ocsp_unittest/has_single_extension.pem
@@ -20,14 +20,15 @@
                 DEADBEEF
 
     Signature Algorithm: sha1WithRSAEncryption
-         b5:45:44:44:cf:bf:a5:c6:87:89:f4:98:8d:23:21:f2:d3:60:
-         2f:2e:f9:30:91:fe:c3:ec:8d:29:4a:30:b9:cd:7b:08:ee:98:
-         ee:bf:df:8c:ec:06:35:1e:42:75:00:c3:db:0f:da:4d:ef:14:
-         d1:e2:aa:df:ce:15:92:5d:77:0b:8e:a0:a1:a1:6c:c0:05:80:
-         e2:45:51:86:2c:ec:84:d9:08:b1:bf:78:18:69:64:eb:cf:8a:
-         aa:95:4c:a3:a8:7b:25:73:39:39:0a:59:07:e8:5b:86:17:2c:
-         86:cd:eb:b4:3d:a7:af:b6:68:79:3d:b3:3e:21:bc:7a:8b:cb:
-         99:11
+    Signature Value:
+        b5:45:44:44:cf:bf:a5:c6:87:89:f4:98:8d:23:21:f2:d3:60:
+        2f:2e:f9:30:91:fe:c3:ec:8d:29:4a:30:b9:cd:7b:08:ee:98:
+        ee:bf:df:8c:ec:06:35:1e:42:75:00:c3:db:0f:da:4d:ef:14:
+        d1:e2:aa:df:ce:15:92:5d:77:0b:8e:a0:a1:a1:6c:c0:05:80:
+        e2:45:51:86:2c:ec:84:d9:08:b1:bf:78:18:69:64:eb:cf:8a:
+        aa:95:4c:a3:a8:7b:25:73:39:39:0a:59:07:e8:5b:86:17:2c:
+        86:cd:eb:b4:3d:a7:af:b6:68:79:3d:b3:3e:21:bc:7a:8b:cb:
+        99:11
 -----BEGIN OCSP RESPONSE-----
 MIIBTAoBAKCCAUUwggFBBgkrBgEFBQcwAQEEggEyMIIBLjCBmqEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowZDBiMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -43,14 +44,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -63,14 +64,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -88,14 +90,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -108,14 +110,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/has_version.pem b/pki/testdata/ocsp_unittest/has_version.pem
index c4afd41..91b86d8 100644
--- a/pki/testdata/ocsp_unittest/has_version.pem
+++ b/pki/testdata/ocsp_unittest/has_version.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
-         74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
-         15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
-         9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
-         73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
-         18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
-         49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
-         1b:74
+    Signature Value:
+        9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
+        74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
+        15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
+        9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
+        73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
+        18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
+        49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
+        1b:74
 -----BEGIN OCSP RESPONSE-----
 MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/malformed_request.pem b/pki/testdata/ocsp_unittest/malformed_request.pem
index 1e068d8..37dd251 100644
--- a/pki/testdata/ocsp_unittest/malformed_request.pem
+++ b/pki/testdata/ocsp_unittest/malformed_request.pem
@@ -13,14 +13,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -33,14 +33,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -58,14 +59,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -78,14 +79,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/missing_response.pem b/pki/testdata/ocsp_unittest/missing_response.pem
index aaa510e..0a2c1ce 100644
--- a/pki/testdata/ocsp_unittest/missing_response.pem
+++ b/pki/testdata/ocsp_unittest/missing_response.pem
@@ -9,14 +9,15 @@
     Produced At: Mar  2 00:00:00 2017 GMT
     Responses:
     Signature Algorithm: sha1WithRSAEncryption
-         c1:0e:9e:f8:b0:8d:a9:05:76:b8:69:f6:96:ae:25:06:11:c9:
-         04:d6:75:18:7c:bf:ca:b4:78:f3:99:80:ac:6f:19:36:52:de:
-         2f:f0:b1:48:e3:06:ec:f7:27:07:5d:2f:03:88:00:b3:12:17:
-         bb:18:27:4f:0b:fa:d8:01:82:59:c8:11:19:52:7d:e4:d6:cb:
-         75:f4:2d:61:51:5c:6c:51:04:f6:a3:de:00:44:98:ab:2f:d7:
-         82:6d:30:92:ce:ce:0c:5a:3b:7a:65:8c:89:c7:4e:b4:74:76:
-         02:c5:a5:33:a4:c6:0c:a1:73:85:20:4d:0d:fc:12:73:c7:e1:
-         70:8b
+    Signature Value:
+        c1:0e:9e:f8:b0:8d:a9:05:76:b8:69:f6:96:ae:25:06:11:c9:
+        04:d6:75:18:7c:bf:ca:b4:78:f3:99:80:ac:6f:19:36:52:de:
+        2f:f0:b1:48:e3:06:ec:f7:27:07:5d:2f:03:88:00:b3:12:17:
+        bb:18:27:4f:0b:fa:d8:01:82:59:c8:11:19:52:7d:e4:d6:cb:
+        75:f4:2d:61:51:5c:6c:51:04:f6:a3:de:00:44:98:ab:2f:d7:
+        82:6d:30:92:ce:ce:0c:5a:3b:7a:65:8c:89:c7:4e:b4:74:76:
+        02:c5:a5:33:a4:c6:0c:a1:73:85:20:4d:0d:fc:12:73:c7:e1:
+        70:8b
 -----BEGIN OCSP RESPONSE-----
 MIHjCgEAoIHdMIHaBgkrBgEFBQcwAQEEgcwwgckwNqEhMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJ
 tZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowADALBgkqhkiG9w0BAQUDgYEAwQ6e+LCNqQV2uG
@@ -31,14 +32,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -51,14 +52,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -76,14 +78,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -96,14 +98,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/multiple_response.pem b/pki/testdata/ocsp_unittest/multiple_response.pem
index d19c415..9dcc8af 100644
--- a/pki/testdata/ocsp_unittest/multiple_response.pem
+++ b/pki/testdata/ocsp_unittest/multiple_response.pem
@@ -25,14 +25,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         6a:73:cb:79:3c:ed:91:58:af:ba:c7:75:65:4e:6e:91:0e:e1:
-         e6:61:0d:ba:ab:56:53:ce:65:2b:e4:b3:b1:71:4d:b2:3a:67:
-         6e:8b:e2:4d:c5:16:70:a0:a5:2a:04:be:d2:5b:f8:68:c4:58:
-         7a:d0:fd:d5:3d:03:1a:24:d4:bd:d6:3c:a7:ec:9c:97:ed:c7:
-         bc:58:66:e0:ed:11:75:9e:61:f1:84:85:d9:b5:ab:25:d2:23:
-         82:8b:34:ed:d3:60:cc:16:a9:7e:89:0e:b6:6f:88:19:8f:0f:
-         82:2b:f9:5f:e8:62:db:3f:5f:05:5f:a4:dc:fe:cd:aa:47:db:
-         b0:a3
+    Signature Value:
+        6a:73:cb:79:3c:ed:91:58:af:ba:c7:75:65:4e:6e:91:0e:e1:
+        e6:61:0d:ba:ab:56:53:ce:65:2b:e4:b3:b1:71:4d:b2:3a:67:
+        6e:8b:e2:4d:c5:16:70:a0:a5:2a:04:be:d2:5b:f8:68:c4:58:
+        7a:d0:fd:d5:3d:03:1a:24:d4:bd:d6:3c:a7:ec:9c:97:ed:c7:
+        bc:58:66:e0:ed:11:75:9e:61:f1:84:85:d9:b5:ab:25:d2:23:
+        82:8b:34:ed:d3:60:cc:16:a9:7e:89:0e:b6:6f:88:19:8f:0f:
+        82:2b:f9:5f:e8:62:db:3f:5f:05:5f:a4:dc:fe:cd:aa:47:db:
+        b0:a3
 -----BEGIN OCSP RESPONSE-----
 MIIBhwoBAKCCAYAwggF8BgkrBgEFBQcwAQEEggFtMIIBaTCB1aEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowgZ4wTTA4MAcGBSsOAwIaBBREmxxbMc
@@ -50,14 +51,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -70,14 +71,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -95,14 +97,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -115,14 +117,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/no_response.pem b/pki/testdata/ocsp_unittest/no_response.pem
index bbf4469..07b63df 100644
--- a/pki/testdata/ocsp_unittest/no_response.pem
+++ b/pki/testdata/ocsp_unittest/no_response.pem
@@ -9,14 +9,15 @@
     Produced At: Mar  2 00:00:00 2017 GMT
     Responses:
     Signature Algorithm: sha1WithRSAEncryption
-         c1:0e:9e:f8:b0:8d:a9:05:76:b8:69:f6:96:ae:25:06:11:c9:
-         04:d6:75:18:7c:bf:ca:b4:78:f3:99:80:ac:6f:19:36:52:de:
-         2f:f0:b1:48:e3:06:ec:f7:27:07:5d:2f:03:88:00:b3:12:17:
-         bb:18:27:4f:0b:fa:d8:01:82:59:c8:11:19:52:7d:e4:d6:cb:
-         75:f4:2d:61:51:5c:6c:51:04:f6:a3:de:00:44:98:ab:2f:d7:
-         82:6d:30:92:ce:ce:0c:5a:3b:7a:65:8c:89:c7:4e:b4:74:76:
-         02:c5:a5:33:a4:c6:0c:a1:73:85:20:4d:0d:fc:12:73:c7:e1:
-         70:8b
+    Signature Value:
+        c1:0e:9e:f8:b0:8d:a9:05:76:b8:69:f6:96:ae:25:06:11:c9:
+        04:d6:75:18:7c:bf:ca:b4:78:f3:99:80:ac:6f:19:36:52:de:
+        2f:f0:b1:48:e3:06:ec:f7:27:07:5d:2f:03:88:00:b3:12:17:
+        bb:18:27:4f:0b:fa:d8:01:82:59:c8:11:19:52:7d:e4:d6:cb:
+        75:f4:2d:61:51:5c:6c:51:04:f6:a3:de:00:44:98:ab:2f:d7:
+        82:6d:30:92:ce:ce:0c:5a:3b:7a:65:8c:89:c7:4e:b4:74:76:
+        02:c5:a5:33:a4:c6:0c:a1:73:85:20:4d:0d:fc:12:73:c7:e1:
+        70:8b
 -----BEGIN OCSP RESPONSE-----
 MIHjCgEAoIHdMIHaBgkrBgEFBQcwAQEEgcwwgckwNqEhMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJ
 tZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowADALBgkqhkiG9w0BAQUDgYEAwQ6e+LCNqQV2uG
@@ -31,14 +32,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -51,14 +52,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -76,14 +78,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -96,14 +98,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem b/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem
index e51ca9b..1df01ef 100644
--- a/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_extra_certs.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
-         74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
-         15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
-         9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
-         73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
-         18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
-         49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
-         1b:74
+    Signature Value:
+        9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
+        74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
+        15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
+        9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
+        73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
+        18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
+        49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
+        1b:74
 Certificate:
     Data:
         Version: 3 (0x2)
@@ -37,7 +38,7 @@
         Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -50,14 +51,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 ~~~~~BEGIN CERTIFICATE~~~~~
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0
 IENBMCIYDzIwMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNV
@@ -81,7 +83,7 @@
         Subject: CN=Test OCSP Signer
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:ae:c4:41:84:d9:d0:fd:63:70:db:d6:95:08:b6:
                     9c:99:5c:34:87:6b:c9:36:d0:21:14:27:60:0d:84:
@@ -97,14 +99,15 @@
             X509v3 Extended Key Usage: 
                 OCSP Signing
     Signature Algorithm: sha1WithRSAEncryption
-         10:11:34:a4:b3:90:09:21:00:b4:ee:30:16:06:6d:11:f6:f3:
-         f2:42:77:fe:d7:7a:95:4d:77:b4:b5:75:c0:6f:5a:9d:98:83:
-         34:f0:5b:66:8a:54:93:b8:3b:e8:35:bd:15:5f:6c:79:92:0d:
-         80:da:92:db:a5:c2:80:d9:04:b6:47:2b:fc:73:b3:a8:24:02:
-         20:aa:65:e0:d7:6e:6c:7c:a0:52:25:8c:5f:90:25:7f:5f:23:
-         19:14:a5:0a:ba:05:6a:c3:1b:ff:53:1e:ae:8f:64:12:cf:95:
-         c9:7b:f4:d8:33:ef:98:2e:69:79:be:9d:18:58:57:73:f1:f3:
-         c7:62
+    Signature Value:
+        10:11:34:a4:b3:90:09:21:00:b4:ee:30:16:06:6d:11:f6:f3:
+        f2:42:77:fe:d7:7a:95:4d:77:b4:b5:75:c0:6f:5a:9d:98:83:
+        34:f0:5b:66:8a:54:93:b8:3b:e8:35:bd:15:5f:6c:79:92:0d:
+        80:da:92:db:a5:c2:80:d9:04:b6:47:2b:fc:73:b3:a8:24:02:
+        20:aa:65:e0:d7:6e:6c:7c:a0:52:25:8c:5f:90:25:7f:5f:23:
+        19:14:a5:0a:ba:05:6a:c3:1b:ff:53:1e:ae:8f:64:12:cf:95:
+        c9:7b:f4:d8:33:ef:98:2e:69:79:be:9d:18:58:57:73:f1:f3:
+        c7:62
 ~~~~~BEGIN CERTIFICATE~~~~~
 MIIByzCCATSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0
 IEludGVybWVkaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAw
@@ -148,14 +151,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -168,14 +171,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -193,14 +197,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -213,14 +217,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem b/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem
index 557dac4..0d0d6a3 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_bad_indirect.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         99:5b:54:5b:da:7b:f5:e1:1d:50:73:1d:0c:5b:d8:f2:2c:e2:
-         da:91:7d:c6:16:fb:0d:aa:cd:cf:c1:94:7e:1e:42:38:49:5f:
-         d5:26:7c:9a:30:b7:4e:5f:fb:14:2e:a8:f3:67:03:17:5f:c1:
-         c2:ca:af:6b:bf:2a:32:99:3b:51:50:5f:6d:b0:ad:e3:e7:b5:
-         c5:e4:41:73:11:7f:ef:85:35:78:24:91:a3:2c:c0:4e:41:fe:
-         bc:4c:c6:ef:05:ac:22:81:9a:bd:93:89:9f:c5:54:94:db:08:
-         0f:55:8f:88:13:f9:7d:ac:ae:e8:56:0b:ea:d9:04:25:db:de:
-         4c:96
+    Signature Value:
+        99:5b:54:5b:da:7b:f5:e1:1d:50:73:1d:0c:5b:d8:f2:2c:e2:
+        da:91:7d:c6:16:fb:0d:aa:cd:cf:c1:94:7e:1e:42:38:49:5f:
+        d5:26:7c:9a:30:b7:4e:5f:fb:14:2e:a8:f3:67:03:17:5f:c1:
+        c2:ca:af:6b:bf:2a:32:99:3b:51:50:5f:6d:b0:ad:e3:e7:b5:
+        c5:e4:41:73:11:7f:ef:85:35:78:24:91:a3:2c:c0:4e:41:fe:
+        bc:4c:c6:ef:05:ac:22:81:9a:bd:93:89:9f:c5:54:94:db:08:
+        0f:55:8f:88:13:f9:7d:ac:ae:e8:56:0b:ea:d9:04:25:db:de:
+        4c:96
 Certificate:
     Data:
         Version: 3 (0x2)
@@ -37,7 +38,7 @@
         Subject: CN=Test False OCSP Signer
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:9d:a4:70:41:77:2a:fa:11:c5:10:ea:13:ef:e4:
                     1d:9f:7a:ff:89:38:6a:79:61:21:ba:87:65:95:27:
@@ -50,14 +51,15 @@
                     60:98:12:29:e1:07:5f:d0:03
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         60:5d:f1:ba:17:d5:98:98:99:54:ca:d3:57:b6:2f:01:32:aa:
-         e5:dc:5a:43:1a:48:b6:9c:26:cb:fd:b1:b5:bb:01:17:c5:2e:
-         62:c1:98:f5:b3:19:8f:5e:1c:b6:7e:d0:d4:f2:d5:6d:75:5c:
-         b1:bb:c1:36:ae:be:37:73:58:72:30:3e:62:96:aa:cf:f1:bc:
-         3a:12:bf:6c:d8:dc:49:24:80:8a:7c:f0:67:0a:c3:e1:cc:24:
-         60:92:21:59:3b:7e:ab:87:ba:83:b8:0e:31:e9:23:4c:a4:23:
-         41:5c:b5:78:60:d5:72:f5:e7:4d:f5:f3:0f:bf:01:ab:1e:83:
-         86:41
+    Signature Value:
+        60:5d:f1:ba:17:d5:98:98:99:54:ca:d3:57:b6:2f:01:32:aa:
+        e5:dc:5a:43:1a:48:b6:9c:26:cb:fd:b1:b5:bb:01:17:c5:2e:
+        62:c1:98:f5:b3:19:8f:5e:1c:b6:7e:d0:d4:f2:d5:6d:75:5c:
+        b1:bb:c1:36:ae:be:37:73:58:72:30:3e:62:96:aa:cf:f1:bc:
+        3a:12:bf:6c:d8:dc:49:24:80:8a:7c:f0:67:0a:c3:e1:cc:24:
+        60:92:21:59:3b:7e:ab:87:ba:83:b8:0e:31:e9:23:4c:a4:23:
+        41:5c:b5:78:60:d5:72:f5:e7:4d:f5:f3:0f:bf:01:ab:1e:83:
+        86:41
 ~~~~~BEGIN CERTIFICATE~~~~~
 MIIBuDCCASGgAwIBAgIBAzANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0
 IEludGVybWVkaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAw
@@ -93,14 +95,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -113,14 +115,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -138,14 +141,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -158,14 +161,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem b/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem
index 24cbeed..90bd6cc 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_direct.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
-         74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
-         15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
-         9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
-         73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
-         18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
-         49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
-         1b:74
+    Signature Value:
+        9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
+        74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
+        15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
+        9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
+        73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
+        18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
+        49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
+        1b:74
 -----BEGIN OCSP RESPONSE-----
 MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem b/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem
index e1a3a1d..2459219 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_indirect.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         7d:ed:91:a9:c8:03:55:eb:cf:5b:b4:99:f9:74:49:39:6f:f5:
-         8c:7c:f9:9c:26:2e:c3:26:22:b1:d7:aa:10:6f:1f:e0:77:76:
-         8a:19:dd:59:fc:09:81:36:aa:2a:42:96:2a:a8:0a:ee:b4:74:
-         cc:65:74:10:7d:ef:a5:69:ed:31:c1:c1:f2:2f:a1:1b:eb:12:
-         f2:86:0d:07:4f:0a:8e:9a:9f:8d:e8:40:61:98:49:b7:ce:56:
-         8a:f1:4d:94:4d:5e:52:22:7f:c5:d0:94:be:88:5b:ed:65:da:
-         00:9f:ba:ec:ba:ad:c4:81:19:16:ee:8f:93:32:88:a1:56:40:
-         7b:14
+    Signature Value:
+        7d:ed:91:a9:c8:03:55:eb:cf:5b:b4:99:f9:74:49:39:6f:f5:
+        8c:7c:f9:9c:26:2e:c3:26:22:b1:d7:aa:10:6f:1f:e0:77:76:
+        8a:19:dd:59:fc:09:81:36:aa:2a:42:96:2a:a8:0a:ee:b4:74:
+        cc:65:74:10:7d:ef:a5:69:ed:31:c1:c1:f2:2f:a1:1b:eb:12:
+        f2:86:0d:07:4f:0a:8e:9a:9f:8d:e8:40:61:98:49:b7:ce:56:
+        8a:f1:4d:94:4d:5e:52:22:7f:c5:d0:94:be:88:5b:ed:65:da:
+        00:9f:ba:ec:ba:ad:c4:81:19:16:ee:8f:93:32:88:a1:56:40:
+        7b:14
 Certificate:
     Data:
         Version: 3 (0x2)
@@ -37,7 +38,7 @@
         Subject: CN=Test OCSP Signer
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:ae:c4:41:84:d9:d0:fd:63:70:db:d6:95:08:b6:
                     9c:99:5c:34:87:6b:c9:36:d0:21:14:27:60:0d:84:
@@ -53,14 +54,15 @@
             X509v3 Extended Key Usage: 
                 OCSP Signing
     Signature Algorithm: sha1WithRSAEncryption
-         10:11:34:a4:b3:90:09:21:00:b4:ee:30:16:06:6d:11:f6:f3:
-         f2:42:77:fe:d7:7a:95:4d:77:b4:b5:75:c0:6f:5a:9d:98:83:
-         34:f0:5b:66:8a:54:93:b8:3b:e8:35:bd:15:5f:6c:79:92:0d:
-         80:da:92:db:a5:c2:80:d9:04:b6:47:2b:fc:73:b3:a8:24:02:
-         20:aa:65:e0:d7:6e:6c:7c:a0:52:25:8c:5f:90:25:7f:5f:23:
-         19:14:a5:0a:ba:05:6a:c3:1b:ff:53:1e:ae:8f:64:12:cf:95:
-         c9:7b:f4:d8:33:ef:98:2e:69:79:be:9d:18:58:57:73:f1:f3:
-         c7:62
+    Signature Value:
+        10:11:34:a4:b3:90:09:21:00:b4:ee:30:16:06:6d:11:f6:f3:
+        f2:42:77:fe:d7:7a:95:4d:77:b4:b5:75:c0:6f:5a:9d:98:83:
+        34:f0:5b:66:8a:54:93:b8:3b:e8:35:bd:15:5f:6c:79:92:0d:
+        80:da:92:db:a5:c2:80:d9:04:b6:47:2b:fc:73:b3:a8:24:02:
+        20:aa:65:e0:d7:6e:6c:7c:a0:52:25:8c:5f:90:25:7f:5f:23:
+        19:14:a5:0a:ba:05:6a:c3:1b:ff:53:1e:ae:8f:64:12:cf:95:
+        c9:7b:f4:d8:33:ef:98:2e:69:79:be:9d:18:58:57:73:f1:f3:
+        c7:62
 ~~~~~BEGIN CERTIFICATE~~~~~
 MIIByzCCATSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0
 IEludGVybWVkaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAw
@@ -96,14 +98,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -116,14 +118,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -141,14 +144,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -161,14 +164,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem b/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem
index f73b7ed..20ddc92 100644
--- a/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem
+++ b/pki/testdata/ocsp_unittest/ocsp_sign_indirect_missing.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         7d:ed:91:a9:c8:03:55:eb:cf:5b:b4:99:f9:74:49:39:6f:f5:
-         8c:7c:f9:9c:26:2e:c3:26:22:b1:d7:aa:10:6f:1f:e0:77:76:
-         8a:19:dd:59:fc:09:81:36:aa:2a:42:96:2a:a8:0a:ee:b4:74:
-         cc:65:74:10:7d:ef:a5:69:ed:31:c1:c1:f2:2f:a1:1b:eb:12:
-         f2:86:0d:07:4f:0a:8e:9a:9f:8d:e8:40:61:98:49:b7:ce:56:
-         8a:f1:4d:94:4d:5e:52:22:7f:c5:d0:94:be:88:5b:ed:65:da:
-         00:9f:ba:ec:ba:ad:c4:81:19:16:ee:8f:93:32:88:a1:56:40:
-         7b:14
+    Signature Value:
+        7d:ed:91:a9:c8:03:55:eb:cf:5b:b4:99:f9:74:49:39:6f:f5:
+        8c:7c:f9:9c:26:2e:c3:26:22:b1:d7:aa:10:6f:1f:e0:77:76:
+        8a:19:dd:59:fc:09:81:36:aa:2a:42:96:2a:a8:0a:ee:b4:74:
+        cc:65:74:10:7d:ef:a5:69:ed:31:c1:c1:f2:2f:a1:1b:eb:12:
+        f2:86:0d:07:4f:0a:8e:9a:9f:8d:e8:40:61:98:49:b7:ce:56:
+        8a:f1:4d:94:4d:5e:52:22:7f:c5:d0:94:be:88:5b:ed:65:da:
+        00:9f:ba:ec:ba:ad:c4:81:19:16:ee:8f:93:32:88:a1:56:40:
+        7b:14
 -----BEGIN OCSP RESPONSE-----
 MIIBMwoBAKCCASwwggEoBgkrBgEFBQcwAQEEggEZMIIBFTCBgaEdMBsxGTAXBgNVBAMMEFRlc3Q
 gT0NTUCBTaWduZXIYDzIwMTcwMzAyMDAwMDAwWjBPME0wODAHBgUrDgMCGgQURJscWzHG6ZkJZl
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/other_response.pem b/pki/testdata/ocsp_unittest/other_response.pem
index f276d7e..5a2e4ab 100644
--- a/pki/testdata/ocsp_unittest/other_response.pem
+++ b/pki/testdata/ocsp_unittest/other_response.pem
@@ -26,14 +26,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         88:bd:5f:27:0c:2a:24:c8:59:cf:b3:73:5d:33:69:76:ce:70:
-         57:2f:b5:9e:e7:fb:54:16:5f:15:ac:31:23:54:e3:d5:bf:b6:
-         52:dd:91:58:3d:c7:1f:cc:37:3c:c8:26:32:12:c4:be:30:6b:
-         c5:7f:d9:09:d3:e8:23:d8:72:49:bb:51:94:2b:10:8d:ab:de:
-         4a:33:23:21:62:55:4a:ae:af:27:42:d3:ed:65:f6:08:64:2c:
-         29:be:a5:20:e1:d9:8d:65:fe:29:9e:59:f1:35:d6:91:b8:25:
-         af:f5:db:b6:41:dc:03:2a:a8:6e:a6:0a:b7:25:68:fa:9f:1e:
-         da:3c
+    Signature Value:
+        88:bd:5f:27:0c:2a:24:c8:59:cf:b3:73:5d:33:69:76:ce:70:
+        57:2f:b5:9e:e7:fb:54:16:5f:15:ac:31:23:54:e3:d5:bf:b6:
+        52:dd:91:58:3d:c7:1f:cc:37:3c:c8:26:32:12:c4:be:30:6b:
+        c5:7f:d9:09:d3:e8:23:d8:72:49:bb:51:94:2b:10:8d:ab:de:
+        4a:33:23:21:62:55:4a:ae:af:27:42:d3:ed:65:f6:08:64:2c:
+        29:be:a5:20:e1:d9:8d:65:fe:29:9e:59:f1:35:d6:91:b8:25:
+        af:f5:db:b6:41:dc:03:2a:a8:6e:a6:0a:b7:25:68:fa:9f:1e:
+        da:3c
 -----BEGIN OCSP RESPONSE-----
 MIIBmAoBAKCCAZEwggGNBgkrBgEFBQcwAQEEggF+MIIBejCB5qEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowga8wTTA4MAcGBSsOAwIaBBQA8cpcf0
@@ -51,14 +52,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -71,14 +72,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -96,14 +98,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -116,14 +118,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/responder_id.pem b/pki/testdata/ocsp_unittest/responder_id.pem
index 1a337c1..79044f7 100644
--- a/pki/testdata/ocsp_unittest/responder_id.pem
+++ b/pki/testdata/ocsp_unittest/responder_id.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         80:88:aa:9f:d7:41:82:86:1e:76:7b:2d:69:ae:cc:1f:05:56:
-         a6:ef:06:9f:80:85:4b:c5:22:42:52:99:8b:3c:bc:df:37:b2:
-         55:10:31:a1:b3:ab:5e:7d:4c:30:ec:fa:80:f8:94:3b:27:2b:
-         21:8b:66:db:a2:62:01:d6:f1:e7:b3:af:02:46:f5:ab:f0:f1:
-         33:02:7f:68:47:a3:3f:73:09:a7:3f:9f:51:2c:56:99:6c:1d:
-         08:b2:b9:f3:3a:40:2c:1a:a9:e9:a8:63:05:e8:93:ee:b3:2c:
-         74:c4:9e:c7:e0:72:8e:40:e5:4c:ce:ec:26:3f:8c:1d:94:98:
-         1b:1f
+    Signature Value:
+        80:88:aa:9f:d7:41:82:86:1e:76:7b:2d:69:ae:cc:1f:05:56:
+        a6:ef:06:9f:80:85:4b:c5:22:42:52:99:8b:3c:bc:df:37:b2:
+        55:10:31:a1:b3:ab:5e:7d:4c:30:ec:fa:80:f8:94:3b:27:2b:
+        21:8b:66:db:a2:62:01:d6:f1:e7:b3:af:02:46:f5:ab:f0:f1:
+        33:02:7f:68:47:a3:3f:73:09:a7:3f:9f:51:2c:56:99:6c:1d:
+        08:b2:b9:f3:3a:40:2c:1a:a9:e9:a8:63:05:e8:93:ee:b3:2c:
+        74:c4:9e:c7:e0:72:8e:40:e5:4c:ce:ec:26:3f:8c:1d:94:98:
+        1b:1f
 -----BEGIN OCSP RESPONSE-----
 MIIBKwoBAKCCASQwggEgBgkrBgEFBQcwAQEEggERMIIBDTB6ohYEFH92WRBlO7VwQSTEHpSu/Pl
 AQxpmGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxumZCWZSPknD93PAJB
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/responder_name.pem b/pki/testdata/ocsp_unittest/responder_name.pem
index ee734d8..33e6634 100644
--- a/pki/testdata/ocsp_unittest/responder_name.pem
+++ b/pki/testdata/ocsp_unittest/responder_name.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
-         74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
-         15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
-         9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
-         73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
-         18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
-         49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
-         1b:74
+    Signature Value:
+        9b:ff:7a:5e:da:ef:06:69:21:2b:f1:e6:e5:d2:85:dc:70:7a:
+        74:ce:be:45:e8:e2:6e:ea:c8:cd:24:de:50:76:c1:4d:b1:7e:
+        15:4d:1c:47:ce:1c:55:7f:a2:20:fa:d3:ec:2b:df:db:b3:55:
+        9b:1e:0c:3c:a6:07:e7:4a:a1:d5:2f:01:84:77:a4:a1:02:0f:
+        73:1b:3f:48:74:af:8b:1b:a8:dc:a2:9c:c9:96:29:02:0a:98:
+        18:d0:48:a6:93:59:fd:ed:79:0c:84:f3:2f:f9:62:5a:f3:f9:
+        49:f3:ab:fc:0f:e9:46:64:f0:51:bd:5f:8f:ce:f4:ef:c2:4f:
+        1b:74
 -----BEGIN OCSP RESPONSE-----
 MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/revoke_response.pem b/pki/testdata/ocsp_unittest/revoke_response.pem
index 971879a..bd18c45 100644
--- a/pki/testdata/ocsp_unittest/revoke_response.pem
+++ b/pki/testdata/ocsp_unittest/revoke_response.pem
@@ -18,14 +18,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         68:51:72:4b:89:96:67:7c:49:22:e4:9b:b6:72:3f:6d:4c:61:
-         ad:fc:e0:78:85:d4:78:96:87:1a:61:a3:fc:37:ed:43:d9:96:
-         9f:d9:a8:bb:3f:51:5e:d3:10:09:22:80:0d:4e:a0:2e:0d:f3:
-         80:ca:c9:15:0e:1e:5f:0b:6a:aa:26:e9:1a:89:97:4b:4f:68:
-         08:e7:e7:c1:0b:93:58:26:01:b1:9b:0a:ae:38:97:b1:7a:9f:
-         63:47:c4:cb:8a:43:54:85:a3:9e:fb:e9:44:4c:a2:a5:25:ca:
-         bc:13:f3:1f:be:68:bd:3a:2e:d0:c1:71:69:57:5f:10:00:6f:
-         53:6f
+    Signature Value:
+        68:51:72:4b:89:96:67:7c:49:22:e4:9b:b6:72:3f:6d:4c:61:
+        ad:fc:e0:78:85:d4:78:96:87:1a:61:a3:fc:37:ed:43:d9:96:
+        9f:d9:a8:bb:3f:51:5e:d3:10:09:22:80:0d:4e:a0:2e:0d:f3:
+        80:ca:c9:15:0e:1e:5f:0b:6a:aa:26:e9:1a:89:97:4b:4f:68:
+        08:e7:e7:c1:0b:93:58:26:01:b1:9b:0a:ae:38:97:b1:7a:9f:
+        63:47:c4:cb:8a:43:54:85:a3:9e:fb:e9:44:4c:a2:a5:25:ca:
+        bc:13:f3:1f:be:68:bd:3a:2e:d0:c1:71:69:57:5f:10:00:6f:
+        53:6f
 -----BEGIN OCSP RESPONSE-----
 MIIBSAoBAKCCAUEwggE9BgkrBgEFBQcwAQEEggEuMIIBKjCBlqEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowYDBeMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -41,14 +42,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -61,14 +62,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -86,14 +88,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -106,14 +108,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/revoke_response_reason.pem b/pki/testdata/ocsp_unittest/revoke_response_reason.pem
index e446fcb..c923903 100644
--- a/pki/testdata/ocsp_unittest/revoke_response_reason.pem
+++ b/pki/testdata/ocsp_unittest/revoke_response_reason.pem
@@ -19,14 +19,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         b6:ce:d1:6e:78:bd:54:e6:a7:c4:b3:3c:af:1c:5c:14:27:9b:
-         54:a4:9d:b2:cb:90:99:37:26:1e:3e:2f:ce:81:44:56:66:7d:
-         8f:cd:be:b0:0d:ad:7f:c5:a1:86:92:a8:15:3d:1a:e4:ba:16:
-         f8:b4:35:25:88:68:9d:bd:6d:93:b1:c9:1b:13:f0:ef:4c:0b:
-         a0:30:54:ee:1a:9c:4d:43:41:51:00:fe:36:50:84:41:cd:c1:
-         9d:14:d7:98:6f:88:5e:ba:8f:33:33:55:c9:a2:44:0d:f0:6d:
-         c8:95:7d:1c:22:9e:f2:07:1d:66:72:03:67:ad:ab:ad:4b:82:
-         78:cf
+    Signature Value:
+        b6:ce:d1:6e:78:bd:54:e6:a7:c4:b3:3c:af:1c:5c:14:27:9b:
+        54:a4:9d:b2:cb:90:99:37:26:1e:3e:2f:ce:81:44:56:66:7d:
+        8f:cd:be:b0:0d:ad:7f:c5:a1:86:92:a8:15:3d:1a:e4:ba:16:
+        f8:b4:35:25:88:68:9d:bd:6d:93:b1:c9:1b:13:f0:ef:4c:0b:
+        a0:30:54:ee:1a:9c:4d:43:41:51:00:fe:36:50:84:41:cd:c1:
+        9d:14:d7:98:6f:88:5e:ba:8f:33:33:55:c9:a2:44:0d:f0:6d:
+        c8:95:7d:1c:22:9e:f2:07:1d:66:72:03:67:ad:ab:ad:4b:82:
+        78:cf
 -----BEGIN OCSP RESPONSE-----
 MIIBTQoBAKCCAUYwggFCBgkrBgEFBQcwAQEEggEzMIIBLzCBm6EhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowZTBjMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -43,14 +44,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -63,14 +64,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -88,14 +90,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -108,14 +110,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA
diff --git a/pki/testdata/ocsp_unittest/unknown_response.pem b/pki/testdata/ocsp_unittest/unknown_response.pem
index d58c516..ab15cd0 100644
--- a/pki/testdata/ocsp_unittest/unknown_response.pem
+++ b/pki/testdata/ocsp_unittest/unknown_response.pem
@@ -17,14 +17,15 @@
     This Update: Mar  1 00:00:00 2017 GMT
 
     Signature Algorithm: sha1WithRSAEncryption
-         66:e7:9d:45:af:e5:6e:eb:92:f5:b6:89:58:b5:3d:cb:97:0c:
-         ee:ba:c1:2b:19:cf:af:61:c6:f5:12:5f:29:7f:fb:e9:d3:3a:
-         5a:bb:fe:cd:17:2b:8c:4e:c8:b8:26:63:af:8f:7b:8f:67:8a:
-         d2:0e:33:0d:57:3d:49:ad:10:58:64:b5:81:f4:ac:0f:74:1a:
-         1a:2b:1f:02:ab:de:80:48:fb:3c:30:66:11:65:aa:3b:6a:39:
-         96:f8:50:00:31:1b:59:15:ba:18:29:be:ea:4f:4d:d9:68:b4:
-         75:6d:41:be:a5:59:f7:8c:9c:20:f3:73:8f:f0:c8:0a:59:32:
-         49:d7
+    Signature Value:
+        66:e7:9d:45:af:e5:6e:eb:92:f5:b6:89:58:b5:3d:cb:97:0c:
+        ee:ba:c1:2b:19:cf:af:61:c6:f5:12:5f:29:7f:fb:e9:d3:3a:
+        5a:bb:fe:cd:17:2b:8c:4e:c8:b8:26:63:af:8f:7b:8f:67:8a:
+        d2:0e:33:0d:57:3d:49:ad:10:58:64:b5:81:f4:ac:0f:74:1a:
+        1a:2b:1f:02:ab:de:80:48:fb:3c:30:66:11:65:aa:3b:6a:39:
+        96:f8:50:00:31:1b:59:15:ba:18:29:be:ea:4f:4d:d9:68:b4:
+        75:6d:41:be:a5:59:f7:8c:9c:20:f3:73:8f:f0:c8:0a:59:32:
+        49:d7
 -----BEGIN OCSP RESPONSE-----
 MIIBNwoBAKCCATAwggEsBgkrBgEFBQcwAQEEggEdMIIBGTCBhaEhMB8xHTAbBgNVBAMMFFRlc3Q
 gSW50ZXJtZWRpYXRlIENBGA8yMDE3MDMwMjAwMDAwMFowTzBNMDgwBwYFKw4DAhoEFESbHFsxxu
@@ -40,14 +41,14 @@
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test CA
+        Issuer: CN=Test CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Intermediate CA
+        Subject: CN=Test Intermediate CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:c5:fb:81:a7:1b:6a:61:38:1c:6a:de:dd:db:22:
                     61:64:7a:22:a3:3b:1d:e5:92:54:17:ad:39:2e:fe:
@@ -60,14 +61,15 @@
                     34:7c:d0:c6:99:6f:79:98:f9
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
-         1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
-         21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
-         2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
-         fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
-         22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
-         8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
-         30:01
+    Signature Value:
+        7d:67:0f:39:4e:7c:e3:ba:f2:63:b9:ed:6e:ec:61:f2:8a:4f:
+        1e:82:e2:4b:44:04:f8:a5:a1:5a:bc:8c:72:91:6d:bf:03:27:
+        21:10:9e:5c:8a:cf:4b:87:83:e0:c2:d7:72:55:d5:42:d3:d1:
+        2b:76:b3:42:84:e0:e8:3b:80:b2:5f:55:e7:e0:f6:b6:21:c6:
+        fd:91:b5:c9:ba:fa:d8:ba:5c:8b:e1:f6:de:5d:cf:39:e6:92:
+        22:85:31:1f:c3:ed:19:db:0a:0b:f9:ef:a7:36:4d:e1:54:af:
+        8e:c0:59:25:43:e5:69:47:c4:e0:00:1e:21:eb:e6:b4:13:8f:
+        30:01
 -----BEGIN CA CERTIFICATE-----
 MIIBqTCCARKgAwIBAgIBATANBgkqhkiG9w0BAQUFADASMRAwDgYDVQQDDAdUZXN0IENBMCIYDzI
 wMTcwMTAxMDAwMDAwWhgPMjAxODAxMDEwMDAwMDBaMB8xHTAbBgNVBAMMFFRlc3QgSW50ZXJtZW
@@ -85,14 +87,14 @@
         Version: 3 (0x2)
         Serial Number: 4 (0x4)
         Signature Algorithm: sha1WithRSAEncryption
-        Issuer: CN = Test Intermediate CA
+        Issuer: CN=Test Intermediate CA
         Validity
             Not Before: Jan  1 00:00:00 2017 GMT
             Not After : Jan  1 00:00:00 2018 GMT
-        Subject: CN = Test Cert
+        Subject: CN=Test Cert
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                RSA Public-Key: (1024 bit)
+                Public-Key: (1024 bit)
                 Modulus:
                     00:d1:d2:a7:fd:5f:56:b8:4a:4a:00:c4:f0:36:48:
                     0d:99:1e:ba:ca:8d:8c:0e:e9:5a:f4:31:94:26:f4:
@@ -105,14 +107,15 @@
                     95:c1:35:46:9e:db:9b:ce:9b
                 Exponent: 65537 (0x10001)
     Signature Algorithm: sha1WithRSAEncryption
-         8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
-         ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
-         5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
-         a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
-         26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
-         2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
-         82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
-         0a:53
+    Signature Value:
+        8e:94:5a:91:44:aa:ab:e4:bf:c4:ca:a3:ee:10:67:2d:3e:d5:
+        ac:b8:90:8b:4e:7f:3e:bc:83:bb:b2:c9:0c:a2:ae:fb:6c:b3:
+        5d:b7:40:20:9f:9b:7c:3d:5f:67:bc:0e:f9:20:bc:24:67:27:
+        a9:2e:81:08:e5:3f:ad:e9:b7:eb:a9:c5:58:55:55:f3:26:17:
+        26:46:5f:ef:20:38:c9:f2:81:ba:39:d9:28:4b:e8:83:ff:d7:
+        2e:87:72:36:77:0f:46:9b:a1:fe:d8:d8:20:50:68:c1:7b:66:
+        82:5d:62:94:90:98:71:8b:b9:83:69:a8:65:a4:58:5d:ce:90:
+        0a:53
 -----BEGIN CERTIFICATE-----
 MIIBqzCCARSgAwIBAgIBBDANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDDBRUZXN0IEludGVybWV
 kaWF0ZSBDQTAiGA8yMDE3MDEwMTAwMDAwMFoYDzIwMTgwMTAxMDAwMDAwWjAUMRIwEAYDVQQDDA