Consolidate some more verify_certificate_chain_unittest/ data.

Combine the 8 keyUsage generator scripts into a single one.
(And delete the redundant keys).

Review-Url: https://codereview.chromium.org/2859053002
Cr-Commit-Position: refs/heads/master@{#469358}
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 89db6f4..1d5f8bd 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -3444,22 +3444,6 @@
     "data/verify_certificate_chain_unittest/root-lacks-basic-constraints/chain.pem",
     "data/verify_certificate_chain_unittest/root-lacks-basic-constraints/main.test",
     "data/verify_certificate_chain_unittest/root-lacks-basic-constraints/ta-with-constraints.test",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/main.test",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/main.test",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/main.test",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/main.test",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/main.test",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/main.test",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/chain.pem",
-    "data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/main.test",
     "data/verify_certificate_chain_unittest/target-and-intermediate/chain.pem",
     "data/verify_certificate_chain_unittest/target-and-intermediate/main.test",
     "data/verify_certificate_chain_unittest/target-has-keycertsign-but-not-ca/chain.pem",
@@ -3472,6 +3456,22 @@
     "data/verify_certificate_chain_unittest/target-not-end-entity/main.test",
     "data/verify_certificate_chain_unittest/target-restricts-eku-fail/chain.pem",
     "data/verify_certificate_chain_unittest/target-restricts-eku-fail/main.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.test",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.pem",
+    "data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.test",
     "data/verify_certificate_chain_unittest/target-sets-eku-any/chain.pem",
     "data/verify_certificate_chain_unittest/target-sets-eku-any/main.test",
     "data/verify_certificate_chain_unittest/target-signed-by-512bit-rsa/chain.pem",
diff --git a/net/cert/internal/verify_certificate_chain_typed_unittest.h b/net/cert/internal/verify_certificate_chain_typed_unittest.h
index 63bba1c6..9ec8740 100644
--- a/net/cert/internal/verify_certificate_chain_typed_unittest.h
+++ b/net/cert/internal/verify_certificate_chain_typed_unittest.h
@@ -105,15 +105,16 @@
   this->RunTest("intermediate-lacks-signing-key-usage/main.test");
   this->RunTest("target-has-keycertsign-but-not-ca/main.test");
 
-  this->RunTest("serverauth-ec-ku-decipheronly/main.test");
-  this->RunTest("serverauth-ec-ku-digitalsignature/main.test");
-  this->RunTest("serverauth-ec-ku-keyagreement/main.test");
-  this->RunTest("serverauth-ec-ku-keyencipherment/main.test");
+  this->RunTest("target-serverauth-various-keyusages/rsa-decipherOnly.test");
+  this->RunTest(
+      "target-serverauth-various-keyusages/rsa-digitalSignature.test");
+  this->RunTest("target-serverauth-various-keyusages/rsa-keyAgreement.test");
+  this->RunTest("target-serverauth-various-keyusages/rsa-keyEncipherment.test");
 
-  this->RunTest("serverauth-rsa-ku-decipheronly/main.test");
-  this->RunTest("serverauth-rsa-ku-digitalsignature/main.test");
-  this->RunTest("serverauth-rsa-ku-keyagreement/main.test");
-  this->RunTest("serverauth-rsa-ku-keyencipherment/main.test");
+  this->RunTest("target-serverauth-various-keyusages/ec-decipherOnly.test");
+  this->RunTest("target-serverauth-various-keyusages/ec-digitalSignature.test");
+  this->RunTest("target-serverauth-various-keyusages/ec-keyAgreement.test");
+  this->RunTest("target-serverauth-various-keyusages/ec-keyEncipherment.test");
 }
 
 TYPED_TEST_P(VerifyCertificateChainSingleRootTest, ExtendedKeyUsage) {
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/chain.pem b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/chain.pem
deleted file mode 100644
index 972d141..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/chain.pem
+++ /dev/null
@@ -1,257 +0,0 @@
-[Created by: generate-chains.py]
-
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only decipherOnly.
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Intermediate
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Target
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub: 
-                    04:d1:cf:61:33:ef:4c:6f:37:a7:7c:f9:f4:4b:27:
-                    ff:db:db:e5:62:a9:49:ad:91:ca:b5:c6:a2:28:b1:
-                    b4:c9:07:7e:00:d0:6f:ac:52:7b:a3:71:98:21:a4:
-                    2a:25:90:8e:ea:25:53:0e:b4:16:cd:6b:b1:6d:a3:
-                    82:da:97:63:6e:1f:b1:ad:51:43:19:88:65:98:ce:
-                    0c:d2:72:32:6f:9f:03:61:90:a1:14:1d:be:22:36:
-                    ef:04:ad:e2:c6:2c:be
-                ASN1 OID: secp384r1
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                7F:D2:AB:42:C8:F5:F8:00:89:AC:48:F5:4E:C5:9F:A9:2F:31:CC:C2
-            X509v3 Authority Key Identifier: 
-                keyid:37:12:75:29:6D:FF:89:6B:05:DB:4C:84:34:8A:E4:7E:3E:29:61:1F
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Intermediate.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Intermediate.crl
-
-            X509v3 Key Usage: critical
-                Decipher Only
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-    Signature Algorithm: sha256WithRSAEncryption
-         64:5d:c0:4d:04:16:26:f9:17:cb:a9:e8:e3:5f:a8:87:fd:9a:
-         12:b5:f7:25:d8:95:d9:54:f9:a1:6c:77:ce:dd:e0:cb:5b:8f:
-         ea:b2:45:b6:57:61:5f:8d:f7:d7:54:1c:0c:09:36:14:d7:c9:
-         22:ca:57:d1:cd:6a:5c:aa:94:1c:39:4a:20:78:9c:16:4c:14:
-         ab:51:ac:04:67:8d:25:dd:96:06:d1:8b:37:0c:2f:89:d7:b9:
-         32:cc:60:f3:63:e1:4d:d4:dd:1f:fb:41:e1:24:98:0d:85:ec:
-         db:47:27:b5:77:65:6f:1c:44:48:a4:d2:bf:b8:35:17:ad:62:
-         b4:92:65:83:f0:05:ac:5e:98:d6:e8:15:74:ce:db:f1:0e:21:
-         94:cf:89:d5:52:47:02:f3:3b:b7:b8:b8:33:6f:03:fb:9b:ac:
-         d3:a5:61:33:e5:75:96:66:df:7c:1d:10:b2:ef:74:b6:97:2b:
-         8c:68:d0:03:ac:82:43:fc:2f:35:77:e7:22:be:fa:a0:2a:92:
-         80:f9:50:83:3b:fe:ce:41:50:92:80:2b:a3:0d:80:e1:6f:32:
-         fa:0a:79:d4:5b:e9:91:8c:86:b2:2a:66:37:8e:84:72:93:06:
-         5c:25:c5:bd:0d:9e:e6:a8:ac:a7:79:6f:dc:6e:a5:8a:d5:e5:
-         49:e4:06:d5
------BEGIN CERTIFICATE-----
-MIIC1jCCAb6gAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
-cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATRz2Ez70xvN6d8+fRL
-J//b2+ViqUmtkcq1xqIosbTJB34A0G+sUnujcZghpColkI7qJVMOtBbNa7Fto4La
-l2NuH7GtUUMZiGWYzgzScjJvnwNhkKEUHb4iNu8EreLGLL6jgeAwgd0wHQYDVR0O
-BBYEFH/Sq0LI9fgAiaxI9U7Fn6kvMczCMB8GA1UdIwQYMBaAFDcSdSlt/4lrBdtM
-hDSK5H4+KWEfMD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
-bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
-cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDwYDVR0PAQH/BAUDAwcA
-gDATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEAZF3ATQQW
-JvkXy6no41+oh/2aErX3JdiV2VT5oWx3zt3gy1uP6rJFtldhX43311QcDAk2FNfJ
-IspX0c1qXKqUHDlKIHicFkwUq1GsBGeNJd2WBtGLNwwvide5Msxg82PhTdTdH/tB
-4SSYDYXs20cntXdlbxxESKTSv7g1F61itJJlg/AFrF6Y1ugVdM7b8Q4hlM+J1VJH
-AvM7t7i4M28D+5us06VhM+V1lmbffB0Qsu90tpcrjGjQA6yCQ/wvNXfnIr76oCqS
-gPlQgzv+zkFQkoArow2A4W8y+gp51FvpkYyGsipmN46EcpMGXCXFvQ2e5qisp3lv
-3G6litXlSeQG1Q==
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Intermediate
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b8:8b:90:32:c2:17:b6:29:eb:5a:a1:95:9d:f7:
-                    02:ba:e3:c6:f2:1a:24:97:1d:66:04:4e:9c:82:80:
-                    fd:a6:e9:76:95:43:4d:57:e5:0d:a8:48:88:bc:2c:
-                    38:08:60:68:3f:c3:08:f5:0c:03:e5:26:10:1c:3d:
-                    a7:f1:a6:9a:48:ff:a1:4a:fb:8e:bc:4f:48:41:7c:
-                    32:a1:30:b9:3b:7b:c7:3b:79:d4:f6:52:f7:47:73:
-                    7c:d1:c4:3f:cc:33:36:82:d7:25:b8:14:46:90:41:
-                    2e:d1:43:b4:99:c5:24:ec:84:16:82:c2:39:e3:8b:
-                    f6:e1:19:82:06:eb:71:8f:ed:cf:50:c7:ba:c2:d0:
-                    88:eb:a9:e6:6e:2a:4f:0b:e7:03:13:72:4e:29:ba:
-                    ca:4c:92:10:a0:39:e4:85:6a:1a:74:17:39:39:2e:
-                    c8:97:54:01:68:4f:0b:5c:80:3d:8f:b1:ae:a5:58:
-                    43:ab:5c:69:67:a2:c4:27:24:6d:71:60:dd:7b:14:
-                    e3:56:61:96:09:e6:7b:3b:f0:e9:3b:07:b4:43:32:
-                    9f:3e:8b:52:fe:50:1e:3d:b7:e5:cd:f8:97:82:48:
-                    f6:42:7b:69:3d:bb:90:1b:aa:f2:82:f6:d5:fd:30:
-                    48:c3:c6:96:e6:62:91:7f:73:5b:ab:34:0c:ef:be:
-                    65:bf
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                37:12:75:29:6D:FF:89:6B:05:DB:4C:84:34:8A:E4:7E:3E:29:61:1F
-            X509v3 Authority Key Identifier: 
-                keyid:B9:85:5C:53:ED:42:DC:3E:51:38:73:99:A1:EF:87:D4:E2:28:0E:9D
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         95:d5:38:db:53:98:3b:48:9f:4b:18:fa:59:98:e2:9f:ee:13:
-         9f:90:c9:84:46:28:1d:a3:bc:9c:56:46:73:25:c1:16:43:00:
-         44:77:27:e8:73:13:db:6e:9f:b7:12:aa:08:0b:8a:6f:58:89:
-         56:a3:19:6a:c6:8e:fc:2e:90:fd:93:7f:a4:75:73:fb:fd:23:
-         31:e3:cb:51:50:57:3d:04:b8:3f:ac:b3:97:c2:4d:a9:95:38:
-         a9:04:27:6a:c9:a5:b0:cc:bf:d8:d3:fd:dd:a6:42:d3:ff:ee:
-         cb:b5:15:10:a8:b3:e1:12:6f:80:3a:a4:c1:f6:b7:bf:6a:1d:
-         d2:cc:23:d6:fe:54:06:26:6b:af:ed:d8:75:ea:62:12:68:be:
-         6c:75:9a:cc:59:86:a1:f8:88:28:1d:77:18:01:c7:ed:f4:30:
-         65:b8:aa:96:77:d9:2e:92:11:f2:d9:7b:e5:4f:0d:dc:80:28:
-         0b:69:0a:c0:86:df:c0:41:cd:50:d0:15:ba:3c:a3:26:b0:0f:
-         ce:53:06:bd:97:f8:9a:ed:29:f5:5a:8b:23:a6:e3:26:ac:f5:
-         5c:31:0b:20:1f:03:5d:06:c7:2f:6a:51:f4:44:5c:02:98:b2:
-         b4:3e:ea:f3:fc:ef:b4:d0:ac:13:d2:f9:8e:fd:e8:65:a8:69:
-         9b:1d:ac:10
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowFzEVMBMGA1UEAwwMSW50
-ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIuQMsIX
-tinrWqGVnfcCuuPG8hoklx1mBE6cgoD9pul2lUNNV+UNqEiIvCw4CGBoP8MI9QwD
-5SYQHD2n8aaaSP+hSvuOvE9IQXwyoTC5O3vHO3nU9lL3R3N80cQ/zDM2gtcluBRG
-kEEu0UO0mcUk7IQWgsI544v24RmCButxj+3PUMe6wtCI66nmbipPC+cDE3JOKbrK
-TJIQoDnkhWoadBc5OS7Il1QBaE8LXIA9j7GupVhDq1xpZ6LEJyRtcWDdexTjVmGW
-CeZ7O/DpOwe0QzKfPotS/lAePbflzfiXgkj2QntpPbuQG6rygvbV/TBIw8aW5mKR
-f3NbqzQM775lvwIDAQABo4HLMIHIMB0GA1UdDgQWBBQ3EnUpbf+JawXbTIQ0iuR+
-PilhHzAfBgNVHSMEGDAWgBS5hVxT7ULcPlE4c5mh74fU4igOnTA3BggrBgEFBQcB
-AQQrMCkwJwYIKwYBBQUHMAKGG2h0dHA6Ly91cmwtZm9yLWFpYS9Sb290LmNlcjAs
-BgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vdXJsLWZvci1jcmwvUm9vdC5jcmwwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AJXVONtTmDtIn0sY+lmY4p/uE5+QyYRGKB2jvJxWRnMlwRZDAER3J+hzE9tun7cS
-qggLim9YiVajGWrGjvwukP2Tf6R1c/v9IzHjy1FQVz0EuD+ss5fCTamVOKkEJ2rJ
-pbDMv9jT/d2mQtP/7su1FRCos+ESb4A6pMH2t79qHdLMI9b+VAYma6/t2HXqYhJo
-vmx1msxZhqH4iCgddxgBx+30MGW4qpZ32S6SEfLZe+VPDdyAKAtpCsCG38BBzVDQ
-Fbo8oyawD85TBr2X+JrtKfVaiyOm4yas9VwxCyAfA10Gxy9qUfREXAKYsrQ+6vP8
-77TQrBPS+Y796GWoaZsdrBA=
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b3:fe:a1:cc:0e:bd:61:9d:d2:4d:30:ca:ea:9a:
-                    b8:96:8f:c1:31:da:d0:a5:26:32:30:42:a2:e0:a4:
-                    ad:2c:71:c3:b5:bf:18:81:b8:12:a1:a9:fd:a7:97:
-                    b1:16:ed:78:4a:38:45:2a:2e:59:0d:40:0a:8d:b4:
-                    b7:31:49:c6:7c:1e:c7:7f:42:88:47:65:20:c0:dc:
-                    fe:91:87:1f:01:da:70:be:5c:8e:31:cf:92:69:bf:
-                    95:64:54:d9:76:3e:df:9d:eb:c3:7c:81:03:f3:97:
-                    aa:46:ba:82:48:03:57:99:86:9e:f4:83:0a:e6:01:
-                    40:cc:c0:b0:42:66:63:e6:51:26:ae:b2:0f:d5:0f:
-                    32:08:02:17:29:7e:75:8a:d1:df:42:da:67:a9:3b:
-                    47:71:90:7c:9f:52:6d:d5:4a:0f:f9:20:56:25:e9:
-                    a9:2b:aa:01:73:af:28:1f:00:45:30:13:69:94:21:
-                    e7:e6:f0:76:39:7b:c8:e7:07:c3:39:f3:f6:da:42:
-                    3f:57:6b:47:fe:fa:30:a8:08:d3:de:4d:40:38:aa:
-                    e4:97:bd:82:f5:e9:e8:2e:92:14:69:9f:d1:22:41:
-                    7e:05:40:74:07:ab:79:63:31:5b:e3:95:c3:4e:23:
-                    a8:a6:7f:f8:b7:8a:5d:d4:f8:e1:8b:75:5b:44:06:
-                    08:c1
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                B9:85:5C:53:ED:42:DC:3E:51:38:73:99:A1:EF:87:D4:E2:28:0E:9D
-            X509v3 Authority Key Identifier: 
-                keyid:B9:85:5C:53:ED:42:DC:3E:51:38:73:99:A1:EF:87:D4:E2:28:0E:9D
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         2f:23:ee:6a:dd:bb:59:2d:57:cf:94:f3:1b:5c:fb:d9:6e:dd:
-         74:12:96:6e:7f:31:8c:00:ee:60:03:80:89:d8:78:4a:71:60:
-         31:df:74:f5:e6:26:67:6e:91:5e:e8:a2:ef:b6:da:e4:03:bd:
-         30:e1:4b:4b:bb:9e:5f:d3:4b:31:af:64:bd:76:48:de:68:4b:
-         80:59:85:93:12:ac:65:42:01:ea:33:28:6c:af:c5:af:cc:0a:
-         41:89:12:98:f1:1d:54:b6:dd:f1:ff:45:d4:3f:64:84:15:46:
-         d7:35:bb:09:19:66:f0:8b:db:11:8d:7a:fb:11:ea:7f:e2:57:
-         96:47:da:23:81:c1:b6:71:d2:33:98:88:35:d5:90:e1:93:87:
-         32:36:c7:a7:f1:c0:55:a5:94:65:62:14:e4:18:e7:64:2d:6d:
-         40:6e:ba:5b:66:39:a4:d8:1f:1c:a8:9f:80:5a:d7:35:5a:47:
-         44:32:b6:a2:18:26:08:08:2e:8f:9a:6b:f6:f5:5c:95:46:27:
-         8e:d5:fb:c0:d5:52:3d:e5:a4:23:0e:f4:30:ba:ce:79:b8:63:
-         fd:e2:aa:56:05:b4:15:f7:4f:41:b3:88:31:29:97:51:71:52:
-         04:95:00:64:7c:7a:c7:35:b9:22:d0:32:9a:bd:2f:c6:ea:7d:
-         3a:2d:29:39
------BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowDzENMAsGA1UEAwwEUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALP+ocwOvWGd0k0wyuqa
-uJaPwTHa0KUmMjBCouCkrSxxw7W/GIG4EqGp/aeXsRbteEo4RSouWQ1ACo20tzFJ
-xnwex39CiEdlIMDc/pGHHwHacL5cjjHPkmm/lWRU2XY+353rw3yBA/OXqka6gkgD
-V5mGnvSDCuYBQMzAsEJmY+ZRJq6yD9UPMggCFyl+dYrR30LaZ6k7R3GQfJ9SbdVK
-D/kgViXpqSuqAXOvKB8ARTATaZQh5+bwdjl7yOcHwznz9tpCP1drR/76MKgI095N
-QDiq5Je9gvXp6C6SFGmf0SJBfgVAdAereWMxW+OVw04jqKZ/+LeKXdT44Yt1W0QG
-CMECAwEAAaOByzCByDAdBgNVHQ4EFgQUuYVcU+1C3D5ROHOZoe+H1OIoDp0wHwYD
-VR0jBBgwFoAUuYVcU+1C3D5ROHOZoe+H1OIoDp0wNwYIKwYBBQUHAQEEKzApMCcG
-CCsGAQUFBzAChhtodHRwOi8vdXJsLWZvci1haWEvUm9vdC5jZXIwLAYDVR0fBCUw
-IzAhoB+gHYYbaHR0cDovL3VybC1mb3ItY3JsL1Jvb3QuY3JsMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAvI+5q3btZ
-LVfPlPMbXPvZbt10EpZufzGMAO5gA4CJ2HhKcWAx33T15iZnbpFe6KLvttrkA70w
-4UtLu55f00sxr2S9dkjeaEuAWYWTEqxlQgHqMyhsr8WvzApBiRKY8R1Utt3x/0XU
-P2SEFUbXNbsJGWbwi9sRjXr7Eep/4leWR9ojgcG2cdIzmIg11ZDhk4cyNsen8cBV
-pZRlYhTkGOdkLW1AbrpbZjmk2B8cqJ+AWtc1WkdEMraiGCYICC6Pmmv29VyVRieO
-1fvA1VI95aQjDvQwus55uGP94qpWBbQV909Bs4gxKZdRcVIElQBkfHrHNbki0DKa
-vS/G6n06LSk5
------END CERTIFICATE-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/generate-chains.py
deleted file mode 100755
index ca79468..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only decipherOnly."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_ec_key(
-    'secp384r1', common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,decipherOnly')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Intermediate.key
deleted file mode 100644
index 4b8c2ed..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Intermediate.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAuIuQMsIXtinrWqGVnfcCuuPG8hoklx1mBE6cgoD9pul2lUNN
-V+UNqEiIvCw4CGBoP8MI9QwD5SYQHD2n8aaaSP+hSvuOvE9IQXwyoTC5O3vHO3nU
-9lL3R3N80cQ/zDM2gtcluBRGkEEu0UO0mcUk7IQWgsI544v24RmCButxj+3PUMe6
-wtCI66nmbipPC+cDE3JOKbrKTJIQoDnkhWoadBc5OS7Il1QBaE8LXIA9j7GupVhD
-q1xpZ6LEJyRtcWDdexTjVmGWCeZ7O/DpOwe0QzKfPotS/lAePbflzfiXgkj2Qntp
-PbuQG6rygvbV/TBIw8aW5mKRf3NbqzQM775lvwIDAQABAoIBAQCZ05uq86aYLXEE
-5tO0DIW2Cs92VtxRKiwzQuOq1KKaUtiJqsP5k/BCadOwJpu+P74mCAibWhyVEZk0
-MSCgiWLpnktwGSftR5jPHRuGyPpd3ts/dFpTyOxeHqHYqGEVcUrq3TOPsTbwX6UK
-wgj0dCRHEgNBk2x1g+GR2JVN90t90CwwWdOdqc5o2KKjiTz3schg9nqs4JoXfugP
-1YG+Ze8fXVvdlWN5LlI1rTCxFPAdZ5zkAFIbqm8jfcWwYelIJPRbti53rblOXD2s
-Hpzswj4zKfefYgR+W+BEaKNaAtPe1Auj08FbZHDsMS2bEPxbhmCVZ/LXTP0W6tzV
-n1YpwWqhAoGBAPGaXjhx8qmmlzQNag7wUZYBif1k8BceWV4BhSJqbq0AqR2a1pES
-8WltQd7zNe9tGe880+hqTS3ysPTco2wvz7rj7dc9850VUrXkuRGPsn5DRl7d9T//
-2xbctIuFEykx21Fy+CoqZ7JSc/xypcgPwY9E4Rw4NzplJ7jJx2FfC4M1AoGBAMOK
-yH1tA9SSoBx5QFBMjSjAHBwKyfR4BAbFocy3Kq0tfYnhohX4aHa1V3x13EkQIVf+
-fWRm2Miihy7OJtV1T7GvtxxgRzQKA6QCrU/wnj8HNr/pZeZ0RHxdbbZ1x7rl+d0C
-M6/sl5JacNsgRnKMTVIP3hLkmwCOwhY8HKFTSs+jAoGBALgOeO8ZZ9t0rUYbXgvp
-as4TeBNRvVJvbXefQtSYLp6fnTaPihzVSJKfiIoX0KQJArPuLCWoLgnuFH9GQz2d
-IuzmzX+nk5q87tjhWVgWl8125PpKr5bFDRxaoTSU+abtc36WTpaY3YzNIc1VbhR+
-ZGAIAlKkRPa4r00oczsr1DJtAoGBAJJFvrQUWEkrZZnnGbT3jqBtFJnleCznmht2
-uxHn8oSZAs+heR32NC6YeFkh0SbWahrow+PXC1MKQRVCIMqMdpD0YIVZf+ntk8uc
-NQkXdUiwnMPyU8eQMarWOLvEXyPv5HjurLtsv/U6sjE4c3o8eZppRDXdzBUetRDs
-5n3HUK8BAoGBAIOQUCXgjzkTYkvSDXrl8XCqAEbXsHFsWSWFZzm6OSaWbKXvhFY2
-fn7xZ3sn169vbijMzsZwx0wo4C/0FciHhgX9hOAd96bcSAurUs6bg5RI/BptLIf1
-I4krYWh8h79gU4QS6x8eSMGy+7NLa2L+LyVt3ApRT1NlI0x8P8uixXNQ
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Root.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Root.key
deleted file mode 100644
index 33f5f49..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Root.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAs/6hzA69YZ3STTDK6pq4lo/BMdrQpSYyMEKi4KStLHHDtb8Y
-gbgSoan9p5exFu14SjhFKi5ZDUAKjbS3MUnGfB7Hf0KIR2UgwNz+kYcfAdpwvlyO
-Mc+Sab+VZFTZdj7fnevDfIED85eqRrqCSANXmYae9IMK5gFAzMCwQmZj5lEmrrIP
-1Q8yCAIXKX51itHfQtpnqTtHcZB8n1Jt1UoP+SBWJempK6oBc68oHwBFMBNplCHn
-5vB2OXvI5wfDOfP22kI/V2tH/vowqAjT3k1AOKrkl72C9enoLpIUaZ/RIkF+BUB0
-B6t5YzFb45XDTiOopn/4t4pd1Pjhi3VbRAYIwQIDAQABAoIBADkPd+tgoNjZV1nx
-JeLJucrBN9W+MHaqbS6vcUMV8XAtgIWVVweIex+U7Dy88f76uS+ONx7wInr42l+h
-8pFFeg7PEx9c0CcSABgj9u/bjhDgVu2CGfHgg+HSQmHUJDxAIlPF8er+W2pVoj1Z
-0wNRS+v3qVyKTmIr84b1busd2n2go9qbNzZ9dt/7sbXMhrdXMHh7JU+aJcDKWVej
-93T/Fdfsjy2Zj3a7uCBK48y5yLbGKkL+lFkad3kpRrKORhZx7R0yWkYSF75g75XO
-FO4+bBCeD9Sv2J/cbGxRiJIU1ECjpl/jR97PqUWzJXhJw6DAmaugx8mlbRu0iA0E
-jao28SECgYEA5kwimGfTHEPTRPiGC6osXDGN1uP70kn4aUUvQTPr/oEy5i4bjy/0
-Es1jCCcRRNLRZ3t8wei7wOpZFXx/1s2TvuXlzqbqPLMM1Ta9qSsBTQlmWtyPLHVp
-2ktLam1BGBAFOEG86W3kqDixeJXvs0i7D5236rRnZgamQo7WxmTGsFsCgYEAyBVJ
-8tJp9Hq2cJVXe6wIe+Ap/ie7M8NXe4WLLrBFMTjPSM6XbauHnat8FKMXDfX2+smT
-zqjBd3UtJszyR0BpPl9roJeCvzDPg5QFV3+zU7OgzIgGQDpAnhgjNxngRXk/cGc6
-GxYV+NNnNHyttAT2UbZXowc2ZxVgFF7w29yHdhMCgYEA0XLk899ZbRdyigPNRcab
-Wa3n5kyqtnJ37qXxeEeUln9Cn33Hqs5eGMubCcseNY3WzVrN+D2GpMl+A8CbM+z8
-Nl44R14fIt1lCnUiwTxPjpTB9lkqDbEreFGKYVzEGvJXDPccrOA5WZVWMumKe2/m
-USmMH3W7pFrf0yC9zOnSmokCgYAZM81Hv8dG2zolvjnxwv6ik97WO6zx3TYkwfKB
-JATjKVO6yQL79nIzowkTFGPwBz5f4ooyqsELyf+w9nnCDdPz3lMRPGRkrsJEwZ1W
-oyg0b9jeSnf3GR9QipvM8f504cvi3a3NAaAs4nwKeXXrygA41K3/RAZPP7sFddwC
-5alObwKBgC/F6pM1LSBWcIK3ocEHc9TGYBS8w/nswkJmKDUBUwlpjBgU6nhfM9OO
-QEO3JdJrDS34UjXYj4itBVkQw0RDNZ0wbk0Es/xjXJAdWj4lAI3YXD7YAe3dL1lL
-cXKB3vy+6DPM15fRpBajjVtGqFaayh5Hit+DVc3GDH1WUALnmytv
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Target.key
deleted file mode 100644
index 0f59eb4..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/keys/Target.key
+++ /dev/null
@@ -1,10 +0,0 @@
-openssl ecparam -name secp384r1 -genkey
------BEGIN EC PARAMETERS-----
-BgUrgQQAIg==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB0URyP+sY4LS517XxDUVrEFdySi/C2hknmKwNjdc9vJZe7E9R2iJd4
-KWUVOI06nkygBwYFK4EEACKhZANiAATRz2Ez70xvN6d8+fRLJ//b2+ViqUmtkcq1
-xqIosbTJB34A0G+sUnujcZghpColkI7qJVMOtBbNa7Fto4Lal2NuH7GtUUMZiGWY
-zgzScjJvnwNhkKEUHb4iNu8EreLGLL4=
------END EC PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/chain.pem b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/chain.pem
deleted file mode 100644
index 0a8d35c..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/chain.pem
+++ /dev/null
@@ -1,257 +0,0 @@
-[Created by: generate-chains.py]
-
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only digitalSignature.
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Intermediate
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Target
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub: 
-                    04:5d:dd:e7:4e:0b:94:b3:49:ca:2e:ef:b5:84:f5:
-                    62:47:73:82:97:14:09:56:42:b5:29:87:38:8b:b1:
-                    99:f4:a7:07:d4:d9:e0:03:74:40:9f:d2:e4:34:ba:
-                    89:75:27:3b:a9:a0:1a:8a:25:19:f2:af:b6:9e:3e:
-                    8c:0e:ee:f1:11:00:b4:a8:dc:49:85:bf:2b:55:6f:
-                    ec:83:24:fe:8d:81:2b:e7:da:fa:88:05:99:15:ee:
-                    1c:2d:73:df:09:79:70
-                ASN1 OID: secp384r1
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                20:1C:41:C2:17:E4:79:4A:12:01:6E:24:85:49:38:39:DE:64:93:FF
-            X509v3 Authority Key Identifier: 
-                keyid:42:FF:88:7A:D0:CD:5A:B3:39:5A:71:B9:EE:C4:8B:31:37:B4:79:39
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Intermediate.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Intermediate.crl
-
-            X509v3 Key Usage: critical
-                Digital Signature
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-    Signature Algorithm: sha256WithRSAEncryption
-         7e:83:56:3b:27:c1:a1:b4:fb:1e:11:f6:81:c5:44:a4:3e:66:
-         3d:00:b9:fa:c7:5d:28:72:0a:ab:96:31:33:ef:5a:49:59:d5:
-         e1:db:a0:04:e6:30:79:f2:94:83:2f:36:d8:3f:ff:c0:5b:09:
-         14:5b:85:3a:ef:0b:d4:7e:cb:9c:d7:55:4f:7a:3c:7e:53:b7:
-         42:62:60:e6:8e:35:24:10:2d:c8:9a:33:0d:ad:2f:f7:7e:06:
-         1b:bf:54:7e:09:7d:a2:0e:5a:7e:8a:20:f7:0f:f7:0d:4c:e5:
-         fa:98:ce:db:b2:88:ac:15:f5:00:d9:b6:c0:21:ff:98:71:af:
-         ac:88:d4:8a:c1:18:2a:2c:b5:6d:05:ff:be:b7:45:b3:fd:90:
-         37:fa:7a:ba:58:ca:c4:38:db:d3:bb:74:a6:f8:1f:c4:84:cb:
-         97:cf:83:5f:6a:18:9e:42:41:ad:e6:69:66:f8:f4:9d:0d:84:
-         b8:58:01:98:06:1b:2d:c0:2a:3e:e5:73:4a:ea:8c:99:81:5e:
-         51:38:74:18:f5:2a:a4:c8:d3:7e:37:a3:b8:40:39:a7:77:0d:
-         51:ce:b2:68:e7:4b:c3:4f:74:e8:bf:c6:bc:75:24:73:d2:4c:
-         8d:fd:30:24:12:62:06:5d:28:ad:1c:0f:0c:fe:7c:4f:b2:f9:
-         b8:26:03:a9
------BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
-cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARd3edOC5SzScou77WE
-9WJHc4KXFAlWQrUphziLsZn0pwfU2eADdECf0uQ0uol1JzupoBqKJRnyr7aePowO
-7vERALSo3EmFvytVb+yDJP6NgSvn2vqIBZkV7hwtc98JeXCjgd8wgdwwHQYDVR0O
-BBYEFCAcQcIX5HlKEgFuJIVJODneZJP/MB8GA1UdIwQYMBaAFEL/iHrQzVqzOVpx
-ue7EizE3tHk5MD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
-bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
-cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgeA
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQB+g1Y7J8Gh
-tPseEfaBxUSkPmY9ALn6x10ocgqrljEz71pJWdXh26AE5jB58pSDLzbYP//AWwkU
-W4U67wvUfsuc11VPejx+U7dCYmDmjjUkEC3ImjMNrS/3fgYbv1R+CX2iDlp+iiD3
-D/cNTOX6mM7bsoisFfUA2bbAIf+Yca+siNSKwRgqLLVtBf++t0Wz/ZA3+nq6WMrE
-ONvTu3Sm+B/EhMuXz4NfahieQkGt5mlm+PSdDYS4WAGYBhstwCo+5XNK6oyZgV5R
-OHQY9SqkyNN+N6O4QDmndw1RzrJo50vDT3Tov8a8dSRz0kyN/TAkEmIGXSitHA8M
-/nxPsvm4JgOp
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Intermediate
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:bf:63:9e:47:6f:ce:09:cd:c9:87:ea:4c:5b:5e:
-                    a4:34:45:e2:07:d3:88:5f:94:1f:d8:8c:9f:ca:bf:
-                    c4:65:10:08:4c:23:3d:23:62:ca:f1:87:23:5f:bb:
-                    62:67:1c:cc:42:0c:d4:63:0d:63:11:bc:63:72:9d:
-                    35:36:89:42:11:d6:b4:11:99:d8:80:3e:ad:07:59:
-                    cd:4d:85:f4:02:e4:52:79:17:f0:ff:57:ea:24:ce:
-                    bd:6a:0d:53:a3:38:57:87:eb:3f:5f:23:d1:b3:f8:
-                    28:85:58:97:a9:e9:af:75:f5:4c:96:9a:e2:fd:ef:
-                    46:81:cc:e0:cd:5d:17:6f:09:99:ea:33:9e:5f:75:
-                    ac:b5:da:0a:2f:3f:74:ab:d8:0f:5a:da:18:c7:ef:
-                    8a:2d:46:16:70:ee:fe:7e:62:1e:bc:4c:9b:0a:70:
-                    bb:3d:8b:f4:6e:74:38:33:d1:49:c1:b9:82:8b:51:
-                    f6:fa:f1:b3:b6:5a:f5:8e:a7:33:24:6e:64:42:77:
-                    f1:c1:4c:4c:20:f8:a2:6d:95:6e:db:11:db:36:09:
-                    34:c6:21:ee:2c:88:7f:75:cc:bd:12:40:65:ab:b9:
-                    a6:52:09:d1:52:79:b5:70:5a:7c:e3:54:85:e0:19:
-                    15:c7:03:74:ef:48:da:f3:0a:cb:47:67:fd:58:b2:
-                    75:bd
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                42:FF:88:7A:D0:CD:5A:B3:39:5A:71:B9:EE:C4:8B:31:37:B4:79:39
-            X509v3 Authority Key Identifier: 
-                keyid:FA:5A:BB:C1:33:4C:62:35:DA:F1:B3:11:DC:51:75:19:3D:00:57:54
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         10:8d:6e:67:0b:07:d8:67:c4:82:e6:0e:e3:6c:e2:c5:01:9b:
-         a0:4f:f3:57:fd:61:bc:5a:55:54:a5:ee:b0:63:84:84:da:b7:
-         23:cd:81:1a:16:54:c4:ab:ea:87:18:9e:66:c8:0c:61:07:21:
-         01:8a:6c:75:5d:01:70:ea:e7:da:44:38:71:5c:d5:51:57:86:
-         44:6d:fd:c9:fc:05:f6:d7:9b:5a:a9:fb:e0:27:8d:a8:74:dc:
-         cb:cf:aa:35:9f:69:cd:2c:9e:91:65:ec:aa:26:c0:0b:c9:5e:
-         92:a5:8d:47:8f:cf:ab:e2:d0:56:77:be:d6:f0:69:26:bf:a9:
-         4e:e1:9f:c1:b2:81:50:9e:6c:7d:d2:82:91:ad:ae:92:d4:fb:
-         f0:b6:b7:53:34:5b:c1:41:2a:a2:45:fb:c1:e1:ad:1e:ce:2b:
-         19:48:02:dd:0c:d2:49:1e:02:e1:f8:92:0e:bb:44:8c:f2:5e:
-         cd:3c:96:56:b9:da:a5:df:2f:e4:d7:2d:a8:8e:a0:46:83:a1:
-         3f:12:55:c4:73:8b:f3:85:4f:05:36:a3:5c:8b:aa:bd:a3:0f:
-         7f:8d:9c:36:01:53:12:32:75:c3:10:5d:a0:e1:4e:51:7c:8d:
-         62:58:fd:c6:51:23:98:9d:38:b6:97:de:94:73:e9:46:9f:dc:
-         1c:92:96:b2
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowFzEVMBMGA1UEAwwMSW50
-ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2OeR2/O
-Cc3Jh+pMW16kNEXiB9OIX5Qf2Iyfyr/EZRAITCM9I2LK8YcjX7tiZxzMQgzUYw1j
-Ebxjcp01NolCEda0EZnYgD6tB1nNTYX0AuRSeRfw/1fqJM69ag1TozhXh+s/XyPR
-s/gohViXqemvdfVMlpri/e9GgczgzV0XbwmZ6jOeX3WstdoKLz90q9gPWtoYx++K
-LUYWcO7+fmIevEybCnC7PYv0bnQ4M9FJwbmCi1H2+vGztlr1jqczJG5kQnfxwUxM
-IPiibZVu2xHbNgk0xiHuLIh/dcy9EkBlq7mmUgnRUnm1cFp841SF4BkVxwN070ja
-8wrLR2f9WLJ1vQIDAQABo4HLMIHIMB0GA1UdDgQWBBRC/4h60M1aszlacbnuxIsx
-N7R5OTAfBgNVHSMEGDAWgBT6WrvBM0xiNdrxsxHcUXUZPQBXVDA3BggrBgEFBQcB
-AQQrMCkwJwYIKwYBBQUHMAKGG2h0dHA6Ly91cmwtZm9yLWFpYS9Sb290LmNlcjAs
-BgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vdXJsLWZvci1jcmwvUm9vdC5jcmwwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-ABCNbmcLB9hnxILmDuNs4sUBm6BP81f9YbxaVVSl7rBjhITatyPNgRoWVMSr6ocY
-nmbIDGEHIQGKbHVdAXDq59pEOHFc1VFXhkRt/cn8BfbXm1qp++Anjah03MvPqjWf
-ac0snpFl7KomwAvJXpKljUePz6vi0FZ3vtbwaSa/qU7hn8GygVCebH3SgpGtrpLU
-+/C2t1M0W8FBKqJF+8HhrR7OKxlIAt0M0kkeAuH4kg67RIzyXs08lla52qXfL+TX
-LaiOoEaDoT8SVcRzi/OFTwU2o1yLqr2jD3+NnDYBUxIydcMQXaDhTlF8jWJY/cZR
-I5idOLaX3pRz6Uaf3BySlrI=
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:d5:9d:5f:8f:72:c5:3d:47:55:31:80:57:e0:cc:
-                    b7:6f:6b:7c:f4:a2:f0:d9:a7:98:d1:a5:b5:21:09:
-                    06:89:e2:19:f6:4c:77:c2:78:2c:fe:05:fd:35:95:
-                    01:a1:63:e5:51:c0:3d:dc:63:8b:6d:d9:8d:c9:bf:
-                    c9:0e:ff:41:5d:2d:55:85:9e:26:31:d4:a7:f4:22:
-                    59:0e:17:1b:a2:27:fb:de:3a:ed:b3:28:6a:b0:cc:
-                    00:04:5e:02:a7:0b:ae:f3:f0:2f:71:a4:ea:13:3c:
-                    2c:62:a5:91:87:cd:a6:4b:16:96:78:6c:e5:61:27:
-                    72:b4:06:f0:27:3e:6f:f8:c8:00:7a:0a:1a:c2:5c:
-                    ec:1e:22:52:eb:15:11:b2:ed:d8:c9:1d:2a:94:93:
-                    66:3c:51:60:3b:19:06:7d:c6:65:b4:fe:0c:40:1a:
-                    63:be:70:a4:a7:9d:1e:b1:bd:04:f0:af:cc:0f:a2:
-                    fc:e2:51:42:4c:60:e7:ae:53:30:c2:0d:74:d7:bd:
-                    ef:7f:93:2e:6b:b2:d4:ff:76:ad:97:c6:b6:97:24:
-                    61:cc:6c:08:c1:5e:a4:e0:2f:ab:aa:a8:44:ef:2e:
-                    6d:50:f9:79:9e:87:58:44:81:1b:22:c6:50:7b:58:
-                    64:7a:2b:fc:43:4d:9a:51:1a:1b:0d:9b:4a:c7:ef:
-                    51:2f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                FA:5A:BB:C1:33:4C:62:35:DA:F1:B3:11:DC:51:75:19:3D:00:57:54
-            X509v3 Authority Key Identifier: 
-                keyid:FA:5A:BB:C1:33:4C:62:35:DA:F1:B3:11:DC:51:75:19:3D:00:57:54
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         7b:69:d5:24:1c:3f:8d:ab:7c:87:35:0c:38:68:6a:5a:70:25:
-         ec:43:8e:e5:01:d4:df:95:29:17:da:64:8b:5a:99:3c:e1:77:
-         5b:00:a2:6d:03:21:fc:30:75:30:3b:84:ff:19:e7:8f:27:47:
-         ce:29:18:17:6d:9d:95:b0:f5:ab:f7:10:ee:40:27:b3:f6:53:
-         60:77:29:cd:4d:d9:29:7a:af:73:60:6d:10:9f:75:79:d2:b1:
-         4f:13:b5:44:e1:9c:13:8f:74:cd:4f:46:d2:f1:c1:7f:ed:40:
-         b6:7a:da:0a:b1:d7:02:e5:11:0a:78:e6:94:b1:21:e8:46:33:
-         e6:15:6a:25:4a:ee:6d:0a:d3:8d:e0:6a:9f:a3:94:c4:c1:77:
-         fe:2f:79:03:91:3f:78:8f:3c:2e:8a:b0:0a:35:c9:2a:d7:04:
-         9b:45:6e:8e:13:52:0c:67:b0:37:a3:74:df:fb:cb:28:35:a7:
-         75:40:8e:7e:12:34:09:b8:24:93:cf:61:2f:a8:f8:73:9e:a1:
-         bc:b6:9a:7d:7f:49:64:ee:a0:02:41:5f:43:af:ab:8a:2a:15:
-         c8:bd:1d:a0:80:5f:da:59:19:20:ef:f4:df:a8:bf:2c:e7:77:
-         6b:63:77:c6:a8:e1:59:1e:8f:63:b6:0e:66:aa:1e:11:61:91:
-         7d:20:75:b6
------BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowDzENMAsGA1UEAwwEUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANWdX49yxT1HVTGAV+DM
-t29rfPSi8NmnmNGltSEJBoniGfZMd8J4LP4F/TWVAaFj5VHAPdxji23Zjcm/yQ7/
-QV0tVYWeJjHUp/QiWQ4XG6In+9467bMoarDMAAReAqcLrvPwL3Gk6hM8LGKlkYfN
-pksWlnhs5WEncrQG8Cc+b/jIAHoKGsJc7B4iUusVEbLt2MkdKpSTZjxRYDsZBn3G
-ZbT+DEAaY75wpKedHrG9BPCvzA+i/OJRQkxg565TMMINdNe973+TLmuy1P92rZfG
-tpckYcxsCMFepOAvq6qoRO8ubVD5eZ6HWESBGyLGUHtYZHor/ENNmlEaGw2bSsfv
-US8CAwEAAaOByzCByDAdBgNVHQ4EFgQU+lq7wTNMYjXa8bMR3FF1GT0AV1QwHwYD
-VR0jBBgwFoAU+lq7wTNMYjXa8bMR3FF1GT0AV1QwNwYIKwYBBQUHAQEEKzApMCcG
-CCsGAQUFBzAChhtodHRwOi8vdXJsLWZvci1haWEvUm9vdC5jZXIwLAYDVR0fBCUw
-IzAhoB+gHYYbaHR0cDovL3VybC1mb3ItY3JsL1Jvb3QuY3JsMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB7adUkHD+N
-q3yHNQw4aGpacCXsQ47lAdTflSkX2mSLWpk84XdbAKJtAyH8MHUwO4T/GeePJ0fO
-KRgXbZ2VsPWr9xDuQCez9lNgdynNTdkpeq9zYG0Qn3V50rFPE7VE4ZwTj3TNT0bS
-8cF/7UC2etoKsdcC5REKeOaUsSHoRjPmFWolSu5tCtON4Gqfo5TEwXf+L3kDkT94
-jzwuirAKNckq1wSbRW6OE1IMZ7A3o3Tf+8soNad1QI5+EjQJuCSTz2EvqPhznqG8
-tpp9f0lk7qACQV9Dr6uKKhXIvR2ggF/aWRkg7/TfqL8s53drY3fGqOFZHo9jtg5m
-qh4RYZF9IHW2
------END CERTIFICATE-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/generate-chains.py
deleted file mode 100755
index 7fd4623..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only digitalSignature."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_ec_key(
-    'secp384r1', common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,digitalSignature')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Intermediate.key
deleted file mode 100644
index 38a00d59..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Intermediate.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAv2OeR2/OCc3Jh+pMW16kNEXiB9OIX5Qf2Iyfyr/EZRAITCM9
-I2LK8YcjX7tiZxzMQgzUYw1jEbxjcp01NolCEda0EZnYgD6tB1nNTYX0AuRSeRfw
-/1fqJM69ag1TozhXh+s/XyPRs/gohViXqemvdfVMlpri/e9GgczgzV0XbwmZ6jOe
-X3WstdoKLz90q9gPWtoYx++KLUYWcO7+fmIevEybCnC7PYv0bnQ4M9FJwbmCi1H2
-+vGztlr1jqczJG5kQnfxwUxMIPiibZVu2xHbNgk0xiHuLIh/dcy9EkBlq7mmUgnR
-Unm1cFp841SF4BkVxwN070ja8wrLR2f9WLJ1vQIDAQABAoIBAB5W119xrNLHCXx/
-Os19KkCTF2qwML0eCRJV8Hq+fY6bxQT0zRtP7OXuyz/Av6+i1ApgaEavd5X3LDie
-DTJw/cVAKNllbvmddeZlaPMyGeVfdmd10SFZOWfOUh5+sFR+ePm15Bzb28FQxHOn
-AJvRzJvBX/u73+HrTV0EMlq7uBxEve+xe0cAtRAqxJ+C0GcqQdbI/vL85WlAT19e
-Fy7q02YgErC9zyu+dmjwPRxD4XKqr1kO6bPXpGr1BysWF+z7IPbG0mB/NkDlJTRj
-Gp3vSYKQLw5mkWjUU+KDop1YXyBikXMYmMJ/SoGjkTmk42Z11KEmfzgLuq522VDM
-8EgqEYECgYEA8QO0/bH1WQVCGHLH0ob1hulDEK0KW6JoVoKPKXCVYaf65MsW9aNw
-NSNa53x4vAWpFWuYnJPbfPIcreAWKy3Jb/frNSVaTESDTWLVTtF8Vn7Jh/5wGYZ3
-rxpwnyczZGJ8nUpf2rydykfuTrUCFDutldQ6tGiLi/dmGBxi2rm49B0CgYEAy0oC
-2riXHl5rIGzEH19XwJNtPw5OqXmZc/Hi/C8wTpBNpo4w5NVt7DRv+mKBcN2yS6rL
-P6w44Mcdh0dWSR0Va0/NvLMq7Wbu9b2KjfZEfIOO+wCTjQ40+E33el+UnrOfga7H
-9JZNJVzblnVV/b6054qfJe/pFBXMrHll8w96liECgYEAzDPO2pA4B0e8O4iso0Qz
-rS3f47YpK4CMFJgkAgFgn9A6dDVaa58hh/Q/phhBF1VYcEysjiV8dv2PrQZK4iS2
-IocUov/V5P67nQqbHl/BkGt2ByJeClJy/0pQl5gYI/qKCJ6mXmcm7edKEyer7kau
-CV86qfZWHa3ss4sBer6W5UUCgYEAnkSlykEyLguWXa0wV7hz6lMdF5188obgSJuG
-e44FjvTb75L+T/o2VVJR597vJb8EQ9LZ4F2l/qImxB5u+AczmNONup7HCgM8gYeq
-qnGTyljmZVaCiawI41RYGyb030W7Jky8Ehk+QJt1vkLlyuLBlw6ebvvEO8XpDlKJ
-Y92mM+ECgYEAp7/6zWOuHCKK7PIKmSnWWpXBd3YyAsWyQO0cfwiSwYuFczNZ6kc4
-9mpf/bOyJVpS2p4lzdMHEUVqg5goIcwkcu+B+yAanBq3KqN9iUQHW0a7SQCtZTJv
-MZ9m1o/6wSumGacNf9CgkZkFcCr8jI9rmlrOUoSZeDjFCuTG+vKuKos=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Root.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Root.key
deleted file mode 100644
index 61241f4..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Root.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA1Z1fj3LFPUdVMYBX4My3b2t89KLw2aeY0aW1IQkGieIZ9kx3
-wngs/gX9NZUBoWPlUcA93GOLbdmNyb/JDv9BXS1VhZ4mMdSn9CJZDhcboif73jrt
-syhqsMwABF4Cpwuu8/AvcaTqEzwsYqWRh82mSxaWeGzlYSdytAbwJz5v+MgAegoa
-wlzsHiJS6xURsu3YyR0qlJNmPFFgOxkGfcZltP4MQBpjvnCkp50esb0E8K/MD6L8
-4lFCTGDnrlMwwg10173vf5Mua7LU/3atl8a2lyRhzGwIwV6k4C+rqqhE7y5tUPl5
-nodYRIEbIsZQe1hkeiv8Q02aURobDZtKx+9RLwIDAQABAoIBAQC5puKsi3T8wwg5
-02+Mwp8SSPr6qrpkkBJy8m+vXGbAYy9pLiBPdZ60z4O3k98s4uMk381jw2gkepWO
-KA6X6CRo1MOlM0PCvy2RMmDvrAmqLtHp3JFFyfSf30yMfyATCkZtX+v7+vYs7Xkt
-6vPGcWb7j5AK7amVfHFmITmLAerS7XliQyF07sCjLPG4MAh5QqNTl//AkejNAVAt
-swud4A17bODUcXW/3bwb0wsCDgXNaiDsu7mgrtX641MrFkA+NDmv3FmfYKBkS5zH
-03qxT6adrv15gy39H0TjNCI8Bs25iZW846/12xhXZk33XnR4oTCJXqXLr+6bFsSb
-cGtDS47RAoGBAO3gBAQClK+YM3J3sRgxPPneHrVyLd8pVhU5ydwTbVU/aWkJscRX
-WmYcl8KiAv2qXDmO85G0ND4gDVF1Wz6g3q4dcFKWuhbAFclHtezsjaZaMhL2zyrT
-/GQiu6F+N67yIrTDGLPPZuV/z9qTKquhQcCOqdBfur+5NoOdrmJt6osbAoGBAOXk
-Iu1WD4fetg2CBp688SGNjja/YiaLmLjv37jexqThXfb+ahZG/TyfEgWAKpu5EDl9
-KuZo2tqLxEYOWpqebzgwAYppSGoNF00pKr/fzrbF0zNVpngwAVUkpLDwMwVTXvsk
-p4kQHPESWJ0dLyDldg3c3CWapX70PJW12xjbpX99AoGBALwFp+bri09IhNHj3e17
-bfErKybMu4l7iPl6Fh6IlJEfcFiAOy0wxtmTnDlSCf8rm347ijcPM4QvnZdXpenZ
-CmqiBlihnzHAXvgcYKaHTGfDP3VR9OqraQJVme3KcIUuC1TKKUpnk7Ov1UG1tbK3
-4dssaPm10U0ePwLFrkNLEmslAoGBAJcWmN3i8dIaTQwTqMYq509l+VGB9r/ef0EM
-ZbzarTMv6tGp449AmK5+3RlAYsB1oHQoD0nfH/cCZLymMmXsOqxy4JBXIYCRmf7c
-T3xLW1BEM8pJQF89LaMHsjWXp/CYGpR0QqeSL3NA23xm8dJs/Gmf/g+404vcePTr
-0FNGCD8BAoGAD3e+p7emUILHGaenizCrH7LcflxYe3tvDO5pAWXB/VpAtG39XAqI
-dtmpOVCe8l/qJlQXY+38s21Hx+qA2snJMxnC7tN4h9ZA2maDf2qptCF73wWlbLu8
-7MwyrYgWq21NOL8WRU7a8hzX3ow592K7FFjQjBSZU0oQ7PoHaCyaG7U=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Target.key
deleted file mode 100644
index b7749c1..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/keys/Target.key
+++ /dev/null
@@ -1,10 +0,0 @@
-openssl ecparam -name secp384r1 -genkey
------BEGIN EC PARAMETERS-----
-BgUrgQQAIg==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDCWsDis7YrN6+baF/6vqyerKi4SSuxnr0Ju8gITcMgitZ1LkQTwzm8P
-ZyHVsneATIigBwYFK4EEACKhZANiAARd3edOC5SzScou77WE9WJHc4KXFAlWQrUp
-hziLsZn0pwfU2eADdECf0uQ0uol1JzupoBqKJRnyr7aePowO7vERALSo3EmFvytV
-b+yDJP6NgSvn2vqIBZkV7hwtc98JeXA=
------END EC PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/main.test b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/main.test
deleted file mode 100644
index 0bcea7d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-digitalsignature/main.test
+++ /dev/null
@@ -1,5 +0,0 @@
-chain: chain.pem
-last_cert_trust: TRUSTED_ANCHOR
-utc_time: 150302120000Z
-key_purpose: SERVER_AUTH
-expected_errors:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/chain.pem
deleted file mode 100644
index aae671f..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/chain.pem
+++ /dev/null
@@ -1,257 +0,0 @@
-[Created by: generate-chains.py]
-
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Intermediate
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Target
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub: 
-                    04:89:00:ec:91:fd:85:2e:b5:b5:20:92:c4:37:58:
-                    6e:73:4f:01:ad:8b:11:6f:9d:fb:ed:3e:a3:af:9c:
-                    a9:57:8b:cb:7c:6f:b6:48:c3:1f:5c:20:2c:dd:bb:
-                    e9:46:fe:72:b6:97:32:54:42:8d:b1:9d:c1:44:a9:
-                    e7:65:a9:43:c0:58:09:3a:14:c9:80:c9:0c:21:c5:
-                    4d:29:ec:38:ba:c7:ee:a7:1d:84:f0:29:32:b5:51:
-                    1c:c3:7b:ad:ad:61:05
-                ASN1 OID: secp384r1
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                79:F8:7F:83:57:2E:9D:63:B5:C6:37:2E:42:A3:49:DA:FC:22:B6:15
-            X509v3 Authority Key Identifier: 
-                keyid:9D:89:35:80:74:20:2D:73:3F:A4:C4:D6:56:B7:57:B6:A5:E8:D9:8B
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Intermediate.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Intermediate.crl
-
-            X509v3 Key Usage: critical
-                Key Agreement
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-    Signature Algorithm: sha256WithRSAEncryption
-         a6:12:6f:eb:bb:19:74:1a:de:b2:5e:4c:be:8b:e8:8a:bb:d2:
-         f9:82:08:58:67:65:3a:4f:dd:c4:45:7d:4e:99:1b:20:ce:04:
-         ca:17:91:8f:a4:5e:08:b2:4e:a3:d0:bf:f9:2f:b4:92:15:68:
-         a2:62:4c:64:59:43:f5:6d:ad:2b:c6:d4:24:20:2b:e4:76:0b:
-         8e:1f:31:7d:4b:0e:20:53:16:20:01:8d:63:ce:7b:93:9b:ea:
-         f6:6c:d6:77:20:a5:12:2f:a2:e0:0d:0a:89:c0:db:44:a9:8c:
-         22:e9:15:ff:0a:0a:c3:a8:ce:97:4b:fc:28:09:80:71:ac:6d:
-         b4:2d:b2:95:88:63:b4:e8:a0:a2:a9:d9:ae:75:22:e0:f7:03:
-         30:82:2b:d7:3c:83:d0:0e:f3:f5:7e:9b:4d:1c:b5:95:57:ef:
-         8d:24:47:a9:97:49:f0:94:db:ed:a9:c4:15:68:89:a2:b0:0f:
-         5f:f2:46:05:6c:50:69:e7:74:c5:2a:e8:e1:79:0c:61:e3:42:
-         da:80:e1:68:8a:67:df:da:05:85:1f:fd:57:f2:1d:fa:45:b8:
-         2a:f5:73:6d:2a:52:2a:5d:c6:aa:cc:93:0d:f1:6c:a9:c4:f1:
-         ff:84:36:be:42:20:0d:2a:7a:d2:86:c3:a2:bb:3b:02:76:a6:
-         ba:ee:24:62
------BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
-cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASJAOyR/YUutbUgksQ3
-WG5zTwGtixFvnfvtPqOvnKlXi8t8b7ZIwx9cICzdu+lG/nK2lzJUQo2xncFEqedl
-qUPAWAk6FMmAyQwhxU0p7Di6x+6nHYTwKTK1URzDe62tYQWjgd8wgdwwHQYDVR0O
-BBYEFHn4f4NXLp1jtcY3LkKjSdr8IrYVMB8GA1UdIwQYMBaAFJ2JNYB0IC1zP6TE
-1la3V7al6NmLMD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
-bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
-cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMI
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCmEm/ruxl0
-Gt6yXky+i+iKu9L5gghYZ2U6T93ERX1OmRsgzgTKF5GPpF4Isk6j0L/5L7SSFWii
-YkxkWUP1ba0rxtQkICvkdguOHzF9Sw4gUxYgAY1jznuTm+r2bNZ3IKUSL6LgDQqJ
-wNtEqYwi6RX/CgrDqM6XS/woCYBxrG20LbKViGO06KCiqdmudSLg9wMwgivXPIPQ
-DvP1fptNHLWVV++NJEepl0nwlNvtqcQVaImisA9f8kYFbFBp53TFKujheQxh40La
-gOFoimff2gWFH/1X8h36Rbgq9XNtKlIqXcaqzJMN8WypxPH/hDa+QiANKnrShsOi
-uzsCdqa67iRi
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Intermediate
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b6:3f:d3:f7:d6:99:71:8e:40:2a:64:6d:39:69:
-                    fe:d8:50:c0:5b:7e:7f:33:91:41:06:ca:40:ad:3c:
-                    f7:4d:fb:db:12:03:2f:69:ad:09:2a:f1:49:d8:61:
-                    b5:3f:7c:b1:f9:41:45:ab:26:3b:76:df:da:e4:8b:
-                    65:8d:77:ab:0d:3e:56:78:cb:ab:17:9c:50:b1:b8:
-                    c1:f4:31:8a:09:24:c7:19:c7:c5:5a:b4:a5:c4:a7:
-                    c0:eb:2b:54:c9:de:f0:4a:a5:3d:f6:fc:66:d5:e2:
-                    ed:53:4f:0f:e3:79:d1:78:cc:54:01:43:af:17:d7:
-                    b8:38:11:44:1b:bb:22:13:2e:c7:4d:95:8f:44:9b:
-                    d8:e7:4d:41:f0:51:ae:2a:6a:13:cd:c4:64:cd:7e:
-                    2e:d5:a2:32:b7:df:2f:89:66:b3:93:ab:0b:f9:3f:
-                    7d:71:47:bf:8e:2d:e0:5a:b8:5a:da:6b:d8:b0:51:
-                    74:4d:f4:38:ae:3c:5e:22:34:9a:93:d4:61:ce:4b:
-                    57:77:28:76:b6:84:c4:aa:cc:5e:97:05:55:06:83:
-                    55:95:3d:dc:c8:b3:a9:64:d3:d4:8b:8b:dc:30:97:
-                    54:87:6d:68:26:31:45:05:af:1c:cd:a5:f6:ff:e7:
-                    f0:d6:0d:9f:a6:75:a9:d7:c0:c3:8d:ba:7d:a4:a6:
-                    7f:db
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                9D:89:35:80:74:20:2D:73:3F:A4:C4:D6:56:B7:57:B6:A5:E8:D9:8B
-            X509v3 Authority Key Identifier: 
-                keyid:0F:81:D1:20:C7:6B:79:4D:08:C2:54:4C:14:69:CD:9B:C7:C5:C3:41
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         5b:d3:72:ae:c7:92:42:1e:26:1c:f2:87:dc:87:48:97:aa:97:
-         77:89:1b:66:e3:c4:b7:33:a7:b8:ce:d4:ef:d9:67:be:59:a4:
-         42:54:f3:63:86:a6:f8:cc:4f:60:04:ad:3a:57:7b:72:45:fb:
-         20:2e:6a:31:de:e3:2e:a3:1f:44:ce:71:6c:84:7f:a4:8d:a7:
-         eb:c9:af:4a:30:84:19:6c:75:a7:d6:4b:fa:a3:75:b3:bb:70:
-         bf:b8:3e:9c:5a:e4:6f:09:ef:dd:70:a8:c6:3b:8e:29:28:15:
-         e3:cb:1c:45:f8:1c:87:21:f9:d4:a6:82:d7:46:a1:e7:52:98:
-         62:ce:3a:da:7e:48:f9:ad:e8:ac:ad:ce:4d:be:d5:fe:2f:6f:
-         6e:0b:03:8a:0f:33:e8:f4:26:7f:5d:1a:31:89:cb:7b:bf:b9:
-         25:74:94:53:0b:09:1d:25:6f:eb:45:c0:06:ef:80:10:1e:39:
-         0e:8f:c7:a0:21:dc:9e:d5:e6:c0:bf:53:6a:42:f0:f0:58:fe:
-         d5:f4:99:92:2b:76:69:e8:a0:43:34:41:b4:01:94:d2:8f:5a:
-         fe:fe:46:75:f7:1d:cf:16:b4:64:03:c0:5d:8a:1a:f0:f4:c4:
-         a6:7b:0f:de:22:58:62:3d:dd:97:a4:a4:92:65:ad:87:21:37:
-         57:0d:ec:dc
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowFzEVMBMGA1UEAwwMSW50
-ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtj/T99aZ
-cY5AKmRtOWn+2FDAW35/M5FBBspArTz3TfvbEgMvaa0JKvFJ2GG1P3yx+UFFqyY7
-dt/a5ItljXerDT5WeMurF5xQsbjB9DGKCSTHGcfFWrSlxKfA6ytUyd7wSqU99vxm
-1eLtU08P43nReMxUAUOvF9e4OBFEG7siEy7HTZWPRJvY501B8FGuKmoTzcRkzX4u
-1aIyt98viWazk6sL+T99cUe/ji3gWrha2mvYsFF0TfQ4rjxeIjSak9RhzktXdyh2
-toTEqsxelwVVBoNVlT3cyLOpZNPUi4vcMJdUh21oJjFFBa8czaX2/+fw1g2fpnWp
-18DDjbp9pKZ/2wIDAQABo4HLMIHIMB0GA1UdDgQWBBSdiTWAdCAtcz+kxNZWt1e2
-pejZizAfBgNVHSMEGDAWgBQPgdEgx2t5TQjCVEwUac2bx8XDQTA3BggrBgEFBQcB
-AQQrMCkwJwYIKwYBBQUHMAKGG2h0dHA6Ly91cmwtZm9yLWFpYS9Sb290LmNlcjAs
-BgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vdXJsLWZvci1jcmwvUm9vdC5jcmwwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AFvTcq7HkkIeJhzyh9yHSJeql3eJG2bjxLczp7jO1O/ZZ75ZpEJU82OGpvjMT2AE
-rTpXe3JF+yAuajHe4y6jH0TOcWyEf6SNp+vJr0owhBlsdafWS/qjdbO7cL+4Ppxa
-5G8J791wqMY7jikoFePLHEX4HIch+dSmgtdGoedSmGLOOtp+SPmt6Kytzk2+1f4v
-b24LA4oPM+j0Jn9dGjGJy3u/uSV0lFMLCR0lb+tFwAbvgBAeOQ6Px6Ah3J7V5sC/
-U2pC8PBY/tX0mZIrdmnooEM0QbQBlNKPWv7+RnX3Hc8WtGQDwF2KGvD0xKZ7D94i
-WGI93ZekpJJlrYchN1cN7Nw=
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c1:3e:d3:96:3b:f4:27:70:30:ed:c0:ed:a9:38:
-                    dc:a2:2a:56:65:d1:82:7a:36:ae:8f:00:fd:4c:db:
-                    fb:80:ad:f6:d1:71:c0:87:09:d6:40:c3:1e:a8:86:
-                    d7:ed:d0:62:5f:67:a0:84:24:71:88:31:8b:fe:8b:
-                    3f:71:f0:d2:56:49:47:74:40:b8:c8:2f:2b:2e:d5:
-                    a8:06:46:af:30:92:8d:20:13:a4:7c:9d:51:9f:8e:
-                    d6:7b:4f:ae:a9:59:b9:17:d0:b6:31:12:45:58:4d:
-                    59:86:e9:bb:75:1e:e1:db:0f:10:bb:0c:17:fb:48:
-                    89:d2:7e:d0:76:96:26:89:f5:a4:77:09:a7:7a:4f:
-                    8b:dd:24:95:15:ce:6f:d6:82:03:76:52:f0:7c:5d:
-                    69:25:ff:e7:12:c1:fb:41:be:8c:e9:c6:7b:a8:e2:
-                    88:03:e2:86:16:0f:20:34:a3:7d:28:3e:14:f5:9a:
-                    40:30:d3:fc:96:21:e4:bf:91:80:ae:a3:0f:a4:00:
-                    39:c3:40:0a:90:d4:9a:c8:fe:2f:c9:74:16:1b:c4:
-                    13:40:0b:2f:af:bc:d0:47:78:19:5f:4f:a5:9a:94:
-                    46:1d:71:c9:f6:04:bd:61:43:80:33:c3:57:fb:5d:
-                    df:6d:20:32:c1:b2:f1:a6:46:4b:19:95:f3:3f:53:
-                    f7:7d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                0F:81:D1:20:C7:6B:79:4D:08:C2:54:4C:14:69:CD:9B:C7:C5:C3:41
-            X509v3 Authority Key Identifier: 
-                keyid:0F:81:D1:20:C7:6B:79:4D:08:C2:54:4C:14:69:CD:9B:C7:C5:C3:41
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         39:38:b5:f8:09:d0:c2:8c:32:e3:89:bc:30:b1:7f:6f:16:57:
-         c2:4a:54:a8:a4:01:c4:a6:68:10:3a:ff:57:e5:50:d8:30:ee:
-         f3:1e:9c:54:f1:b6:19:b7:61:a1:c4:88:d1:9a:5a:a9:6a:2a:
-         bc:a5:10:1f:22:0a:83:a6:5b:15:8f:99:bd:08:e7:a9:ca:4f:
-         3f:1b:e7:d2:5e:85:ef:19:43:76:0c:9b:90:7d:43:5c:15:8d:
-         75:11:de:89:2b:bc:3f:34:bd:7f:64:d4:7d:db:dd:de:f4:af:
-         8c:8a:30:29:2a:47:a0:56:9a:c9:69:c7:44:d2:78:05:62:bd:
-         3d:13:ab:52:15:31:fc:bf:19:1f:3f:f6:76:c7:f1:92:3a:f0:
-         61:44:50:2a:e0:46:5b:15:a1:1f:d8:0d:fd:46:b9:07:38:6a:
-         21:40:50:03:ae:73:cd:2e:49:3e:29:a6:65:67:e4:1c:5b:6e:
-         41:ed:7c:6e:0d:e9:7c:32:db:99:17:90:72:3f:d5:4c:d7:ec:
-         05:45:ee:23:40:db:9c:4e:c3:ca:42:d1:18:c3:54:94:f1:10:
-         8b:98:75:b7:1e:ee:f1:8f:b8:2d:c6:bc:73:a6:74:69:f6:3c:
-         ca:75:1e:65:10:35:e8:d0:9f:d0:69:6b:cc:d4:fb:d4:93:05:
-         a1:2a:26:34
------BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowDzENMAsGA1UEAwwEUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAME+05Y79CdwMO3A7ak4
-3KIqVmXRgno2ro8A/Uzb+4Ct9tFxwIcJ1kDDHqiG1+3QYl9noIQkcYgxi/6LP3Hw
-0lZJR3RAuMgvKy7VqAZGrzCSjSATpHydUZ+O1ntPrqlZuRfQtjESRVhNWYbpu3Ue
-4dsPELsMF/tIidJ+0HaWJon1pHcJp3pPi90klRXOb9aCA3ZS8HxdaSX/5xLB+0G+
-jOnGe6jiiAPihhYPIDSjfSg+FPWaQDDT/JYh5L+RgK6jD6QAOcNACpDUmsj+L8l0
-FhvEE0ALL6+80Ed4GV9PpZqURh1xyfYEvWFDgDPDV/td320gMsGy8aZGSxmV8z9T
-930CAwEAAaOByzCByDAdBgNVHQ4EFgQUD4HRIMdreU0IwlRMFGnNm8fFw0EwHwYD
-VR0jBBgwFoAUD4HRIMdreU0IwlRMFGnNm8fFw0EwNwYIKwYBBQUHAQEEKzApMCcG
-CCsGAQUFBzAChhtodHRwOi8vdXJsLWZvci1haWEvUm9vdC5jZXIwLAYDVR0fBCUw
-IzAhoB+gHYYbaHR0cDovL3VybC1mb3ItY3JsL1Jvb3QuY3JsMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA5OLX4CdDC
-jDLjibwwsX9vFlfCSlSopAHEpmgQOv9X5VDYMO7zHpxU8bYZt2GhxIjRmlqpaiq8
-pRAfIgqDplsVj5m9COepyk8/G+fSXoXvGUN2DJuQfUNcFY11Ed6JK7w/NL1/ZNR9
-293e9K+MijApKkegVprJacdE0ngFYr09E6tSFTH8vxkfP/Z2x/GSOvBhRFAq4EZb
-FaEf2A39RrkHOGohQFADrnPNLkk+KaZlZ+QcW25B7XxuDel8MtuZF5ByP9VM1+wF
-Re4jQNucTsPKQtEYw1SU8RCLmHW3Hu7xj7gtxrxzpnRp9jzKdR5lEDXo0J/QaWvM
-1PvUkwWhKiY0
------END CERTIFICATE-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/generate-chains.py
deleted file mode 100755
index a6be7955..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_ec_key(
-    'secp384r1', common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,keyAgreement')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Intermediate.key
deleted file mode 100644
index a89a29af..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Intermediate.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAtj/T99aZcY5AKmRtOWn+2FDAW35/M5FBBspArTz3TfvbEgMv
-aa0JKvFJ2GG1P3yx+UFFqyY7dt/a5ItljXerDT5WeMurF5xQsbjB9DGKCSTHGcfF
-WrSlxKfA6ytUyd7wSqU99vxm1eLtU08P43nReMxUAUOvF9e4OBFEG7siEy7HTZWP
-RJvY501B8FGuKmoTzcRkzX4u1aIyt98viWazk6sL+T99cUe/ji3gWrha2mvYsFF0
-TfQ4rjxeIjSak9RhzktXdyh2toTEqsxelwVVBoNVlT3cyLOpZNPUi4vcMJdUh21o
-JjFFBa8czaX2/+fw1g2fpnWp18DDjbp9pKZ/2wIDAQABAoIBAAQjTtzBspoxcKOF
-xDUZgv/GVZe+N4UkNyXAUdedGsBah47RI7Jyi1K+R77x+PuICUJviPVp2M/KJV4r
-DBM6NFgIok370danZe2jFERHG6s5eovLTV/R2jGs3WR5h2NN/Ia1WcLR2EPi8yCB
-Gws/KNJlUUL2FnOkIjqjqbg3d36X9348fOVJzER3gb/1YwQ8A57nVhtdRJU/Inbc
-98l+bLhRCbfIpANS/aXiqTODMJD7TQRlM7E0R++MfIvlH00Zz7Lgl8UllE8qLdrv
-nBEM3i1RDP5oqZ7P34QeibnaqiXpPqA8+Cfucv9wrEsbhDcVKlVv7ascsRhoPBb7
-v9BgLAECgYEA3uzgGYUs+jSH2OCqVBqLHc7R0cJpA3GZ32t01nzIjFoMGS782q3f
-Hz+viXS4uOdJSFFq8SDifiJ4KnP5gF1Z825ES+dLTm7ezcn2G+b5OTo18nBwJveS
-lvVfagZV+qyhc92/Bt/DPjWAY621Obe8PNyQ2MmyRPTU+geXlBXX77sCgYEA0UoA
-nruHYF+KiM8dNJ8tb/0P/e75ptRAziM5CBwQsnPQJZLM/kvWkQQeJwpniHU47gOu
-ETa1UUjw6qsw6wjeFBso/5BR5WYwHIkv5PuV4D1LnQsOZLP4Eb+eE75C9K9rdm3h
-PKWjMzgnMvgPIq8otOc0rDBQbwUZzyny8nuKXmECgYEAomNzK6Pzi5/QhY/DA9kC
-Fgiel2pDDRsnt7STO9tSS8scnQu5baLSsfS2bi70kN0KaP/GIziNRMzfNC2fRn66
-E7XzUkd+d/gTnVzNRq4ORj29Jon5aKlXw1ei1Z0f7KbsRXb2vI8rrplSmUnkhdLt
-8HfLm9/xWIHw0uHM7TasQhkCgYBlHGl8RoE60C2vttAXUieziQEm30OBk93TOTUe
-c+ClNkqDPI8I9D6vRNwEZIRsaqWcZ+66pkGnCaRK23YAtwIDmLOP9Ht8Zogr4SNg
-byOTeEmFj4feowvgF0EZrLvQVseGKcO9dxCHeEOH3kwBp7n03BaYcacKW96CNXQI
-LiNFQQKBgAT6b+v3fkUXR0zBhelTqPSvyQ64kX39Zi5b3fyZg0anj21hEyaSgZix
-aCUyaqvzJQcxw5eQf9BqDNxYrOwsaUJPhvXkZSuPX546X4v65Rz17pDZszVqNi92
-tsZ6fW+dskOnWqRYKpJbPMH6JaWJKmPHNA4w36heoCGJcx0fNKzB
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Root.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Root.key
deleted file mode 100644
index 783375c5..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Root.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAwT7Tljv0J3Aw7cDtqTjcoipWZdGCejaujwD9TNv7gK320XHA
-hwnWQMMeqIbX7dBiX2eghCRxiDGL/os/cfDSVklHdEC4yC8rLtWoBkavMJKNIBOk
-fJ1Rn47We0+uqVm5F9C2MRJFWE1Zhum7dR7h2w8QuwwX+0iJ0n7QdpYmifWkdwmn
-ek+L3SSVFc5v1oIDdlLwfF1pJf/nEsH7Qb6M6cZ7qOKIA+KGFg8gNKN9KD4U9ZpA
-MNP8liHkv5GArqMPpAA5w0AKkNSayP4vyXQWG8QTQAsvr7zQR3gZX0+lmpRGHXHJ
-9gS9YUOAM8NX+13fbSAywbLxpkZLGZXzP1P3fQIDAQABAoIBAAQjDy6JLAnoGfQN
-DElyIS8LjvvxB0UMhKIlGEcb8n9nuf/z2nZJnJ+YTcC32kmKC4EVW9dYXGHZBbE2
-U+5hhG86dGAlvo7yi48eHdG8k6WLjZ/hK8VLLOMokKjlJM0VUaQT4MKeLIPebAs6
-V7wDJDynTuliMeU8QU8TTe0r+7k6UnoHKeS+wcxAFNJVBqq+kUV4pnjsxe2v0wzv
-42DLk7jS+ZGYirR/WCyhir1K97Dppf8hFfyWTcEjoJ8dfuqYcBSOTRCleItGHESY
-oV83hxxVDhe6NfyGCFocjq4skZ/Efabb54zUC/Pip1dZTa5AI08gCcg8jDRQF137
-w30aNxUCgYEA58B4mQx0zoF+oCWI63FZyLqrZFYFNRt3KXPOlfT9Vc3k5Xoy2xvs
-BCiSTkdJn46KEHFYYgo9cLQNtPLuH8/aaT3E424l1daKbcqXt0WaBPfZERKaafoq
-Gtm8UMu7SXP0G/Z0kqEr+fycBhZRb0NxvVJ6z94Eh7k2wgBWL3c12oMCgYEA1Xbz
-mjb+84ySPME5HBD/WqhTzkew6JlEi9nmBKaJSUhGmej2yETUQ4dbud8sEc69KFIQ
-ZfcYCPldZjijAfihHS+a1hF9+u64eAp2Ky1hlFvnpYY/AuJGGHtAqCWByQWUC53b
-BTO2InhusE6X20weNZR4VYTr0w1NoeZ/6B3uRf8CgYEAhtFMFtTNOrjQXf+X6EeX
-kJMvU35LJzrkFmQ9QLU1ju3pA6oT3a0fnsevXQRRixWTsb8OSHJmjaLg+mv8JNt4
-1pJNcHTKY9ybyQT7P22pDMzWJP1qgM48IkSaLXJncHKZBo9X/1jtSU8vwMbI9u4I
-Q7ewpC4m+oG/nhouCQzTclsCgYEArCNFZFnvFJWKI+YpWKG4WfIdyt3zIk7egOyR
-WbS2Rts628iKoYsnpOEVrfjy/9U4orgysxckUbBNii4n/WHzAqct9Gycq+sv5NWC
-32S0KMBIOCnezEOOBRX3WOEOHP4bmZaNVU+TE48Mq65lNRnXzptQwp3y0foLXYCU
-KqlgSR8CgYATs+hXQ45+TX7RLssDXqjUuP8pjTqL8kYK7eBwzfGj1YOSTwWysxYL
-XKJImaV59x7qxrUxafZIgGlTnaU5sxi7u1+uuOQIYRuYKPOWYerywxGVy267brDb
-ODXvKkkKxLKTMRqF60lryXjqgfuwf5ExnOVSQFKyKJ9AFJHffokjOw==
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Target.key
deleted file mode 100644
index 3dcc10a..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/keys/Target.key
+++ /dev/null
@@ -1,10 +0,0 @@
-openssl ecparam -name secp384r1 -genkey
------BEGIN EC PARAMETERS-----
-BgUrgQQAIg==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDAQqmpjvh2fxJ6rL3tdSTt72yFHQXZtn18CTomQDpIGPrP3f15U6A7B
-coX1Jxr3iXOgBwYFK4EEACKhZANiAASJAOyR/YUutbUgksQ3WG5zTwGtixFvnfvt
-PqOvnKlXi8t8b7ZIwx9cICzdu+lG/nK2lzJUQo2xncFEqedlqUPAWAk6FMmAyQwh
-xU0p7Di6x+6nHYTwKTK1URzDe62tYQU=
------END EC PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/main.test b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/main.test
deleted file mode 100644
index 0bcea7d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyagreement/main.test
+++ /dev/null
@@ -1,5 +0,0 @@
-chain: chain.pem
-last_cert_trust: TRUSTED_ANCHOR
-utc_time: 150302120000Z
-key_purpose: SERVER_AUTH
-expected_errors:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/chain.pem b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/chain.pem
deleted file mode 100644
index 76790305..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/chain.pem
+++ /dev/null
@@ -1,257 +0,0 @@
-[Created by: generate-chains.py]
-
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyEncipherment.
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Intermediate
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Target
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub: 
-                    04:47:90:06:cd:32:f1:43:64:8a:0f:a9:27:ad:8b:
-                    72:b6:90:bf:9c:56:4f:6f:ed:bc:5a:26:81:6e:ab:
-                    99:f5:97:cc:65:87:04:c5:9b:c7:ed:e7:d2:ec:80:
-                    e5:8a:da:07:88:55:63:25:9b:5d:92:c4:db:2c:35:
-                    f3:32:be:41:4e:6c:8e:53:54:eb:cf:a2:4a:0c:c4:
-                    f8:2e:fd:0d:df:7b:13:07:28:c9:51:98:e7:22:29:
-                    0e:cc:29:3f:d8:8e:b2
-                ASN1 OID: secp384r1
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                64:0B:31:C2:E5:A0:D5:B2:25:96:45:10:1E:24:89:74:CB:06:32:B9
-            X509v3 Authority Key Identifier: 
-                keyid:78:6F:0B:E8:82:18:AD:46:6F:21:C7:AB:0A:A3:98:2A:16:B3:57:67
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Intermediate.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Intermediate.crl
-
-            X509v3 Key Usage: critical
-                Key Encipherment
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-    Signature Algorithm: sha256WithRSAEncryption
-         f5:75:6a:2b:db:65:7f:aa:b0:9b:75:b5:c0:bd:36:9e:0a:77:
-         f7:ba:f3:a0:61:66:12:88:15:72:16:34:a4:dd:4e:bb:18:9a:
-         4b:b7:50:9b:3d:1d:de:78:4d:48:08:bf:d9:a4:f2:17:fb:35:
-         f2:00:1c:f1:62:bf:29:75:4d:84:60:60:40:ef:97:a8:67:d5:
-         23:fa:51:af:d3:bb:1a:84:a3:18:b2:0f:42:5e:18:98:b5:b4:
-         e1:68:b4:8b:32:df:bc:24:f5:b1:54:a8:a2:2e:6d:46:1d:f8:
-         55:68:c5:cd:a1:ff:3d:1d:29:b3:26:61:db:24:08:8e:4e:50:
-         fe:63:36:c1:be:72:90:a8:0e:36:50:b1:38:f1:df:07:ec:b3:
-         74:ff:9d:04:6e:f9:e2:bc:36:88:d5:7c:96:00:9a:e6:68:48:
-         ab:f9:2f:9c:83:45:18:21:62:2f:15:da:31:46:3a:85:11:32:
-         72:32:21:46:c5:b2:df:cb:fc:85:73:21:7c:09:b8:78:f7:eb:
-         8a:03:48:d0:ba:0d:a0:bc:da:a0:cf:cc:d9:4f:7e:5e:f0:a1:
-         a0:59:93:c5:22:34:95:7c:f4:79:29:be:6d:3d:03:ab:2e:90:
-         e8:a8:15:19:2c:d6:ba:61:6b:21:e1:16:62:1e:68:be:ed:f6:
-         bf:63:e9:0d
------BEGIN CERTIFICATE-----
-MIIC1TCCAb2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
-cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHkAbNMvFDZIoPqSet
-i3K2kL+cVk9v7bxaJoFuq5n1l8xlhwTFm8ft59LsgOWK2geIVWMlm12SxNssNfMy
-vkFObI5TVOvPokoMxPgu/Q3fexMHKMlRmOciKQ7MKT/YjrKjgd8wgdwwHQYDVR0O
-BBYEFGQLMcLloNWyJZZFEB4kiXTLBjK5MB8GA1UdIwQYMBaAFHhvC+iCGK1GbyHH
-qwqjmCoWs1dnMD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
-bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
-cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgUg
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQD1dWor22V/
-qrCbdbXAvTaeCnf3uvOgYWYSiBVyFjSk3U67GJpLt1CbPR3eeE1ICL/ZpPIX+zXy
-ABzxYr8pdU2EYGBA75eoZ9Uj+lGv07sahKMYsg9CXhiYtbThaLSLMt+8JPWxVKii
-Lm1GHfhVaMXNof89HSmzJmHbJAiOTlD+YzbBvnKQqA42ULE48d8H7LN0/50Ebvni
-vDaI1XyWAJrmaEir+S+cg0UYIWIvFdoxRjqFETJyMiFGxbLfy/yFcyF8Cbh49+uK
-A0jQug2gvNqgz8zZT35e8KGgWZPFIjSVfPR5Kb5tPQOrLpDoqBUZLNa6YWsh4RZi
-Hmi+7fa/Y+kN
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Intermediate
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:fa:3b:f0:7b:b9:5d:60:5f:1c:c9:b0:87:60:45:
-                    41:1e:6c:d1:54:34:1c:ff:42:50:3f:a3:6f:38:f8:
-                    20:50:d5:81:a4:39:98:3c:72:e6:54:98:64:46:ad:
-                    b0:cc:0d:a8:9e:be:eb:dd:04:cc:aa:1b:54:8b:c4:
-                    2b:c0:1f:4b:ed:59:d0:1d:0b:3d:9e:c1:dc:42:a5:
-                    11:97:12:2b:27:1a:93:1e:46:f2:9f:8e:62:ff:1e:
-                    5f:19:8a:39:f5:13:bc:ca:39:c3:22:d7:3a:8a:7b:
-                    39:f4:bf:af:36:90:e1:eb:be:09:f2:3c:00:b0:96:
-                    97:03:67:7f:c8:3d:db:0e:a8:e7:e6:06:04:98:b3:
-                    03:f5:c8:a4:c8:59:ed:59:3d:08:24:5d:27:54:2d:
-                    db:ad:87:ff:c5:d0:ca:cc:d8:76:9a:0b:4a:43:61:
-                    29:6f:06:e5:3a:a5:2e:2a:bd:f6:67:c8:03:4b:96:
-                    2a:0f:c8:33:db:71:0d:ef:71:51:ba:7c:fa:4f:96:
-                    71:b9:0a:9d:f3:67:72:79:cf:7e:c6:89:b3:6b:b3:
-                    06:af:1a:bf:7d:9b:86:90:bf:f6:b7:45:9a:d6:3b:
-                    67:9b:82:38:15:f8:2b:9a:36:f6:56:66:1a:1e:7c:
-                    c0:1d:f7:c1:6f:5d:17:4b:86:89:89:6e:5c:e5:51:
-                    da:89
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                78:6F:0B:E8:82:18:AD:46:6F:21:C7:AB:0A:A3:98:2A:16:B3:57:67
-            X509v3 Authority Key Identifier: 
-                keyid:C7:D0:B8:B7:D7:AF:1F:1D:B1:72:B5:63:B4:2A:1A:1B:6F:06:04:42
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         91:35:d8:89:1a:7b:ca:4f:ad:9b:ad:f4:4f:c3:7a:b3:fa:43:
-         73:f8:e0:55:ae:37:8b:0d:5a:8f:e9:a6:37:ea:d0:59:8b:b1:
-         fb:67:fe:4d:91:34:11:3f:54:a2:bd:8b:75:68:0c:0f:a7:db:
-         3a:dd:dd:85:b2:4e:b9:e2:91:1f:f7:71:3d:be:84:4f:27:a6:
-         82:d6:5d:c0:ef:e2:70:22:82:ac:73:21:2d:df:a5:30:2f:96:
-         67:8a:38:15:5d:13:50:2f:f4:eb:55:79:18:88:8c:08:46:ce:
-         bd:17:1f:6c:5e:b6:1d:77:1b:11:e2:a5:1b:44:ae:e1:2b:8f:
-         78:c6:b9:96:44:6a:eb:32:6d:a8:7a:1b:db:f8:a9:cc:00:f9:
-         49:bc:31:84:a8:62:bf:d0:d7:e9:98:15:d5:1d:fa:b0:4a:4c:
-         3b:0a:c3:ca:ff:eb:18:03:c7:a8:82:f7:1c:e5:c9:5d:21:8e:
-         b1:38:41:54:ed:26:0a:43:98:29:e0:2a:b4:61:56:8b:57:66:
-         5e:e3:cb:22:ce:1e:b6:28:b3:2d:04:03:cf:ed:86:55:34:92:
-         5e:d8:38:6f:ae:29:c3:d6:d2:a0:16:71:e7:82:b3:1c:18:67:
-         ef:4a:5e:65:1f:62:5c:73:a6:44:e3:96:b8:6f:af:1d:3e:7f:
-         90:bc:e1:12
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowFzEVMBMGA1UEAwwMSW50
-ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+jvwe7ld
-YF8cybCHYEVBHmzRVDQc/0JQP6NvOPggUNWBpDmYPHLmVJhkRq2wzA2onr7r3QTM
-qhtUi8QrwB9L7VnQHQs9nsHcQqURlxIrJxqTHkbyn45i/x5fGYo59RO8yjnDItc6
-ins59L+vNpDh674J8jwAsJaXA2d/yD3bDqjn5gYEmLMD9cikyFntWT0IJF0nVC3b
-rYf/xdDKzNh2mgtKQ2EpbwblOqUuKr32Z8gDS5YqD8gz23EN73FRunz6T5ZxuQqd
-82dyec9+xomza7MGrxq/fZuGkL/2t0Wa1jtnm4I4Ffgrmjb2VmYaHnzAHffBb10X
-S4aJiW5c5VHaiQIDAQABo4HLMIHIMB0GA1UdDgQWBBR4bwvoghitRm8hx6sKo5gq
-FrNXZzAfBgNVHSMEGDAWgBTH0Li3168fHbFytWO0KhobbwYEQjA3BggrBgEFBQcB
-AQQrMCkwJwYIKwYBBQUHMAKGG2h0dHA6Ly91cmwtZm9yLWFpYS9Sb290LmNlcjAs
-BgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vdXJsLWZvci1jcmwvUm9vdC5jcmwwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AJE12Ikae8pPrZut9E/DerP6Q3P44FWuN4sNWo/ppjfq0FmLsftn/k2RNBE/VKK9
-i3VoDA+n2zrd3YWyTrnikR/3cT2+hE8npoLWXcDv4nAigqxzIS3fpTAvlmeKOBVd
-E1Av9OtVeRiIjAhGzr0XH2xeth13GxHipRtEruErj3jGuZZEausybah6G9v4qcwA
-+Um8MYSoYr/Q1+mYFdUd+rBKTDsKw8r/6xgDx6iC9xzlyV0hjrE4QVTtJgpDmCng
-KrRhVotXZl7jyyLOHrYosy0EA8/thlU0kl7YOG+uKcPW0qAWceeCsxwYZ+9KXmUf
-YlxzpkTjlrhvrx0+f5C84RI=
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:d6:29:78:82:63:a2:61:61:53:72:81:0c:e6:16:
-                    4c:54:d9:ff:5f:4f:30:a3:9f:b2:e1:62:ec:90:e1:
-                    80:3b:95:c4:17:95:ea:37:96:a7:6c:90:4d:ac:08:
-                    2e:e4:52:d7:7f:e3:eb:54:4b:32:95:8c:fd:de:f0:
-                    5b:8d:eb:1a:a3:8a:be:49:a1:8a:e6:9c:4b:b2:6b:
-                    f7:0d:8a:3f:88:f9:02:cb:07:64:f1:2f:c3:a8:8e:
-                    06:a6:e7:bc:e9:20:0d:73:a3:95:05:a5:e6:5b:7e:
-                    07:b3:41:e1:0e:25:41:ba:39:ec:89:3a:1c:96:8b:
-                    9d:4d:b8:94:aa:b3:2f:91:ab:21:85:de:89:ee:f9:
-                    4e:18:88:41:69:93:ab:87:68:4f:77:2f:ac:33:f3:
-                    68:67:36:3c:f3:85:84:7f:77:1d:7a:2c:8a:a6:f2:
-                    4e:5f:52:9b:0b:35:8c:f6:46:61:68:3b:3a:2e:26:
-                    8a:d3:24:14:31:6f:f8:43:62:d2:5b:44:18:9d:47:
-                    c7:57:b3:b5:da:b3:7d:b0:29:48:3b:e5:27:4c:52:
-                    fa:1f:33:26:34:0b:5c:a8:6b:a5:02:eb:96:a8:f1:
-                    c9:67:b4:0e:9d:12:6e:1c:44:57:cf:bf:75:ad:5e:
-                    54:d2:18:13:ea:ee:45:4d:94:3b:58:7d:20:9d:d2:
-                    40:85
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                C7:D0:B8:B7:D7:AF:1F:1D:B1:72:B5:63:B4:2A:1A:1B:6F:06:04:42
-            X509v3 Authority Key Identifier: 
-                keyid:C7:D0:B8:B7:D7:AF:1F:1D:B1:72:B5:63:B4:2A:1A:1B:6F:06:04:42
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         7e:be:c2:56:a4:f6:74:c1:6a:97:11:04:6b:8a:50:c2:74:4b:
-         e0:01:6d:bf:72:c2:6e:4c:14:c1:15:ef:92:5f:44:4d:23:99:
-         ac:88:c2:c9:40:95:82:7d:b1:40:0d:4e:96:2e:1b:3f:5d:22:
-         23:0e:92:e7:56:c0:33:21:f3:e2:39:41:b0:39:c6:27:29:1f:
-         72:ac:58:73:0a:b2:13:bb:83:6a:6f:d9:4b:08:71:95:07:28:
-         51:2a:a9:a5:d9:ab:02:78:62:fa:78:1a:1f:22:cb:80:5c:5e:
-         79:81:fa:82:38:30:ba:eb:d3:a8:90:f4:47:aa:09:a8:c5:f8:
-         20:58:fe:4d:82:47:2f:41:e6:7b:44:6b:5d:ee:ca:f9:2d:48:
-         1f:76:e2:db:f0:3e:4d:de:85:d2:63:a3:e6:61:db:28:69:75:
-         74:61:a0:ee:c3:e8:6f:c4:ce:a3:31:3c:48:9d:34:84:fe:83:
-         7e:7d:be:2f:ca:bd:f8:f2:39:1c:0e:b2:3c:c2:4a:f2:3f:fe:
-         63:2c:53:7b:1e:e7:64:e0:97:05:46:64:60:a0:35:54:5f:44:
-         31:9a:a2:b7:72:7d:4a:90:90:9c:dd:d0:cd:89:b5:90:32:b2:
-         2d:e2:4f:3c:b4:ae:46:00:96:72:6f:8e:bc:d3:59:e5:08:57:
-         b9:3f:f6:b2
------BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowDzENMAsGA1UEAwwEUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANYpeIJjomFhU3KBDOYW
-TFTZ/19PMKOfsuFi7JDhgDuVxBeV6jeWp2yQTawILuRS13/j61RLMpWM/d7wW43r
-GqOKvkmhiuacS7Jr9w2KP4j5AssHZPEvw6iOBqbnvOkgDXOjlQWl5lt+B7NB4Q4l
-Qbo57Ik6HJaLnU24lKqzL5GrIYXeie75ThiIQWmTq4doT3cvrDPzaGc2PPOFhH93
-HXosiqbyTl9Smws1jPZGYWg7Oi4mitMkFDFv+ENi0ltEGJ1Hx1eztdqzfbApSDvl
-J0xS+h8zJjQLXKhrpQLrlqjxyWe0Dp0SbhxEV8+/da1eVNIYE+ruRU2UO1h9IJ3S
-QIUCAwEAAaOByzCByDAdBgNVHQ4EFgQUx9C4t9evHx2xcrVjtCoaG28GBEIwHwYD
-VR0jBBgwFoAUx9C4t9evHx2xcrVjtCoaG28GBEIwNwYIKwYBBQUHAQEEKzApMCcG
-CCsGAQUFBzAChhtodHRwOi8vdXJsLWZvci1haWEvUm9vdC5jZXIwLAYDVR0fBCUw
-IzAhoB+gHYYbaHR0cDovL3VybC1mb3ItY3JsL1Jvb3QuY3JsMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB+vsJWpPZ0
-wWqXEQRrilDCdEvgAW2/csJuTBTBFe+SX0RNI5msiMLJQJWCfbFADU6WLhs/XSIj
-DpLnVsAzIfPiOUGwOcYnKR9yrFhzCrITu4Nqb9lLCHGVByhRKqml2asCeGL6eBof
-IsuAXF55gfqCODC669OokPRHqgmoxfggWP5NgkcvQeZ7RGtd7sr5LUgfduLb8D5N
-3oXSY6PmYdsoaXV0YaDuw+hvxM6jMTxInTSE/oN+fb4vyr348jkcDrI8wkryP/5j
-LFN7Hudk4JcFRmRgoDVUX0QxmqK3cn1KkJCc3dDNibWQMrIt4k88tK5GAJZyb468
-01nlCFe5P/ay
------END CERTIFICATE-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/generate-chains.py
deleted file mode 100755
index 8374c84..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyEncipherment."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_ec_key(
-    'secp384r1', common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,keyEncipherment')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Intermediate.key
deleted file mode 100644
index ab27fc2..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Intermediate.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA+jvwe7ldYF8cybCHYEVBHmzRVDQc/0JQP6NvOPggUNWBpDmY
-PHLmVJhkRq2wzA2onr7r3QTMqhtUi8QrwB9L7VnQHQs9nsHcQqURlxIrJxqTHkby
-n45i/x5fGYo59RO8yjnDItc6ins59L+vNpDh674J8jwAsJaXA2d/yD3bDqjn5gYE
-mLMD9cikyFntWT0IJF0nVC3brYf/xdDKzNh2mgtKQ2EpbwblOqUuKr32Z8gDS5Yq
-D8gz23EN73FRunz6T5ZxuQqd82dyec9+xomza7MGrxq/fZuGkL/2t0Wa1jtnm4I4
-Ffgrmjb2VmYaHnzAHffBb10XS4aJiW5c5VHaiQIDAQABAoIBAQDtZbYlutsCldl6
-4xXb2HgKBFSnnPUxmdkGNuhK1OPbrGLcyaNLHfq0oQrpHtlPDVo+mISt32LHszwH
-iSm0kDx5Ri6xjzt7hRGQzIeemicEZyrRm5+MjgoPXOH+GewYPQxrklc1k5k/Td7S
-+pOgod0jyNwoypIg9gz4ttU8xKoxAV8X8uTUoPp2CBWwzUxsSGAVUMAtKcHtjlGh
-2jGSDEGQewMNZ8IGhy0MNBJcr+xlcz122c7407UQsHCoXzaf6VmLd6Hlrf19HEJN
-HzCEJW6jpU5LaOEYD4wfsEOsxHnQD91dH6N7wvBbUWXRW0okTlrSf/bNp8zo8Qlc
-bFewZLoBAoGBAP61aWdooGEgBLrt8EbyuuGDFwQic8lg27V2o3Wtwd2Tx8qQL7hU
-ZKG8rFkEdX7QWuuWvdW5h5KziThbwrGqiiBLbg+jAdEhZeBlhimM1wauRBFkDwuN
-EEEUcoJgLh378CS94eHRtbC545eJeNAiuv6LBVlrH+CE3oKVGXZKMn3JAoGBAPuA
-uFy2CrF20dXpu87RkwKbp4ZJz1IxM1x0Oev7fFlKyp4hShMS1JzzEhcxnO5uSEiG
-tEczI/f6Y8Eq61UVb+/KNFe83CZynXEVubxPxYd+Wc6qLpAcM9EeStBOej3M82by
-V0u1PE64WLwYAvYDvhp9do/EgeG+iol6gtNww9bBAoGABHM08TqRusCtdHqdvQ+W
-lkQNDeRwM29+xy/YcUDk5zMixXY5bzYCQBUkybVbPCj1vbH3hRlltflvB04LG8GI
-AkJvHNTTPk0gE4iSjH1KcHJw/ADMhn4jb4+k5IQ7qghxzKKIpMJeM0U8JbSgKLrC
-m5ngMQy/FNQdcxiZxkhLk4kCgYEAzkP6cCbozDUL0Wm5mtxsumXYVh1wyBML8ZZs
-7qo5iK37UQcyTkRSVUpRGu6Yqz+NTtYTQpWhuT4E1CcUDJrhTANFPHPrBilYEKfl
-xZiTAxXQJ9uRBqXqpWY3q3HBdbACK/szNyczh8hPFiyHOSdGoUkmlLBwaSkxS6FL
-bIf+RcECgYEAzQ8AMXEYNhT77bBo8uK48DKPaqiMrv8Q56xbyUHPbTcTSELeOMDM
-MAyBflCImRzXgGyaY1JGmpNtmjXZjqdDJvhGkDGe/N34bi+Bykcy1q3aP61SDVTH
-y8uszm+VDKubqiEnqq4PCcRuTwgY4oVePcMmzdWw0jZArlu07dWADvw=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Root.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Root.key
deleted file mode 100644
index f92d56f..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Root.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA1il4gmOiYWFTcoEM5hZMVNn/X08wo5+y4WLskOGAO5XEF5Xq
-N5anbJBNrAgu5FLXf+PrVEsylYz93vBbjesao4q+SaGK5pxLsmv3DYo/iPkCywdk
-8S/DqI4Gpue86SANc6OVBaXmW34Hs0HhDiVBujnsiTocloudTbiUqrMvkashhd6J
-7vlOGIhBaZOrh2hPdy+sM/NoZzY884WEf3cdeiyKpvJOX1KbCzWM9kZhaDs6LiaK
-0yQUMW/4Q2LSW0QYnUfHV7O12rN9sClIO+UnTFL6HzMmNAtcqGulAuuWqPHJZ7QO
-nRJuHERXz791rV5U0hgT6u5FTZQ7WH0gndJAhQIDAQABAoIBAFd/qhTb0EQpF4b4
-4uQ+yAEC8Ctol17CqLsdR7oJ5/JwRiW8wmzjyJO6gYF/9mii0BkYbdWKw6gGatLj
-MQTSwZd/4C8FKVL/GI5VPiLyEPNNia6Z3swLz8zV+jHHDI/S4KwWcZRVK8DFxS+g
-AutcnXYQpGuMqpF3iVVvzI3Rl+XTXdUPwhDpnJzYA2ip9nQrAMXYLgTnPf40bsng
-hk7M0Ln6qIiGR2kaBX0dzyfoX1FzXxOHhkIKBvsih10b8BXnLFk1SFYIGKvGqLJ9
-sAUbfKSO/iJWeODa+E+KovoY6UqyrgMgSpeatTPQwQH+vB31kHxvF32KgRRwYHWo
-21TeGQECgYEA9h+q0P5K50Hbr8fNv9vOyRcnIsSy+nYSggAtHHt4q2nkc6ctObSa
-ttW2nWwoNDgfA/56EswuuZfkeQj801P/ha+OHgbf3VyD10HKDmykfDzS7Qc65HcU
-viiXuX25ZtOpxGlRO6iRu2Jy7jhzBQefuYnx70OJYp9jBEtap1PLx70CgYEA3sF5
-Li/6EgeoXBXAbAhJjKOPzer01UyrrOSqoJ87QbxX+ZkPWYKzxk+fZs28gsJAAJRr
-cDXrGFAuFUxDwdJYqxg8cDml48agCtjHrqdyNvQo6Ep7tMe2Da/BsTFA1v92vvQA
-BoIHRK0Qd7b3Z7rqS5BbL+340sgH3ZS7g3vN5GkCgYA3F9OWwLVnmrhgWqtVvRBG
-tyYNhFZD9lYiP4PZklHqnOOEd/GJr0HKl4AvMNy3A7D9peMRfh8fcD62USq262CR
-PkDju8o0tNbWQmXGYM9Y+AyG/k1Sgs1j25ZK8TelKtAfpSuH3S3x8hGj/YLRp2k7
-kQNU+ZsxNlhlx7BdMEa3SQKBgQCPm7XPRBj5RLyS2WcbfuBD7jLIs4Ayf2JybV1f
-fiiKwa0J+lZ+A5h48l42vc6ZkjgG56i4R9qP6yk6i9dm/oAxlcdpJpE/Xo9RTt61
-R7iHmzNARryoGNTS0AuUe8dslHfutYnKqEudR+HE/E1WL5fbLW7MYKQ458LCZJ/b
-LZbYeQKBgGYukHV6gPA8fVwLs4RnXNzibJ+TwHj2rp3y2d62jZtPbv4OF1a0V3aP
-r6UeXEE2tCteOnVgDTQk/I0PYzIzQgKzQfw1Uykyyr+fN13g7bqyH9/9ISaOL1WY
-jIatOblgBBvSezrPs1odeTdhiojNloiczF9H4Nf6h9tyAPndrEPC
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Target.key
deleted file mode 100644
index c5f8ee4c..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/keys/Target.key
+++ /dev/null
@@ -1,10 +0,0 @@
-openssl ecparam -name secp384r1 -genkey
------BEGIN EC PARAMETERS-----
-BgUrgQQAIg==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDB8LdCJYSg12HVLaMeMXCYu4az7LeC7Sm9YMtB9VayngvbOLKHFfrds
-4SAZPJl9rCygBwYFK4EEACKhZANiAARHkAbNMvFDZIoPqSeti3K2kL+cVk9v7bxa
-JoFuq5n1l8xlhwTFm8ft59LsgOWK2geIVWMlm12SxNssNfMyvkFObI5TVOvPokoM
-xPgu/Q3fexMHKMlRmOciKQ7MKT/YjrI=
------END EC PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/main.test b/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/main.test
deleted file mode 100644
index 0bcea7d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-keyencipherment/main.test
+++ /dev/null
@@ -1,5 +0,0 @@
-chain: chain.pem
-last_cert_trust: TRUSTED_ANCHOR
-utc_time: 150302120000Z
-key_purpose: SERVER_AUTH
-expected_errors:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/chain.pem b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/chain.pem
deleted file mode 100644
index 3e12d68..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/chain.pem
+++ /dev/null
@@ -1,271 +0,0 @@
-[Created by: generate-chains.py]
-
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only decipherOnly.
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Intermediate
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Target
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:ad:4f:bb:4a:8c:03:fc:72:e0:cc:49:9f:2c:5e:
-                    b3:e6:64:d8:c3:4b:3d:04:f5:a0:80:c9:66:1c:e7:
-                    28:7e:4e:bf:7d:45:11:81:66:28:17:e2:79:6d:39:
-                    9c:6d:9e:8d:75:88:61:01:ed:07:ef:43:21:94:0a:
-                    02:59:4d:9b:01:ac:ea:77:57:b6:03:ae:e2:ee:ec:
-                    3d:2a:a7:30:ee:6a:7d:58:4e:16:99:7d:a0:11:f5:
-                    53:28:a0:4d:ba:6f:6c:c2:9e:1f:97:1f:1f:39:50:
-                    59:cc:d1:87:94:1f:a9:0c:52:6c:21:b6:00:16:5c:
-                    a7:d3:f8:f6:49:8e:b3:52:10:25:7d:9d:1e:4c:db:
-                    bf:36:50:94:7b:fa:cd:b7:4b:45:91:f5:5b:48:e9:
-                    69:cc:ea:d0:31:cf:de:cf:be:c1:96:0a:02:4b:97:
-                    7a:b3:5f:2c:e0:fc:ca:42:40:03:a5:06:5d:ce:b2:
-                    ec:6c:3c:c0:bf:65:e6:93:71:92:b1:78:5a:2a:00:
-                    56:29:58:a3:5b:a5:2f:2f:16:2b:b0:3d:44:4d:cb:
-                    cf:38:ae:ec:c2:24:50:6f:24:17:6b:03:4f:8b:eb:
-                    da:22:7e:ff:2f:44:3b:da:78:1d:d4:63:b0:75:75:
-                    e7:0f:e1:cb:d6:aa:08:92:b5:1d:8b:23:61:6f:e4:
-                    44:71
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                64:03:B3:9E:45:93:DC:D7:0E:93:D8:D6:15:98:38:10:91:2B:7F:F0
-            X509v3 Authority Key Identifier: 
-                keyid:DE:9D:6D:1F:5D:CB:37:C0:88:DD:3F:5E:FE:85:93:89:72:5D:29:DF
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Intermediate.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Intermediate.crl
-
-            X509v3 Key Usage: critical
-                Decipher Only
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-    Signature Algorithm: sha256WithRSAEncryption
-         ae:14:bb:a4:87:88:38:c4:9e:76:6e:9b:ff:25:7d:c3:38:d6:
-         c3:51:6b:83:5d:f6:69:3b:6c:54:65:3d:b0:58:c5:63:f6:aa:
-         0d:9d:44:9d:65:3f:2b:67:79:10:49:5a:48:10:28:e5:02:19:
-         73:6b:ca:69:8e:be:71:02:c0:df:e7:17:af:a4:a6:9c:fb:49:
-         3d:c6:e5:7e:4d:35:9b:43:db:42:cd:10:a5:e4:1a:70:2d:6f:
-         96:fa:53:3c:3c:df:50:0c:50:fc:d3:af:96:b1:33:6e:c9:e0:
-         53:dc:8b:f4:59:2e:3a:88:e6:ac:81:7a:64:1c:6e:b6:6e:f7:
-         cf:2d:4e:66:e8:9d:b3:1e:4e:59:3d:31:a9:2e:72:a0:ff:c9:
-         37:91:74:e1:63:b6:4a:35:bb:c5:63:23:64:ad:5c:5a:80:d2:
-         e6:03:a4:44:83:3b:ff:71:d9:66:ce:3b:1d:63:f2:97:f0:06:
-         7e:1c:dc:31:b3:20:6c:68:50:40:3d:9a:e8:fe:d5:b7:0e:a0:
-         8d:3e:36:35:df:e0:57:df:d9:18:90:91:77:05:a7:11:c6:c9:
-         6c:5b:ec:55:e9:9f:73:8e:e2:98:02:e0:17:db:10:f0:03:a8:
-         c9:f6:54:5d:ae:c1:ee:d3:92:50:5b:ae:55:e2:c1:d6:51:8a:
-         b7:7f:76:00
------BEGIN CERTIFICATE-----
-MIIDhDCCAmygAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
-cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtT7tK
-jAP8cuDMSZ8sXrPmZNjDSz0E9aCAyWYc5yh+Tr99RRGBZigX4nltOZxtno11iGEB
-7QfvQyGUCgJZTZsBrOp3V7YDruLu7D0qpzDuan1YThaZfaAR9VMooE26b2zCnh+X
-Hx85UFnM0YeUH6kMUmwhtgAWXKfT+PZJjrNSECV9nR5M2782UJR7+s23S0WR9VtI
-6WnM6tAxz97PvsGWCgJLl3qzXyzg/MpCQAOlBl3OsuxsPMC/ZeaTcZKxeFoqAFYp
-WKNbpS8vFiuwPURNy884ruzCJFBvJBdrA0+L69oifv8vRDvaeB3UY7B1decP4cvW
-qgiStR2LI2Fv5ERxAgMBAAGjgeAwgd0wHQYDVR0OBBYEFGQDs55Fk9zXDpPY1hWY
-OBCRK3/wMB8GA1UdIwQYMBaAFN6dbR9dyzfAiN0/Xv6Fk4lyXSnfMD8GCCsGAQUF
-BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
-aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDwYDVR0PAQH/BAUDAwcAgDATBgNVHSUEDDAKBggrBgEF
-BQcDATANBgkqhkiG9w0BAQsFAAOCAQEArhS7pIeIOMSedm6b/yV9wzjWw1Frg132
-aTtsVGU9sFjFY/aqDZ1EnWU/K2d5EElaSBAo5QIZc2vKaY6+cQLA3+cXr6SmnPtJ
-Pcblfk01m0PbQs0QpeQacC1vlvpTPDzfUAxQ/NOvlrEzbsngU9yL9FkuOojmrIF6
-ZBxutm73zy1OZuidsx5OWT0xqS5yoP/JN5F04WO2SjW7xWMjZK1cWoDS5gOkRIM7
-/3HZZs47HWPyl/AGfhzcMbMgbGhQQD2a6P7Vtw6gjT42Nd/gV9/ZGJCRdwWnEcbJ
-bFvsVemfc47imALgF9sQ8AOoyfZUXa7B7tOSUFuuVeLB1lGKt392AA==
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Intermediate
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:ce:e7:93:72:0a:ea:61:19:a3:1a:a6:94:26:db:
-                    04:bb:49:4a:42:17:11:98:c9:d5:ce:90:19:1c:1f:
-                    c2:8e:19:34:2c:6a:1c:40:ab:c9:8d:dd:fc:15:2b:
-                    dc:30:7a:aa:cb:04:99:9b:d9:59:dd:82:31:50:60:
-                    e3:49:91:e8:de:9c:3b:0d:71:d4:84:2e:e6:0a:dc:
-                    9d:32:3e:95:1c:16:9b:70:b6:e8:9f:ee:ee:d6:97:
-                    11:ac:14:0f:1e:94:95:6d:34:c5:17:d1:09:7d:72:
-                    a0:27:b8:45:a4:68:21:d8:99:08:7d:5b:fa:39:12:
-                    70:23:dc:68:f2:02:22:d3:38:20:0f:28:ed:4f:71:
-                    63:41:e4:d2:04:9a:c1:52:45:fc:bf:5d:42:72:e1:
-                    3d:b9:b4:b4:a3:5e:23:5a:42:23:c5:04:de:d1:5c:
-                    91:5f:b1:b3:4a:61:c5:9c:d5:71:37:cc:1c:06:5e:
-                    2e:13:40:9b:d4:be:67:9a:6d:e2:51:2e:66:8c:17:
-                    6e:dd:4b:d8:87:06:22:82:99:85:58:7d:cf:06:ee:
-                    e8:42:6b:3d:06:06:74:c0:de:7a:18:3c:46:cb:d0:
-                    64:44:6d:33:a1:9f:a8:9a:15:7e:19:77:63:75:a8:
-                    7d:df:9f:65:9b:96:eb:b2:e4:cc:eb:47:fc:38:5e:
-                    8d:a5
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                DE:9D:6D:1F:5D:CB:37:C0:88:DD:3F:5E:FE:85:93:89:72:5D:29:DF
-            X509v3 Authority Key Identifier: 
-                keyid:B7:07:9B:F4:EC:BC:6D:B5:0F:F1:65:46:8E:34:AE:06:83:DF:24:81
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         1c:85:38:ba:71:7e:f7:d1:e2:35:a8:89:6e:07:2c:a2:fe:ce:
-         50:06:67:49:1d:e9:80:2b:24:38:db:cc:d8:9e:05:ae:18:25:
-         84:7b:cd:1e:2f:a1:3a:ec:27:1d:cd:76:92:f9:9b:66:36:ba:
-         34:49:3d:f6:03:b0:52:43:43:4e:ed:f2:47:5f:57:a6:27:30:
-         51:81:5c:95:c6:61:02:64:3b:f4:b8:3b:bc:ca:39:76:44:8b:
-         1a:29:c0:5c:a0:12:bb:4d:4a:2e:5c:70:80:45:6b:32:1c:2e:
-         3d:8e:38:55:a1:2f:e8:f6:c1:23:a5:73:a1:ac:c0:11:c5:20:
-         56:4a:94:9a:67:a0:a5:0a:bf:f7:4f:e8:04:41:80:f7:ec:9c:
-         41:a7:cf:dd:72:ef:46:6e:97:e3:e6:ae:cf:1a:7d:73:56:26:
-         91:61:c7:b4:ec:97:b6:77:27:97:85:0f:ae:ff:67:47:e6:25:
-         54:07:a9:2b:f5:37:8e:e5:57:3c:a4:4d:a5:64:cb:0d:91:63:
-         e6:f0:51:74:80:a0:bf:b4:84:bc:79:c0:84:20:6b:0b:42:15:
-         31:25:9d:69:77:61:23:01:d0:5c:5b:f1:3f:36:96:9f:82:6a:
-         c2:b8:62:3a:95:c3:5d:2c:64:f7:4e:d2:cd:95:fb:a6:cf:e9:
-         e2:68:86:34
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowFzEVMBMGA1UEAwwMSW50
-ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzueTcgrq
-YRmjGqaUJtsEu0lKQhcRmMnVzpAZHB/Cjhk0LGocQKvJjd38FSvcMHqqywSZm9lZ
-3YIxUGDjSZHo3pw7DXHUhC7mCtydMj6VHBabcLbon+7u1pcRrBQPHpSVbTTFF9EJ
-fXKgJ7hFpGgh2JkIfVv6ORJwI9xo8gIi0zggDyjtT3FjQeTSBJrBUkX8v11CcuE9
-ubS0o14jWkIjxQTe0VyRX7GzSmHFnNVxN8wcBl4uE0Cb1L5nmm3iUS5mjBdu3UvY
-hwYigpmFWH3PBu7oQms9BgZ0wN56GDxGy9BkRG0zoZ+omhV+GXdjdah9359lm5br
-suTM60f8OF6NpQIDAQABo4HLMIHIMB0GA1UdDgQWBBTenW0fXcs3wIjdP17+hZOJ
-cl0p3zAfBgNVHSMEGDAWgBS3B5v07LxttQ/xZUaONK4Gg98kgTA3BggrBgEFBQcB
-AQQrMCkwJwYIKwYBBQUHMAKGG2h0dHA6Ly91cmwtZm9yLWFpYS9Sb290LmNlcjAs
-BgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vdXJsLWZvci1jcmwvUm9vdC5jcmwwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AByFOLpxfvfR4jWoiW4HLKL+zlAGZ0kd6YArJDjbzNieBa4YJYR7zR4voTrsJx3N
-dpL5m2Y2ujRJPfYDsFJDQ07t8kdfV6YnMFGBXJXGYQJkO/S4O7zKOXZEixopwFyg
-ErtNSi5ccIBFazIcLj2OOFWhL+j2wSOlc6GswBHFIFZKlJpnoKUKv/dP6ARBgPfs
-nEGnz91y70Zul+Pmrs8afXNWJpFhx7Tsl7Z3J5eFD67/Z0fmJVQHqSv1N47lVzyk
-TaVkyw2RY+bwUXSAoL+0hLx5wIQgawtCFTElnWl3YSMB0Fxb8T82lp+CasK4YjqV
-w10sZPdO0s2V+6bP6eJohjQ=
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:93:b1:b1:25:d7:e8:52:1b:b5:db:e0:fb:2e:f5:
-                    58:32:36:35:6e:06:e9:a6:13:e1:f3:b0:ad:ba:88:
-                    c1:d7:26:c8:88:f7:77:20:5e:c2:88:5a:cc:de:8d:
-                    f3:43:19:7e:9a:c5:3a:fa:78:40:27:40:75:a4:00:
-                    5e:a6:71:35:ef:e6:cb:e5:a5:6b:a9:05:67:d2:9d:
-                    bd:99:6e:18:9e:29:28:c7:87:46:dc:67:aa:44:dd:
-                    03:76:ae:f7:c0:19:b7:45:37:ba:6b:ea:31:82:2f:
-                    6e:5b:91:65:cd:f3:d0:fc:e8:1a:c5:7f:6d:6b:a2:
-                    af:13:2f:17:59:46:e2:d4:2f:13:9c:58:c8:51:35:
-                    ef:cb:1d:70:b6:23:28:44:ae:a4:f0:55:0a:de:69:
-                    3a:27:24:58:1b:08:c4:b5:e2:92:ef:62:d1:87:07:
-                    8a:f5:f1:3e:61:2a:ca:6b:27:1f:7c:d3:18:63:ea:
-                    7c:3d:1f:5e:02:44:29:c7:c8:09:36:bb:c3:bc:3c:
-                    d1:66:04:0f:a7:e7:96:8b:bd:cc:6f:96:f6:78:1a:
-                    f6:8e:8f:d7:f5:1c:42:9c:46:79:65:50:df:32:9e:
-                    58:e1:92:e9:4c:ec:be:48:19:12:d6:d1:1c:80:d3:
-                    53:87:9a:27:b8:c7:30:87:f6:63:d5:a5:d2:d2:a5:
-                    6a:57
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                B7:07:9B:F4:EC:BC:6D:B5:0F:F1:65:46:8E:34:AE:06:83:DF:24:81
-            X509v3 Authority Key Identifier: 
-                keyid:B7:07:9B:F4:EC:BC:6D:B5:0F:F1:65:46:8E:34:AE:06:83:DF:24:81
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         13:b0:bb:1d:26:db:26:9f:c0:36:6c:b0:65:82:ce:ad:0f:c0:
-         70:d6:6e:56:48:5a:23:9f:f4:df:22:8a:b0:6c:50:42:8d:03:
-         97:7f:6e:72:81:a3:69:f6:4e:74:8a:e3:73:1c:ab:08:ca:d9:
-         f5:e6:85:73:fc:20:45:66:5a:4a:26:33:4e:37:4b:c5:ce:c9:
-         f3:2d:0d:8b:40:fb:2e:ab:21:09:88:34:ef:c1:71:e9:6a:71:
-         ed:75:8f:ee:3b:7a:fa:51:28:ea:92:2b:89:54:4f:8d:09:92:
-         a1:a6:26:30:ee:d8:34:03:24:8d:55:26:fa:06:89:fb:a5:46:
-         d0:c0:f9:94:15:60:7c:5a:ae:fb:e0:be:e6:28:29:e6:c2:f1:
-         8d:4b:c7:03:61:f7:3f:6e:60:b2:20:67:1c:cf:55:74:4d:ec:
-         d3:c2:c2:f0:ef:e3:9c:55:48:f8:49:2a:f0:6d:10:25:be:50:
-         64:f8:3b:90:24:6b:6c:98:2c:1b:4c:db:35:1a:68:12:bf:79:
-         7f:6f:c7:65:f6:3b:31:54:8c:c4:17:bc:72:8a:48:01:8c:c2:
-         46:86:80:fb:14:63:e9:30:1b:d0:21:83:1c:71:aa:88:11:f0:
-         53:43:17:b5:ae:10:8f:d2:11:3a:7c:1c:62:2f:e3:3a:bd:e2:
-         76:81:67:68
------BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowDzENMAsGA1UEAwwEUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJOxsSXX6FIbtdvg+y71
-WDI2NW4G6aYT4fOwrbqIwdcmyIj3dyBewohazN6N80MZfprFOvp4QCdAdaQAXqZx
-Ne/my+Wla6kFZ9KdvZluGJ4pKMeHRtxnqkTdA3au98AZt0U3umvqMYIvbluRZc3z
-0PzoGsV/bWuirxMvF1lG4tQvE5xYyFE178sdcLYjKESupPBVCt5pOickWBsIxLXi
-ku9i0YcHivXxPmEqymsnH3zTGGPqfD0fXgJEKcfICTa7w7w80WYED6fnlou9zG+W
-9nga9o6P1/UcQpxGeWVQ3zKeWOGS6UzsvkgZEtbRHIDTU4eaJ7jHMIf2Y9Wl0tKl
-alcCAwEAAaOByzCByDAdBgNVHQ4EFgQUtweb9Oy8bbUP8WVGjjSuBoPfJIEwHwYD
-VR0jBBgwFoAUtweb9Oy8bbUP8WVGjjSuBoPfJIEwNwYIKwYBBQUHAQEEKzApMCcG
-CCsGAQUFBzAChhtodHRwOi8vdXJsLWZvci1haWEvUm9vdC5jZXIwLAYDVR0fBCUw
-IzAhoB+gHYYbaHR0cDovL3VybC1mb3ItY3JsL1Jvb3QuY3JsMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQATsLsdJtsm
-n8A2bLBlgs6tD8Bw1m5WSFojn/TfIoqwbFBCjQOXf25ygaNp9k50iuNzHKsIytn1
-5oVz/CBFZlpKJjNON0vFzsnzLQ2LQPsuqyEJiDTvwXHpanHtdY/uO3r6USjqkiuJ
-VE+NCZKhpiYw7tg0AySNVSb6Bon7pUbQwPmUFWB8Wq774L7mKCnmwvGNS8cDYfc/
-bmCyIGccz1V0TezTwsLw7+OcVUj4SSrwbRAlvlBk+DuQJGtsmCwbTNs1GmgSv3l/
-b8dl9jsxVIzEF7xyikgBjMJGhoD7FGPpMBvQIYMccaqIEfBTQxe1rhCP0hE6fBxi
-L+M6veJ2gWdo
------END CERTIFICATE-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/generate-chains.py
deleted file mode 100755
index f3196b77..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only decipherOnly."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_rsa_key(
-    2048, common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,decipherOnly')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Intermediate.key
deleted file mode 100644
index ba3a22d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Intermediate.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAzueTcgrqYRmjGqaUJtsEu0lKQhcRmMnVzpAZHB/Cjhk0LGoc
-QKvJjd38FSvcMHqqywSZm9lZ3YIxUGDjSZHo3pw7DXHUhC7mCtydMj6VHBabcLbo
-n+7u1pcRrBQPHpSVbTTFF9EJfXKgJ7hFpGgh2JkIfVv6ORJwI9xo8gIi0zggDyjt
-T3FjQeTSBJrBUkX8v11CcuE9ubS0o14jWkIjxQTe0VyRX7GzSmHFnNVxN8wcBl4u
-E0Cb1L5nmm3iUS5mjBdu3UvYhwYigpmFWH3PBu7oQms9BgZ0wN56GDxGy9BkRG0z
-oZ+omhV+GXdjdah9359lm5brsuTM60f8OF6NpQIDAQABAoIBACftane8gYRhdSdE
-dByXcW9O8mSUnRG2CWuGRUI3Is1XMclMZM1aGVgmOWpAf4pfcawh5B6+L+heInQX
-bmUZIi4rSf4LNG6ZukzoS/GRQCceebqjoXqTmkWQ+5kQeeZ11+wuHca90S4DO8LO
-fan/amCpD4lZgY0X8MoK07m4Dc5ikiT7qEBK58EV1K+k1IM18BUnuJ5PhTISy6CZ
-Zb0OVnQUX/UlJHip8/O/oVLgv989iluPmDQRVCdG5NTs4EJrZVCIsBAj/2zxmP7/
-KiE7SFs6/PryjQtskEsO4BiDZYf46BHBx9kA1ws6thrL3gBj3j6UIVN/eaAxZEqS
-US7CsKECgYEA++HZ67vuxWQqibFJe4t4w3/MGkM7bCAJpx+KXrSItTV/0MVSu86s
-i/OqKpeITe3WIO6/g3f1jttgoIenNrITIFX1FwrqxU2aBgHHAwAhRNNDdCJMjtZR
-3OGUGQqpw3Hko823bPfpaBGA4dA9mPJ/Q4HhUVGT34Gw0NzczYOsbKkCgYEA0kl9
-S3XaQ2zd7ug6IgIZ+aVtspmXYEDoSm9sPnRKvRIapGTMH9FhhoW/auADn8byUz5x
-4DGjvxdNn1Jh12tLSybkVHHic0DZw2LXORTd0DVXxORlNBuNaRnJUDQvGpymV1/R
-x1XV6NgOLUoECFN5QHhfkk2EjZsRcSgiRqFY2p0CgYEA6X3j1XLRVIoWJK4DwFL6
-D8BYI8BPRVwtlo7WZhRU5iZB5fYFS7O6n8Gw7OqroBHpfX3Uarq5F0SlvioCB+Hr
-eP41xLaKC3x0Wz0qjs2ACZ0N2ooxDff+yxMRhmUsGdFqca4xawIljCMtpiaz8yRY
-dOvhQtCsk3RVxEf5J0n4fIECgYEAm4mTzS68Y8awWLcX2HOpdsdvXfzQxHb92aCU
-dZVaeoJbhmCvwpECC5f9vzU2OQXT0tKLNAJDVWINHdy3VbiclleL5xHdJtY+u4/u
-FOBkOE5cPtuYJ3SBoc1a46HVfV+EgXf0F/ZbI8A6rDDkzqu/MXpXZkVD1+Fsgz/m
-KkvJBtkCgYAudznkqE0rswca5klGWil8VZ0NkN68wMEYaEguuCYezIATZLzMTFIS
-uaucPBXMHgVmWhvZfj8mJcidh3/MMFq/Dc8JQbKhghGr8tQ05/Gn1LrvPU3aiWlW
-yWyL9VdUI08nbCDZPMQ9AdXqoxUMMuARdiz87EWhqZYofmpklwpcbg==
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Root.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Root.key
deleted file mode 100644
index 5228a84b..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Root.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAk7GxJdfoUhu12+D7LvVYMjY1bgbpphPh87CtuojB1ybIiPd3
-IF7CiFrM3o3zQxl+msU6+nhAJ0B1pABepnE17+bL5aVrqQVn0p29mW4Ynikox4dG
-3GeqRN0Ddq73wBm3RTe6a+oxgi9uW5FlzfPQ/OgaxX9ta6KvEy8XWUbi1C8TnFjI
-UTXvyx1wtiMoRK6k8FUK3mk6JyRYGwjEteKS72LRhweK9fE+YSrKaycffNMYY+p8
-PR9eAkQpx8gJNrvDvDzRZgQPp+eWi73Mb5b2eBr2jo/X9RxCnEZ5ZVDfMp5Y4ZLp
-TOy+SBkS1tEcgNNTh5onuMcwh/Zj1aXS0qVqVwIDAQABAoIBAAZS11jdc68ATLsL
-WPXbv1j3BTaeySY5N7VtXSLddB84I+HpZopWRFH+QUNOJJo83zTVOP88YtLLab4J
-3gOWWU7aPOSqPn/QIW/dHR8Sna835+0TF6+cKKgmJl3Qg/8Pms814Z95OYFvcnQt
-N4Sn6czKS0sld5PiNUjG/WLvLAsVoEStRYj8gB4jMGkb6Wt89MQFx6cModHlXrXz
-hSmHUs+PS+ZsVoXcmA5nU1k5ozCNU8bMJ37g0PaMIkgAh6z/lhuOCtZH3Chv7+F3
-R3uodgI5hMCjvlQcRBejszk5K1SgqrJHMACihbIsnhA/Ywo7qGBrs8qgNNdndmfV
-jYZCVrECgYEAwq6Er/LHeiRsIEN7ltybLWspXvkhx55R1/ggs1m6lNoqIq6v0IDR
-S+NkonlkF/mXCcd5OsXeC1vnB2Ri+E3GJh3MQ3uKX+UQBlv/r1K4U5kCfavSBLq3
-OHf8XHjN37uMSa6Hrtp5RAC21ZwAjA4QErVyrY5J/GuEMlJMi4KjabsCgYEAwjZ9
-86ttz7sxLErY99MmPNv5hd30WJN6rdCX3RQ4Yi0dXMLKOxPzbteakbl46QYEAo6U
-z1SO4qx3suOYL5t6iFlFdON6YFx4SXGwhk9q+6uANM+4Q0aQ0CBLT79oH/ZuoaIt
-JDPRPC1DMsAQrMPlgE/dvdS67PwfMEzLj5YWWhUCgYEAvVyHD6V0RegbjB5Xnlwi
-TEFJ0mk9ZC8oqItfM1R52cOC7I1B0esaqVgbULYGmBNbyFVQI8zGuAHCbDxG0ALG
-U9j0EEegRrpFpgniX6R0SkwwUhDIjXUYNkLvIvsWNSL1x82NiJRVE8ImFQxSs+gR
-1kDLtOkMKgxiX5gRgDmnvXUCgYAcFxOaldX5MMMI+/5rwd+K9+ocQaEg2pvo3f3J
-HS6WjJ3tl8L2TolsI8UYhLIHSjZ0RDkjz8Am6vkZJ7AQWrWbWQYhxPEjVNyVCtuU
-YZJAump9uPmWyXMSl0ktTKr7zIHt4O4UiWYfBRDuGzeONXtRVrvkxAsRUdoU+1aJ
-+xRajQKBgD0Ah7cyrg9XDslQTFCyRvPPzsfsNM/uTYL6g3We2MggpqZezegYiyOJ
-D4x3/427cQOTfUC8BNdwk8AnPqfjJTNoVfilPATS4cZ1rxnH6v6UeqdEME8Y6GwR
-IP26zPmiJyq2h+VlU28mOhL2z8Xm5t8NimhjjFk7SGj9/7JCZR8w
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Target.key
deleted file mode 100644
index 261e18fb..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/keys/Target.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEArU+7SowD/HLgzEmfLF6z5mTYw0s9BPWggMlmHOcofk6/fUUR
-gWYoF+J5bTmcbZ6NdYhhAe0H70MhlAoCWU2bAazqd1e2A67i7uw9Kqcw7mp9WE4W
-mX2gEfVTKKBNum9swp4flx8fOVBZzNGHlB+pDFJsIbYAFlyn0/j2SY6zUhAlfZ0e
-TNu/NlCUe/rNt0tFkfVbSOlpzOrQMc/ez77BlgoCS5d6s18s4PzKQkADpQZdzrLs
-bDzAv2Xmk3GSsXhaKgBWKVijW6UvLxYrsD1ETcvPOK7swiRQbyQXawNPi+vaIn7/
-L0Q72ngd1GOwdXXnD+HL1qoIkrUdiyNhb+REcQIDAQABAoIBAA4wtw8Vg8YJyeow
-JP5HCsfUfgMPiAF98xRYaSn4q1IcNIWXQCWuLZ43BuYwj2RSVRbIgdjchYfLoVYz
-s5mIRybN96yp29dVXHNfmGqDofgDdBvk2OjcZlzSD2sGJRccxHTy6XdALxhMQe4J
-QeaY6Qh/PydLdZpfH8a1XcUMEBap5Ul9P4WEk6kjGJETAWFAht1Qm0ch17n6U0Hg
-3tuUk+bX6CLuyd58fpf1AyGqi3q9OGDfzwkd4ZEdTPhKp56ebefOMIjXk+RVcyoJ
-Z02AdbatIBJiOtaSEq1v/WEMzaebP3Wt68c5ck7LwZq+Yt2HSTQTVyY/ZK9TbPJL
-DmRksXkCgYEA0/qaiTUi4HYIiMf85eUxlXbpBH0EIo1c05nPBddCMnGRYIsWL7FE
-V+F3sQNfrDO184bkn4iHO46DiYyv/cTolX2Sq0uYOFILwu5ODnbqldhEyn+7CX/B
-yBGQOCgf+J7GG5HtQUserzyTt7kl8A7fLJSNnTZzWSs2ig4PkjV6/bMCgYEA0U10
-14+PNnOgaigJnrhXs9WcY2demyCKx3AEoQkdpTYJbQrilCGTGXwmxq3DwfXojLiU
-AXePOdxN/PZc073/F91fPlRZDEtG0SG+mqb3gGoiCHeUIKs0AXik0S+CjfYrOkZF
-JiAzN029cz/6BnCZpsLdVM/M0yabSIFe9toVy0sCgYBTcyyzJz/7rXvenRxqRLgo
-Zw+EvNKL56rLgpmFayCcSyk4IIkzbU3Cavh7ryBS4miW3lvSkiTqxUfzNndyJ7qI
-X08GMFRUl7gZnUcNWrMvGly6e15edvUKlh94fBNaBOdooyILuk7yHZ7pjPHqd3BU
-VIcLhQwT5ncqEi7/GB67EQKBgBRtNsYC4LsztagmmCnBW+3VHxokcHs7RdAJAqqk
-tRv2lhzqPwqt7ClEkJQ7SSuY0EVLjkZGYNgIxCO3939Cv66YkD8JBFfK0PKAFJYL
-TYRe10t0QCSgEMdD+vHfbSJlr/pT+VOrONRg5ehligUu4BACXI92aEsDLYx588ar
-qgzZAoGAcL96RHPqDhi1eAiSgfU05Y4sG596YLXeW2wZVj4e6Fxw5M4T1WZJhz0x
-5iuJUo9pXc4gEqg3hPWdFZk6g6/DZ/RBclqOxmlUzkgS32e0Z4lx7YUHa5KSrVIw
-+856WY3EmTm7/2V9wteVBdH6xPbvZLwmdpZBq+boQkntXmitIiw=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/main.test
deleted file mode 100644
index 0bcea7d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-decipheronly/main.test
+++ /dev/null
@@ -1,5 +0,0 @@
-chain: chain.pem
-last_cert_trust: TRUSTED_ANCHOR
-utc_time: 150302120000Z
-key_purpose: SERVER_AUTH
-expected_errors:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/chain.pem b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/chain.pem
deleted file mode 100644
index 1b2223d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/chain.pem
+++ /dev/null
@@ -1,271 +0,0 @@
-[Created by: generate-chains.py]
-
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only digitalSignature.
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Intermediate
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Target
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c5:7e:f2:5d:c5:ea:a1:5c:84:25:88:33:d7:cc:
-                    e3:60:35:09:1c:fa:84:c8:8c:fb:e1:17:44:1b:a2:
-                    20:bd:26:d4:e9:4c:25:f8:d0:f4:0c:85:a9:c3:97:
-                    8a:c6:b9:ec:17:0b:a1:80:75:e5:10:2c:08:63:6d:
-                    6f:4d:db:1c:c1:d2:77:e8:89:63:aa:bd:f7:02:8d:
-                    29:10:8e:f3:bd:4b:3a:f7:35:1c:ac:40:6a:bd:31:
-                    a8:69:c0:2b:49:11:0a:3e:9b:e8:f9:c6:c1:6b:74:
-                    9f:f4:18:3a:d5:66:bd:83:dd:da:dd:d6:f8:6c:53:
-                    73:7a:6d:9f:17:e5:12:54:6d:3e:86:8d:18:05:91:
-                    97:a6:3b:a8:d2:7b:45:32:7e:1f:ae:44:67:54:38:
-                    ed:6d:c2:52:d3:2f:9f:b6:3d:de:f7:68:21:58:92:
-                    d4:2a:52:75:68:6f:42:6d:e7:97:76:bc:e7:13:eb:
-                    7b:4b:74:86:91:22:27:29:4b:bd:30:0b:f4:f7:ce:
-                    16:3a:52:5f:bd:5c:75:af:5a:71:fc:d8:bd:77:c2:
-                    6e:13:af:3b:35:18:ed:c6:d7:90:40:88:05:9e:ca:
-                    09:f9:0a:54:07:b3:16:ea:6a:50:38:9a:52:02:35:
-                    90:cb:cf:83:da:53:89:ad:d4:13:21:dc:28:03:df:
-                    b7:17
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                AF:70:95:38:BB:6C:27:E5:BA:D2:69:0E:52:43:3B:A9:DE:7D:2C:DE
-            X509v3 Authority Key Identifier: 
-                keyid:BB:73:63:B7:37:30:F3:34:DD:91:77:CF:4C:DE:03:3B:C9:64:BD:85
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Intermediate.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Intermediate.crl
-
-            X509v3 Key Usage: critical
-                Digital Signature
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-    Signature Algorithm: sha256WithRSAEncryption
-         c3:63:39:12:88:4d:d4:e2:d4:9e:f4:ce:20:0b:66:6a:41:7e:
-         71:b3:2b:13:4a:af:7a:64:05:66:23:27:bb:91:63:b5:fe:7e:
-         1a:3e:f7:9b:4d:4e:45:ca:b6:3b:4a:5c:81:17:04:85:7d:f4:
-         d5:a4:fc:93:08:a5:c9:12:d6:e7:62:67:87:39:d6:75:cf:b0:
-         f3:79:23:8d:0f:a9:27:de:16:b6:1d:a3:be:1b:ff:67:c9:f4:
-         5a:33:a3:a4:75:79:2c:7c:a3:36:22:33:da:fb:a4:62:48:04:
-         07:77:ac:1c:cb:02:15:48:c4:82:8b:55:b3:2e:21:40:80:0b:
-         a5:9d:1b:62:6d:57:5f:f6:49:d9:6e:a7:9f:e7:af:40:e4:0b:
-         a8:3d:14:08:db:e7:a1:c6:62:69:4f:48:26:ab:02:5e:0f:90:
-         4f:1c:ad:d1:b3:d4:a4:a5:fd:6a:56:5b:a3:4b:9e:e4:b0:8f:
-         f3:10:23:20:df:7e:77:53:9a:c4:c8:f4:ab:99:7c:c5:85:f0:
-         d4:7f:7a:72:cd:7d:42:ff:07:d2:23:89:e2:e6:0e:24:3e:7b:
-         f1:c8:dd:ce:ba:ad:65:23:63:0a:47:03:99:ca:5b:67:8d:15:
-         f6:f2:f1:68:fb:66:94:2e:4d:4e:7e:b6:7d:9d:b8:d9:ef:3c:
-         08:55:d7:16
------BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
-cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFfvJd
-xeqhXIQliDPXzONgNQkc+oTIjPvhF0QboiC9JtTpTCX40PQMhanDl4rGuewXC6GA
-deUQLAhjbW9N2xzB0nfoiWOqvfcCjSkQjvO9Szr3NRysQGq9MahpwCtJEQo+m+j5
-xsFrdJ/0GDrVZr2D3drd1vhsU3N6bZ8X5RJUbT6GjRgFkZemO6jSe0Uyfh+uRGdU
-OO1twlLTL5+2Pd73aCFYktQqUnVob0Jt55d2vOcT63tLdIaRIicpS70wC/T3zhY6
-Ul+9XHWvWnH82L13wm4Trzs1GO3G15BAiAWeygn5ClQHsxbqalA4mlICNZDLz4Pa
-U4mt1BMh3CgD37cXAgMBAAGjgd8wgdwwHQYDVR0OBBYEFK9wlTi7bCflutJpDlJD
-O6nefSzeMB8GA1UdIwQYMBaAFLtzY7c3MPM03ZF3z0zeAzvJZL2FMD8GCCsGAQUF
-BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
-aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQDDYzkSiE3U4tSe9M4gC2ZqQX5xsysTSq96
-ZAVmIye7kWO1/n4aPvebTU5FyrY7SlyBFwSFffTVpPyTCKXJEtbnYmeHOdZ1z7Dz
-eSOND6kn3ha2HaO+G/9nyfRaM6OkdXksfKM2IjPa+6RiSAQHd6wcywIVSMSCi1Wz
-LiFAgAulnRtibVdf9knZbqef569A5AuoPRQI2+ehxmJpT0gmqwJeD5BPHK3Rs9Sk
-pf1qVlujS57ksI/zECMg3353U5rEyPSrmXzFhfDUf3pyzX1C/wfSI4ni5g4kPnvx
-yN3Ouq1lI2MKRwOZyltnjRX28vFo+2aULk1OfrZ9nbjZ7zwIVdcW
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Intermediate
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:e4:08:b7:00:bd:dc:6b:5c:7a:fd:fd:54:76:c0:
-                    b3:d7:c0:ac:43:78:4f:e7:d7:29:04:6e:f2:c1:9a:
-                    5c:70:86:c9:e4:fb:50:1b:e8:2e:42:71:fb:22:d4:
-                    d8:7d:95:9d:a6:59:a1:e7:db:2e:cc:c7:75:db:c8:
-                    31:4f:18:fa:a3:b8:bf:d7:0b:08:2d:87:d1:f0:c1:
-                    4f:2e:2f:4e:48:39:30:cf:62:d0:1d:bf:55:e5:dd:
-                    4e:63:85:b6:29:ac:91:ec:13:1c:a2:36:e4:2d:f3:
-                    5b:ec:95:e1:a8:00:86:c5:96:7c:74:a6:18:69:2e:
-                    c2:5b:95:1d:81:46:d4:81:10:24:d9:c9:da:9c:a2:
-                    d0:5c:2d:4f:83:e5:a1:c0:a2:c4:a5:7f:de:78:9c:
-                    57:af:12:5c:1d:65:62:01:bf:71:49:52:06:3a:bb:
-                    f8:aa:5b:12:80:15:0a:14:7d:46:3e:79:1a:b0:4e:
-                    6f:59:bc:2f:57:f7:dd:4c:50:82:4c:7d:f9:38:3d:
-                    c4:29:63:0a:a9:df:70:3d:02:da:0c:56:9b:76:9d:
-                    73:dd:86:11:b8:d7:59:86:e2:16:b3:93:8c:43:33:
-                    41:b1:6b:38:f3:67:54:00:e3:c1:06:7f:1f:c2:fd:
-                    f4:76:42:63:4c:bc:cb:28:b0:cf:b5:cd:9f:bf:ff:
-                    ea:db
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                BB:73:63:B7:37:30:F3:34:DD:91:77:CF:4C:DE:03:3B:C9:64:BD:85
-            X509v3 Authority Key Identifier: 
-                keyid:8F:51:99:A2:01:B7:93:0B:E1:7D:90:CE:20:20:90:C8:B3:73:2E:EB
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         17:40:15:83:75:85:ab:70:bd:8d:e0:ce:52:cd:9e:d5:ea:f1:
-         b9:1c:e9:8d:9a:58:28:1d:a0:09:14:00:bc:c3:45:96:92:91:
-         32:99:6f:da:59:a8:b3:5b:97:f3:ec:a0:ad:8c:7d:45:9a:7e:
-         8b:be:90:c9:63:95:f3:97:22:cf:b1:c8:e0:93:95:a2:df:52:
-         e3:02:7d:d0:5f:22:0a:85:9c:ee:1f:a6:bf:f9:f4:ef:f1:6e:
-         61:27:f5:7a:1e:e4:97:a2:27:8e:6c:d4:bc:bd:d8:70:cf:a5:
-         5f:07:e1:ab:42:ac:98:09:bf:31:f0:12:5f:54:38:84:18:bd:
-         9b:0b:57:ee:bf:be:64:ab:ce:29:da:55:d4:ce:8f:8c:5f:87:
-         49:17:21:a8:af:03:cf:b6:e7:9a:df:bf:ee:53:24:f6:f7:b2:
-         9c:22:cc:a2:c9:4a:ad:a3:c9:cd:6a:f2:97:ac:17:a6:e6:f5:
-         f3:d6:ad:8e:2e:7c:39:61:d3:d0:a4:79:08:b5:e8:1c:3a:39:
-         4a:a2:3b:69:46:64:14:57:de:58:b0:f2:4c:c2:90:e8:e4:3b:
-         56:5b:6e:62:67:22:d2:d0:4c:5b:7c:3f:c9:c0:d3:e9:cf:99:
-         a1:51:f5:16:9d:ec:1a:ff:c0:6f:83:8b:7b:a9:68:c0:b7:5f:
-         c9:5c:8c:58
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowFzEVMBMGA1UEAwwMSW50
-ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5Ai3AL3c
-a1x6/f1UdsCz18CsQ3hP59cpBG7ywZpccIbJ5PtQG+guQnH7ItTYfZWdplmh59su
-zMd128gxTxj6o7i/1wsILYfR8MFPLi9OSDkwz2LQHb9V5d1OY4W2KayR7BMcojbk
-LfNb7JXhqACGxZZ8dKYYaS7CW5UdgUbUgRAk2cnanKLQXC1Pg+WhwKLEpX/eeJxX
-rxJcHWViAb9xSVIGOrv4qlsSgBUKFH1GPnkasE5vWbwvV/fdTFCCTH35OD3EKWMK
-qd9wPQLaDFabdp1z3YYRuNdZhuIWs5OMQzNBsWs482dUAOPBBn8fwv30dkJjTLzL
-KLDPtc2fv//q2wIDAQABo4HLMIHIMB0GA1UdDgQWBBS7c2O3NzDzNN2Rd89M3gM7
-yWS9hTAfBgNVHSMEGDAWgBSPUZmiAbeTC+F9kM4gIJDIs3Mu6zA3BggrBgEFBQcB
-AQQrMCkwJwYIKwYBBQUHMAKGG2h0dHA6Ly91cmwtZm9yLWFpYS9Sb290LmNlcjAs
-BgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vdXJsLWZvci1jcmwvUm9vdC5jcmwwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-ABdAFYN1hatwvY3gzlLNntXq8bkc6Y2aWCgdoAkUALzDRZaSkTKZb9pZqLNbl/Ps
-oK2MfUWafou+kMljlfOXIs+xyOCTlaLfUuMCfdBfIgqFnO4fpr/59O/xbmEn9Xoe
-5JeiJ45s1Ly92HDPpV8H4atCrJgJvzHwEl9UOIQYvZsLV+6/vmSrzinaVdTOj4xf
-h0kXIaivA8+255rfv+5TJPb3spwizKLJSq2jyc1q8pesF6bm9fPWrY4ufDlh09Ck
-eQi16Bw6OUqiO2lGZBRX3liw8kzCkOjkO1ZbbmJnItLQTFt8P8nA0+nPmaFR9Rad
-7Br/wG+Di3upaMC3X8lcjFg=
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c7:66:8c:31:87:5f:d9:77:88:56:9d:5d:f5:0e:
-                    62:3e:1a:99:ff:2d:5a:89:16:a7:0b:da:ba:c7:5a:
-                    2f:fa:84:48:fd:e1:f4:e0:f0:ac:f0:66:f9:9f:ce:
-                    c9:54:61:27:48:f6:84:6f:35:31:54:23:3f:b9:c7:
-                    97:28:7d:30:6e:6d:fd:a0:c2:b9:9b:c0:1f:fb:fa:
-                    51:5a:89:f7:33:85:bc:58:58:d5:3d:6d:54:c2:3a:
-                    c4:3c:d0:58:ed:43:aa:76:95:68:62:da:75:e2:fd:
-                    dc:11:8d:dc:70:92:c5:3e:15:e3:68:1a:79:17:20:
-                    81:de:12:75:cb:c8:81:36:f6:a6:2b:8b:35:95:7a:
-                    49:99:d1:3e:47:04:7e:74:d6:31:4b:a3:a2:09:0c:
-                    95:18:18:05:2e:e4:6f:5a:1c:aa:1d:29:fe:9d:a9:
-                    26:da:b6:e4:dc:11:93:a0:4c:af:4a:cc:1a:bc:99:
-                    2b:3a:52:1f:7c:4c:7a:87:1c:57:95:81:e4:b3:de:
-                    92:98:e9:c1:22:7a:87:36:b7:a2:97:63:f2:cf:57:
-                    8b:e0:6b:5b:e4:11:90:c7:5b:15:fe:72:2c:34:c9:
-                    7e:db:1e:f1:bb:b6:5c:6d:2c:ab:36:4d:22:5e:f0:
-                    1a:3b:6a:7a:d1:58:f4:84:51:19:b5:39:91:ca:b9:
-                    0a:13
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                8F:51:99:A2:01:B7:93:0B:E1:7D:90:CE:20:20:90:C8:B3:73:2E:EB
-            X509v3 Authority Key Identifier: 
-                keyid:8F:51:99:A2:01:B7:93:0B:E1:7D:90:CE:20:20:90:C8:B3:73:2E:EB
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         5d:07:b5:ec:0b:f3:78:ba:bb:f4:27:c2:5b:93:59:f0:0c:52:
-         cb:fd:36:de:9b:0e:c7:cb:57:46:86:bf:fb:e1:a5:31:20:43:
-         17:61:40:37:d1:e7:6f:f0:86:85:23:a2:96:28:a5:e2:bc:53:
-         7f:e4:a2:4d:8c:9c:a6:f5:dd:18:1f:e4:a6:66:33:dd:2f:da:
-         d7:a3:ad:c7:24:a5:e9:ce:68:a3:f1:f5:46:4b:36:40:d0:a3:
-         32:c1:14:17:10:ec:27:4d:d2:48:c3:1d:6b:45:92:bb:c9:d6:
-         cd:25:26:3b:dc:4a:d4:80:89:7b:44:f5:2a:c0:a1:3a:8d:e8:
-         60:64:34:45:a7:cb:ef:86:41:90:7d:fb:7d:1f:87:30:b9:49:
-         89:21:35:b1:ee:f2:fc:8d:12:08:06:4a:af:07:fb:25:60:83:
-         17:ae:27:6e:31:39:ff:de:d9:a9:f5:04:bc:a6:c3:6e:a4:6a:
-         07:d6:82:e7:26:fb:9b:6f:88:fa:c7:61:63:cc:15:d2:b4:2c:
-         af:aa:49:d9:40:a6:ab:c2:3c:7b:e1:07:5c:50:e5:69:59:c7:
-         e5:8b:ca:70:72:12:f5:5d:6b:b6:05:7c:e2:1b:87:0e:25:4e:
-         dd:63:91:a6:ca:b3:70:69:97:ce:9a:7c:c8:15:b0:23:b5:1a:
-         59:43:cd:3f
------BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowDzENMAsGA1UEAwwEUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMdmjDGHX9l3iFadXfUO
-Yj4amf8tWokWpwvausdaL/qESP3h9ODwrPBm+Z/OyVRhJ0j2hG81MVQjP7nHlyh9
-MG5t/aDCuZvAH/v6UVqJ9zOFvFhY1T1tVMI6xDzQWO1DqnaVaGLadeL93BGN3HCS
-xT4V42gaeRcggd4SdcvIgTb2piuLNZV6SZnRPkcEfnTWMUujogkMlRgYBS7kb1oc
-qh0p/p2pJtq25NwRk6BMr0rMGryZKzpSH3xMeoccV5WB5LPekpjpwSJ6hza3opdj
-8s9Xi+BrW+QRkMdbFf5yLDTJftse8bu2XG0sqzZNIl7wGjtqetFY9IRRGbU5kcq5
-ChMCAwEAAaOByzCByDAdBgNVHQ4EFgQUj1GZogG3kwvhfZDOICCQyLNzLuswHwYD
-VR0jBBgwFoAUj1GZogG3kwvhfZDOICCQyLNzLuswNwYIKwYBBQUHAQEEKzApMCcG
-CCsGAQUFBzAChhtodHRwOi8vdXJsLWZvci1haWEvUm9vdC5jZXIwLAYDVR0fBCUw
-IzAhoB+gHYYbaHR0cDovL3VybC1mb3ItY3JsL1Jvb3QuY3JsMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBdB7XsC/N4
-urv0J8Jbk1nwDFLL/Tbemw7Hy1dGhr/74aUxIEMXYUA30edv8IaFI6KWKKXivFN/
-5KJNjJym9d0YH+SmZjPdL9rXo63HJKXpzmij8fVGSzZA0KMywRQXEOwnTdJIwx1r
-RZK7ydbNJSY73ErUgIl7RPUqwKE6jehgZDRFp8vvhkGQfft9H4cwuUmJITWx7vL8
-jRIIBkqvB/slYIMXriduMTn/3tmp9QS8psNupGoH1oLnJvubb4j6x2FjzBXStCyv
-qknZQKarwjx74QdcUOVpWcfli8pwchL1XWu2BXziG4cOJU7dY5GmyrNwaZfOmnzI
-FbAjtRpZQ80/
------END CERTIFICATE-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/generate-chains.py
deleted file mode 100755
index 7a45e97c..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only digitalSignature."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_rsa_key(
-    2048, common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,digitalSignature')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Intermediate.key
deleted file mode 100644
index dc490dd4..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Intermediate.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA5Ai3AL3ca1x6/f1UdsCz18CsQ3hP59cpBG7ywZpccIbJ5PtQ
-G+guQnH7ItTYfZWdplmh59suzMd128gxTxj6o7i/1wsILYfR8MFPLi9OSDkwz2LQ
-Hb9V5d1OY4W2KayR7BMcojbkLfNb7JXhqACGxZZ8dKYYaS7CW5UdgUbUgRAk2cna
-nKLQXC1Pg+WhwKLEpX/eeJxXrxJcHWViAb9xSVIGOrv4qlsSgBUKFH1GPnkasE5v
-WbwvV/fdTFCCTH35OD3EKWMKqd9wPQLaDFabdp1z3YYRuNdZhuIWs5OMQzNBsWs4
-82dUAOPBBn8fwv30dkJjTLzLKLDPtc2fv//q2wIDAQABAoIBAFvh4xNKbVFZPzmu
-ZOVAunZ57S92gAPz31Qo/GnkL9ErjphUZzAHevRNBxs+1kisC4zm2uUYnR/oUuYP
-IUc00nE71RjqGg52hrJSwfvjFdDmMnOt5hvGZ+8qIBbb3s2l+lo8TTJTmdemEmke
-74EJTUS6YUWDU5y2OZw7Vlsr1h52Rw+HVEMS21KpvOyTVG2V77hG2Z7Idpm1e1hv
-JZo8Fr5/cOJ9B8Y604MDX4exEtbzV14Tct3lEc/9vAbTyzcU9/bBlJRGDheThmxC
-ehtKL0KZsDzi1RM/88t+4wY4hIHCL93FoLdP0lNgFLlksmlidGwOGlMIhkw0cFH1
-8J9al8kCgYEA91JYk5YoQ/b24Cad4Stil1XhjyJNh6O/S5NNYGzCECcTHZeI44nK
-LLw3MSwbE9b9pQBCF+1P5NDGkrPGdyW3oJ2vwdLBipNTBEZzeapmpud/P91a2vZS
-p24rufdvLpp80O7n/7pveTmJTKH+pGWW5FCsR+ra+IhfZlBFb7/waR8CgYEA7Akc
-ainhqfVPQbXdgGqmZEuq0RI2rfn4f76kcFsvX6ePsrpF5ZVWw0EtcVeDqp/OEoKL
-YxyUn2bnpw47IXgb6I776Uob91UwEC27Wz8uGcwdmohiVi23/34Fm+IZng5mcif9
-IDiknzvbT8gs9PODD/emMiwtNoAlFXVorNASOsUCgYEA87uZQ0k1wVT/EwO7j448
-CTw/n9mEYmoDOa2fEancziJT+lO+Oc8vCUsrcTAwNysmqJdKi1354FvHdgfpTL5E
-6uq7rN3QkoqBw7LSVlKR+2Ykx4GT6jnaVtqCCTFJxrnEy/rFdAX9mZAUOQtkcgsT
-20mNnwpaZZevvJra8zhK6q0CgYB7NLJJVD0/+xV45laNrp3WIo0yfsBeBepJvBiX
-sXFEC/H9SDAuC8rzNrViwVywFqR5kvzxKj0GC7AFym7hJJHkzaX++zkn3Kau+0Ad
-/BezTZFyVZiHBWxTB9Qjr1zR3RBqrCb7x7VejN8IgSO+ZNHX5twwulCLb05sKhIO
-irnJRQKBgHz16Kn27vUZwPqtjmQH0QDuAGEPdhKpDZF9fc0xn2ZgoMe9stUcpv2Q
-7Z69xtK6zzyILycIkU1pUbzlB5N+a6Vk8/5K791qFWh824bWmsPqSmn52oAffzz+
-VBJZrtcdCUf7stJowa3k+jPBbdK5KFEfq82Rg1JL+JPnX4ABV8Ew
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Root.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Root.key
deleted file mode 100644
index 3088218..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Root.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAx2aMMYdf2XeIVp1d9Q5iPhqZ/y1aiRanC9q6x1ov+oRI/eH0
-4PCs8Gb5n87JVGEnSPaEbzUxVCM/uceXKH0wbm39oMK5m8Af+/pRWon3M4W8WFjV
-PW1UwjrEPNBY7UOqdpVoYtp14v3cEY3ccJLFPhXjaBp5FyCB3hJ1y8iBNvamK4s1
-lXpJmdE+RwR+dNYxS6OiCQyVGBgFLuRvWhyqHSn+nakm2rbk3BGToEyvSswavJkr
-OlIffEx6hxxXlYHks96SmOnBInqHNreil2Pyz1eL4Gtb5BGQx1sV/nIsNMl+2x7x
-u7ZcbSyrNk0iXvAaO2p60Vj0hFEZtTmRyrkKEwIDAQABAoIBABBjIx5m67+pjTDh
-GfmrxvMnqIRKK+icTfoxbaw4gzzpZj5HNaLO5MeVDurNScp/eYULjXK+QmGRzAju
-mEOhljtdGrz9g9eDAJ3qwojYUdKQKRxxoIS92Xtk7P+6d7R4HShFuyB0p7+R8WYX
-7Ifr5/3kOp4xnsYBy+p+ReQLhGMJ2PG3Pm/h3bDYKM6Na8tu2udDiIlSFyLkWavt
-bEbtVV1c4ygmY7q6LYMAjnW6fi0rArYS34MVElfblTUsfjlmH0XwKUNobTfzmjXk
-LrJA24e0HKgu0+1ga5eJ0N+Re9xsLVXscAZ9/Q0BfClRlKiqXL3yg6cS0BP6x40D
-0kj7tDECgYEA9vA4tvXuq8R4lKP+frVHu6Zka94nj21HXnjFvDe6NGyhl9qCOzXJ
-dbcJsCAxYwdWJD0uV2IyG7d4VVCJlckpOEocO4bFQhZ+xiZQyesBaZ9COSMppaR7
-BO7A/06wJxvRj0nO+S4VMBgdn+ldRogMVTMSg6r+2qzawuHAAyivCfUCgYEAzre/
-niFKI72u5ljdZC/7q0Ega9YqTNJKNTHux3X2RCErHyHCcksBAWNK7rQ//v6s0ahQ
-OuSM4x5hQr3DvgA7vi/MdF7G1MYrX0UkXuER7ylyLlEZ+JdofZbAqfc6HAMB7cG1
-mAWYo66UvWg7VqWZdbydeWdBteUD6F/pAJK8FucCgYA0/QE+iXFonGU/iB1BNUcq
-Rh9AYlBc35cz93h+1fp362OVgUb2y6jqQJesmovecyGR7yr1h1W3StxgekK7yIm2
-0XhTcaz8bHVRscEeQvZvosQEHL6AE9ZuDYmOf2UfT0HdnHn0UGYths88lEf2rZTv
-52Curk+3vuXGccjRJLbCzQKBgF54zWK4NgjVhFwTWsKRx0OB1Q5TZyuKo41iD40q
-lOyX9/wXUqUnMANxXGpxCBpCS7rZYCk6EEUvuiVlUlLACo2ljJvWQKo3EtVMZQ3T
-cH3LhDo0qFja4U8cGVrT+MOagEQnVhVu4U5U1/cj7pJvxg1vsMwt63L0ge+t/W9c
-oAcbAoGAfbTJ0PmQcfN1K26tqMJKMw0mV9tuWLsWdaZS+1rXv+uyakoBLD3MoOGO
-/wPOmXzt3yY+VZGT6DNVuJ/3iyqiAUllhonsyMXnVX1/BStazMuCHLJltEi3UQho
-3WsET7FTskq+ZD3oOZITxn9aCQ9j1u023Zhq2I/0vxL8kXSXRE8=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Target.key
deleted file mode 100644
index 1c6ea2b9..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/keys/Target.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAxX7yXcXqoVyEJYgz18zjYDUJHPqEyIz74RdEG6IgvSbU6Uwl
-+ND0DIWpw5eKxrnsFwuhgHXlECwIY21vTdscwdJ36Iljqr33Ao0pEI7zvUs69zUc
-rEBqvTGoacArSREKPpvo+cbBa3Sf9Bg61Wa9g93a3db4bFNzem2fF+USVG0+ho0Y
-BZGXpjuo0ntFMn4frkRnVDjtbcJS0y+ftj3e92ghWJLUKlJ1aG9CbeeXdrznE+t7
-S3SGkSInKUu9MAv0984WOlJfvVx1r1px/Ni9d8JuE687NRjtxteQQIgFnsoJ+QpU
-B7MW6mpQOJpSAjWQy8+D2lOJrdQTIdwoA9+3FwIDAQABAoIBADB79tIwmWZdyQ9R
-vbB320YuHvufQOPfQKLEzHKgPbtSAij4CcZovdEpK0EaPfaFhEEwGMjpqH9s3+5Q
-2mdZqFio68kJmY88LZzRvMgU4B+TjXlM76oV8l5aB4dWpwm8BjDSo8JWGfvgWLhb
-Dm5/V309BNM7SCeH4SyoJst98B8LeEdlzh4edbTO2OHfRak//VAwrlXFRza19FKV
-uJwucaugf/M1Wc/XMYocRMFZLrmKvmQgmvvwK/DxfMCnoc//SPd2Y7NZb3S0kq3B
-JKXjZBvbUtHG8HXvry1Jb4bKBO+2r8N2qmzXKH9fvEOzckyIaTXLn3xUYhFgFqou
-OlCdqHECgYEA5QE5iUf7T5N7Y3Cci/FgHF7iKo6BpPXAkMfNY4Q0IqXs4EZzh/0l
-M5cr619Ixv1GB/zIvvGY3xqJuF6vfz88+um0dxPGHLqJ2joHcfmc8LYPayJrz34H
-BQSWLd1AKnEkwtVAYdIiNI71nN42VIWt1vi7a9+Sf1OqMRK6fhnQhZ8CgYEA3Mbd
-T6MFhYToPuEEK7qvxOcBIxmTXv/nfNImPubnMbI8jcC/ADpV45Wxh39vEBO8FmaZ
-BR8cPaZnFIX2RxRquBL6r+jXSZyvtQ3/cUEUuKP8UiXzPS0NJl5acqlk2ezwiBqi
-BqW/pIhauQ7xYTQ/tuzju/K8nFgPkJaGKzKZq4kCgYEAg0CSc4ZYGaHT5IiUkPjF
-Nz2CrxWCZMOdnN2HcHRDVWB4RYrbiKOkgM8yEvNHyRU84DMX86iRD74sFQnf2DSs
-hLsR/fXNZIXdoMAFqGOCecw/Rg4ycHgxGcUpNhxLPIggo7KJ9gb0J9+QElqiFQuR
-OVbSRN+dHXEcaIftb3zoMM0CgYBI1CUfZySkJfLDA1Fv53aiGp4KaR5vQTWovF43
-c84iW6yUClg3iAbbO39Dtmr5v7jVHuUthlS3lZP9di+GxRprPH+L1eBm/RQNQt/Y
-CWL/gcDzjGdP7/Odi5SErJKDPSEflMGMNdMhQIXE9EP2D9lQy5ZYYruLS5Ve2fjK
-eTeuGQKBgQDiyF9sbduDBANqJ3wGUwvngvmFBrf8R4YjrKgZOXwcluYsZ3f0kglx
-zLpRKwf5WoYokpXYvZsyf7nPimItxlbMWrjIk2q8aaCn/lQZsh7zc8cJcxxnXlMT
-QUG0mdp/ubIZsycc6yaMIV9HhNgUlogfZ8d0iyfqM1+YdhJ5VgKxPQ==
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/main.test b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/main.test
deleted file mode 100644
index 0bcea7d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-digitalsignature/main.test
+++ /dev/null
@@ -1,5 +0,0 @@
-chain: chain.pem
-last_cert_trust: TRUSTED_ANCHOR
-utc_time: 150302120000Z
-key_purpose: SERVER_AUTH
-expected_errors:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/generate-chains.py
deleted file mode 100755
index d7a0a77..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_rsa_key(
-    2048, common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,keyAgreement')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/keys/Target.key
deleted file mode 100644
index fe05fdc3..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/keys/Target.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAwnFhd6PT8ihKNCWQHPehGz9p2f/Owkq94WGhJV9HnmEOkRTG
-sSZBjCpfbowtp4mJVZVYRGxPh217ZHfeH+tRrUjPFkSTiRvXbFR2cYYoEbm8xTly
-nx5seN5DCtKRtGWimeGX+e/qtnGQyf3tFJpV7RcwQ+5FscUDQnRuM9lo8Sj/fHhv
-hHM5ox5T4ErvkrJTMIMf7AiBYGtE6n7BycyfcX21R21QBVYoljnXgkY0ralgBePg
-TNm6pnCyzbr0egnB8b/QO/JG6TkwwtIJNEjZGyK4usY4KYmaAeqaok5x62I844/F
-4TY00LSURC7Fa/2ObR27ppp4omA2xywVZGxHKQIDAQABAoIBAQCw+4p/33qXO9zu
-whH+i9b0ei/a4WBMsMNMVhTbc3I40pbzrzl7HRskfZ0Hfkg/6ow6fgktnnh1CE38
-EK751rMtSsxTtG+lqNXYILj+c+Ic4DbWPYf7FTIegg/71dYRoUDzV8eBE8NL9OqZ
-MKuOyTvU5fpkmoiNWomw/1EfmJBQkCquS3bOZj1xd0Aum5uZLRzK5rFyF1MB6v9z
-r1++cs3KnlTfcOvyqdVEaUWDy0NC7Sd5VkGU5QyOUSpc8vyZ4t+qHJ+C+4A0sHoz
-flIXxhY2sdCvGk+nZQueC5YxQz1TBHcL7qQJ2OCQMY/wFD2gXIulvARwKeFsGP6a
-bhi2a31BAoGBAP+rhXp8i8U4rZPmvgMDoWJdm8+7+FOcPdGvE5Eymut2Ou12icBQ
-/Pqwyn6J6Nj8sNcePwdyUVD/lv8WIN9/jJlPfbyBUi+UMcKPJimPZJrt1S2Jg6LO
-5LXbzAKTzj40xe9AQs24od/VlZCXWeC5WRcrSvv8hAz3hXOQH18vMHvFAoGBAMKx
-oO6jFRVQ7a28fbj0LBbY0//uqBP6MOltYKKRCac4izUAtNIAk3EXpwbKdXavM3Bh
-e3+O/XrseCBRoPEY6OMoaTWH8A4PwqZwRBRr2PBgUiE4qb2aAG0Agv+MVxyzbVhD
-GAdiA4HdtM5rHlcgFcNPl4zaAXiRYvtv2YaWK6AVAoGARRDotfX/K//rpBCpM9c/
-OXtgI/X7V1rVuFc7SfYJs6H0uUFUZQd7z50ClrxakoNwoiwhirlvDhp9h9tKdhXW
-vXOj29BzizbVWmGhRYje/JtTA0IqtUh+sEH4EporFNLcxYzufvRphjYEeVLpjLOF
-RaUEVJ4abgZPnrBISUZOKqECgYEAp+UOZzxzvgIgNSbLNGg8bSdnCtoAT9n9vA76
-urZgoLf+NCL7y+17OJexDgYh7cuAjHVETug8Z3jsztIV/FQC4YHD2Mn1leq5bVZ7
-HzExz3kA2m1G056up1E9pqqbpMCGlwqk+hjn9WH/vdJaQ8ADhH5qrqiBhDu8JCB8
-cbemv1ECgYEAkb6HZzfP29qYiXqda2H4Sz1zdXKJcnKu07+m6doWRiXJzzdq0QBX
-gUufTBaAG3tm8Kl2vWbNe2cYzAItosnaj/a46lBSK98MHrQqE3IKifijC1OKqHdt
-5HjVxISxLvL/ye0zUT1ZbqeSUVybKezZIhTgrEoZLhb5gjPUDMDvgLk=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/main.test b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/main.test
deleted file mode 100644
index 0bcea7d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/main.test
+++ /dev/null
@@ -1,5 +0,0 @@
-chain: chain.pem
-last_cert_trust: TRUSTED_ANCHOR
-utc_time: 150302120000Z
-key_purpose: SERVER_AUTH
-expected_errors:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/chain.pem b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/chain.pem
deleted file mode 100644
index c2dc57a..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/chain.pem
+++ /dev/null
@@ -1,271 +0,0 @@
-[Created by: generate-chains.py]
-
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyEncipherment.
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Intermediate
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Target
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:be:70:8e:8b:b3:94:90:81:27:a9:43:8b:04:f8:
-                    e8:ab:93:a6:49:b7:a3:ee:b8:7f:3f:0c:74:c5:88:
-                    08:51:62:de:3e:d9:2b:37:e8:8b:e4:6c:a5:1a:90:
-                    be:9a:55:fc:9f:d8:e7:d5:9a:97:58:f1:e6:a3:47:
-                    99:f7:f8:73:eb:58:dd:be:0f:52:b9:39:a7:3f:35:
-                    27:ba:be:93:b0:d1:ff:51:88:04:f4:96:a2:e1:9a:
-                    19:e0:ef:e0:22:86:0e:be:cb:74:4d:be:aa:37:43:
-                    e0:40:47:bf:3b:f2:4d:b7:25:ff:e1:56:be:5a:65:
-                    51:27:e2:19:a6:7c:cd:8f:d6:ae:9c:a2:f3:b0:89:
-                    fa:36:ae:ac:52:17:2c:98:e4:e2:4a:75:3e:86:53:
-                    ee:39:fb:ba:2b:7f:94:17:26:44:aa:17:44:0f:30:
-                    5a:d1:02:c0:ce:72:cf:9a:21:3a:65:06:f9:e1:63:
-                    45:b0:a8:60:84:33:70:63:a6:96:fe:2c:a6:38:80:
-                    d3:c8:6c:99:f6:ea:17:cb:a1:fe:dc:ef:ee:aa:15:
-                    d2:ed:9f:87:93:39:60:ae:f1:aa:bb:82:fe:61:c9:
-                    4f:46:98:2a:68:fe:76:d8:b8:c9:c3:79:5e:3c:95:
-                    c4:3e:46:ae:e8:16:7b:4e:f1:16:94:27:f3:62:d2:
-                    20:5d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                2F:AD:49:2C:16:DB:32:20:57:BA:06:6C:CE:D6:34:86:BB:04:80:8A
-            X509v3 Authority Key Identifier: 
-                keyid:0E:E3:46:47:04:CC:5D:6F:59:87:24:CF:23:57:BC:9E:91:DE:15:B0
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Intermediate.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Intermediate.crl
-
-            X509v3 Key Usage: critical
-                Key Encipherment
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-    Signature Algorithm: sha256WithRSAEncryption
-         63:3b:32:00:83:47:82:36:ba:79:68:ee:12:c3:0a:28:1b:69:
-         d9:4c:c0:28:4b:f9:ec:2f:33:fd:f9:6a:88:cc:e7:82:92:6a:
-         b1:b7:d3:f4:7a:80:8d:e8:52:8c:b1:1a:0a:96:01:44:51:11:
-         db:58:05:b0:f3:02:5b:5f:77:e8:71:26:06:8a:b5:24:c8:ee:
-         e2:87:f3:b6:ab:51:be:33:e9:8d:a4:46:91:99:ca:ae:03:f5:
-         bc:50:2b:ca:78:7b:97:be:d5:93:cf:02:ff:d3:f5:59:8a:f4:
-         c9:a1:f8:d4:65:4c:40:cd:94:5e:f9:7f:d9:32:ff:bd:75:77:
-         21:c9:47:d4:d6:d3:7c:f2:68:a4:10:27:9a:c0:f6:ce:ea:2a:
-         d7:7c:54:b6:9a:13:27:7b:d1:b8:73:b1:00:4e:59:ca:8b:9b:
-         0a:08:fe:ed:93:b0:5e:86:c0:52:70:f3:bb:03:4c:e8:08:f2:
-         05:e3:d8:e9:18:06:0b:a6:de:c2:0b:b0:81:e8:0c:82:1a:06:
-         4f:77:0d:d6:67:fb:74:b6:97:1c:4c:66:c8:0b:88:70:0c:c1:
-         9b:29:77:60:b8:f7:35:27:92:a5:31:77:9b:74:d4:a8:f1:8d:
-         5f:90:f7:aa:12:5b:71:16:60:73:4c:a9:27:8d:5a:08:6e:87:
-         40:7e:ba:d3
------BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
-cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+cI6L
-s5SQgSepQ4sE+Oirk6ZJt6PuuH8/DHTFiAhRYt4+2Ss36IvkbKUakL6aVfyf2OfV
-mpdY8eajR5n3+HPrWN2+D1K5Oac/NSe6vpOw0f9RiAT0lqLhmhng7+Aihg6+y3RN
-vqo3Q+BAR7878k23Jf/hVr5aZVEn4hmmfM2P1q6covOwifo2rqxSFyyY5OJKdT6G
-U+45+7orf5QXJkSqF0QPMFrRAsDOcs+aITplBvnhY0WwqGCEM3Bjppb+LKY4gNPI
-bJn26hfLof7c7+6qFdLtn4eTOWCu8aq7gv5hyU9GmCpo/nbYuMnDeV48lcQ+Rq7o
-FntO8RaUJ/Ni0iBdAgMBAAGjgd8wgdwwHQYDVR0OBBYEFC+tSSwW2zIgV7oGbM7W
-NIa7BICKMB8GA1UdIwQYMBaAFA7jRkcEzF1vWYckzyNXvJ6R3hWwMD8GCCsGAQUF
-BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
-aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgUgMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBjOzIAg0eCNrp5aO4SwwooG2nZTMAoS/ns
-LzP9+WqIzOeCkmqxt9P0eoCN6FKMsRoKlgFEURHbWAWw8wJbX3focSYGirUkyO7i
-h/O2q1G+M+mNpEaRmcquA/W8UCvKeHuXvtWTzwL/0/VZivTJofjUZUxAzZRe+X/Z
-Mv+9dXchyUfU1tN88mikECeawPbO6irXfFS2mhMne9G4c7EATlnKi5sKCP7tk7Be
-hsBScPO7A0zoCPIF49jpGAYLpt7CC7CB6AyCGgZPdw3WZ/t0tpccTGbIC4hwDMGb
-KXdguPc1J5KlMXebdNSo8Y1fkPeqEltxFmBzTKknjVoIbodAfrrT
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Intermediate
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:9c:9a:1b:3a:9b:94:b9:b4:cc:58:be:93:c2:b0:
-                    8f:a1:c1:29:07:5c:3a:51:ce:ab:46:8f:e6:d2:9f:
-                    79:a1:ec:4a:d6:40:59:9d:0f:e0:6e:e0:cd:88:f1:
-                    e6:ca:83:0c:6c:53:31:af:69:66:b6:80:96:d8:68:
-                    c4:45:1d:6b:94:78:48:83:56:ca:61:34:6e:88:1c:
-                    04:65:67:dc:47:bf:95:a6:6f:8e:90:87:95:b8:19:
-                    8b:66:49:cf:15:8a:74:c9:c5:9a:22:11:df:8f:1b:
-                    c1:b1:c0:e1:06:c6:4e:60:99:0f:78:cf:d8:75:a2:
-                    f8:1e:f7:b7:cd:69:3b:07:c8:28:de:dd:6d:64:59:
-                    c4:f8:b4:aa:63:bc:0e:d2:74:e7:4e:a2:73:5d:c6:
-                    b2:49:a7:38:d1:99:f4:90:4c:9f:51:cd:37:7f:d5:
-                    68:a1:35:99:17:e7:fa:62:23:de:64:36:c9:d3:de:
-                    b6:3b:69:97:2b:ca:e7:f4:0a:0f:5e:df:55:0a:00:
-                    ac:6d:27:e6:2f:f9:08:99:69:d2:34:2c:3d:9f:65:
-                    df:59:ca:df:06:a4:a9:05:f9:2e:fb:d5:15:2c:77:
-                    19:4c:06:03:09:df:2b:07:aa:da:e6:a4:ff:79:eb:
-                    0f:da:7e:29:ad:4c:dd:f7:13:f9:65:49:43:6f:89:
-                    98:fd
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                0E:E3:46:47:04:CC:5D:6F:59:87:24:CF:23:57:BC:9E:91:DE:15:B0
-            X509v3 Authority Key Identifier: 
-                keyid:54:56:C6:20:3C:8C:EE:44:C8:B4:6F:DB:71:32:B7:92:B0:69:52:05
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         65:45:bc:b2:d5:33:41:43:20:e1:fd:4a:11:e0:c8:76:8c:2f:
-         dc:77:50:85:5a:a9:c7:d8:60:a4:48:df:3b:68:71:bd:37:3d:
-         e1:af:74:6b:78:91:38:7f:cc:0b:d4:38:fc:fb:2c:5b:5b:8b:
-         fe:c9:07:d0:56:dd:f9:84:d3:b6:1d:60:fe:23:56:c6:6c:00:
-         20:8a:20:fc:df:b0:e9:23:bd:25:15:58:d8:2b:ce:ad:aa:7f:
-         f7:9a:17:74:92:82:61:6c:2e:76:ea:e6:3e:15:e8:f5:b9:f9:
-         06:22:d0:a4:cd:d7:ca:5c:bb:2b:25:62:7e:64:3b:22:e3:f6:
-         6e:ac:5d:43:a1:bc:5c:4b:53:5c:43:a6:f6:31:d9:35:cd:37:
-         7b:9c:08:46:2c:49:5c:da:2c:e2:00:73:75:e7:05:66:5e:ca:
-         70:40:28:d3:47:dc:5f:29:e4:08:e4:97:b9:b5:e9:d7:68:1c:
-         b4:33:30:da:21:69:ff:df:65:5a:7c:b2:62:36:ed:5f:d5:f7:
-         00:ef:56:59:51:d1:a8:aa:32:28:12:18:05:0a:f2:ab:cb:3f:
-         38:a0:d8:2e:d8:5a:bd:dc:4e:e5:45:a8:ce:49:ac:55:96:48:
-         f2:2b:87:b2:3d:c3:b9:bc:94:8b:d7:8a:ae:aa:7a:4f:6d:2c:
-         9f:36:c6:27
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowFzEVMBMGA1UEAwwMSW50
-ZXJtZWRpYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnJobOpuU
-ubTMWL6TwrCPocEpB1w6Uc6rRo/m0p95oexK1kBZnQ/gbuDNiPHmyoMMbFMxr2lm
-toCW2GjERR1rlHhIg1bKYTRuiBwEZWfcR7+Vpm+OkIeVuBmLZknPFYp0ycWaIhHf
-jxvBscDhBsZOYJkPeM/YdaL4Hve3zWk7B8go3t1tZFnE+LSqY7wO0nTnTqJzXcay
-Sac40Zn0kEyfUc03f9VooTWZF+f6YiPeZDbJ0962O2mXK8rn9AoPXt9VCgCsbSfm
-L/kImWnSNCw9n2XfWcrfBqSpBfku+9UVLHcZTAYDCd8rB6ra5qT/eesP2n4prUzd
-9xP5ZUlDb4mY/QIDAQABo4HLMIHIMB0GA1UdDgQWBBQO40ZHBMxdb1mHJM8jV7ye
-kd4VsDAfBgNVHSMEGDAWgBRUVsYgPIzuRMi0b9txMreSsGlSBTA3BggrBgEFBQcB
-AQQrMCkwJwYIKwYBBQUHMAKGG2h0dHA6Ly91cmwtZm9yLWFpYS9Sb290LmNlcjAs
-BgNVHR8EJTAjMCGgH6AdhhtodHRwOi8vdXJsLWZvci1jcmwvUm9vdC5jcmwwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AGVFvLLVM0FDIOH9ShHgyHaML9x3UIVaqcfYYKRI3ztocb03PeGvdGt4kTh/zAvU
-OPz7LFtbi/7JB9BW3fmE07YdYP4jVsZsACCKIPzfsOkjvSUVWNgrzq2qf/eaF3SS
-gmFsLnbq5j4V6PW5+QYi0KTN18pcuyslYn5kOyLj9m6sXUOhvFxLU1xDpvYx2TXN
-N3ucCEYsSVzaLOIAc3XnBWZeynBAKNNH3F8p5Ajkl7m16ddoHLQzMNohaf/fZVp8
-smI27V/V9wDvVllR0aiqMigSGAUK8qvLPzig2C7YWr3cTuVFqM5JrFWWSPIrh7I9
-w7m8lIvXiq6qek9tLJ82xic=
------END CERTIFICATE-----
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: CN=Root
-        Validity
-            Not Before: Jan  1 12:00:00 2015 GMT
-            Not After : Jan  1 12:00:00 2016 GMT
-        Subject: CN=Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:9f:eb:7d:ec:d7:82:b2:82:c3:22:42:8c:d1:09:
-                    ea:bd:76:d1:9f:7f:d4:3a:51:6d:0f:e3:da:c4:72:
-                    b4:50:22:06:fe:85:bc:1b:2f:d6:c2:bf:33:51:f0:
-                    73:70:c8:f3:ae:63:ad:0e:6c:e4:b4:d3:8a:e1:26:
-                    d4:38:4a:0f:15:fe:f4:a9:ce:de:21:bb:00:00:c7:
-                    bc:4f:2d:1c:fe:88:94:9c:6d:3e:c1:f0:b1:f0:1d:
-                    5b:dc:51:bf:f3:db:9d:2b:6e:cd:47:57:82:6b:64:
-                    fe:2b:fc:63:01:cf:e1:24:05:4d:c5:90:53:91:11:
-                    fc:08:ea:08:38:cd:b3:3b:87:e6:66:21:22:04:10:
-                    94:71:a2:71:fa:2b:7d:6a:02:fd:dc:7d:67:1a:54:
-                    58:af:63:0a:5a:f8:7e:45:23:ff:78:08:20:52:4b:
-                    e7:64:7f:29:0a:01:bb:4a:5a:6c:26:59:da:a5:d4:
-                    3c:28:d2:26:ba:a6:98:62:dc:95:2a:66:5c:b2:c7:
-                    1a:3a:a9:9f:f9:2f:82:9d:c5:db:bc:f7:26:99:f9:
-                    79:99:bc:40:08:52:36:f0:cf:3e:94:42:8c:32:d9:
-                    c7:c4:44:cb:c6:15:7a:61:2e:f4:24:2b:c2:85:9c:
-                    67:02:d9:9e:6c:4b:d7:5d:36:38:19:ef:95:75:2f:
-                    48:5d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                54:56:C6:20:3C:8C:EE:44:C8:B4:6F:DB:71:32:B7:92:B0:69:52:05
-            X509v3 Authority Key Identifier: 
-                keyid:54:56:C6:20:3C:8C:EE:44:C8:B4:6F:DB:71:32:B7:92:B0:69:52:05
-
-            Authority Information Access: 
-                CA Issuers - URI:http://url-for-aia/Root.cer
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://url-for-crl/Root.crl
-
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha256WithRSAEncryption
-         42:bf:3f:d0:f3:43:91:38:2f:82:b6:c7:b6:85:47:09:71:95:
-         75:fa:8e:7d:33:70:ed:0e:b9:3f:08:06:5b:b5:54:47:4e:aa:
-         f4:76:8f:f8:a7:d2:57:35:23:44:25:58:ae:29:7a:93:36:6e:
-         6d:6f:03:a1:94:c7:db:23:cb:dd:ea:12:14:5c:ac:3e:38:e0:
-         a2:61:9f:ae:02:3f:12:a4:f0:3e:6e:7a:b0:1c:44:99:fa:54:
-         17:17:92:47:57:2e:a9:a7:dc:b7:4f:d2:7d:e1:0a:21:cb:36:
-         de:d5:6f:00:ce:40:6e:c3:80:ad:45:0b:82:1f:65:86:70:e6:
-         47:bc:11:d6:39:01:65:c2:58:c5:91:66:a2:22:e3:d6:08:a4:
-         48:f8:fd:d8:7a:8c:b5:8b:f0:cc:b9:f8:b6:58:eb:6f:78:d8:
-         00:4c:f4:7c:ca:7c:63:22:43:9b:c4:88:0b:6b:00:29:61:49:
-         4a:f4:51:87:46:69:c6:14:b3:cc:85:b8:41:ec:5d:82:c6:4f:
-         f2:f4:ba:87:81:ab:06:5e:d4:2a:a9:08:0c:ff:24:cb:17:40:
-         27:ad:64:69:bc:bd:b2:4f:b5:ba:9f:6b:8c:c0:6f:1d:f3:72:
-         89:ab:88:80:e9:13:ac:cf:7d:79:bb:12:87:74:01:17:df:d8:
-         bc:f4:20:c5
------BEGIN CERTIFICATE-----
-MIIDZTCCAk2gAwIBAgIBATANBgkqhkiG9w0BAQsFADAPMQ0wCwYDVQQDDARSb290
-MB4XDTE1MDEwMTEyMDAwMFoXDTE2MDEwMTEyMDAwMFowDzENMAsGA1UEAwwEUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ/rfezXgrKCwyJCjNEJ
-6r120Z9/1DpRbQ/j2sRytFAiBv6FvBsv1sK/M1Hwc3DI865jrQ5s5LTTiuEm1DhK
-DxX+9KnO3iG7AADHvE8tHP6IlJxtPsHwsfAdW9xRv/PbnStuzUdXgmtk/iv8YwHP
-4SQFTcWQU5ER/AjqCDjNszuH5mYhIgQQlHGicforfWoC/dx9ZxpUWK9jClr4fkUj
-/3gIIFJL52R/KQoBu0pabCZZ2qXUPCjSJrqmmGLclSpmXLLHGjqpn/kvgp3F27z3
-Jpn5eZm8QAhSNvDPPpRCjDLZx8REy8YVemEu9CQrwoWcZwLZnmxL1102OBnvlXUv
-SF0CAwEAAaOByzCByDAdBgNVHQ4EFgQUVFbGIDyM7kTItG/bcTK3krBpUgUwHwYD
-VR0jBBgwFoAUVFbGIDyM7kTItG/bcTK3krBpUgUwNwYIKwYBBQUHAQEEKzApMCcG
-CCsGAQUFBzAChhtodHRwOi8vdXJsLWZvci1haWEvUm9vdC5jZXIwLAYDVR0fBCUw
-IzAhoB+gHYYbaHR0cDovL3VybC1mb3ItY3JsL1Jvb3QuY3JsMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBCvz/Q80OR
-OC+Ctse2hUcJcZV1+o59M3DtDrk/CAZbtVRHTqr0do/4p9JXNSNEJViuKXqTNm5t
-bwOhlMfbI8vd6hIUXKw+OOCiYZ+uAj8SpPA+bnqwHESZ+lQXF5JHVy6pp9y3T9J9
-4Qohyzbe1W8AzkBuw4CtRQuCH2WGcOZHvBHWOQFlwljFkWaiIuPWCKRI+P3Yeoy1
-i/DMufi2WOtveNgATPR8ynxjIkObxIgLawApYUlK9FGHRmnGFLPMhbhB7F2Cxk/y
-9LqHgasGXtQqqQgM/yTLF0AnrWRpvL2yT7W6n2uMwG8d83KJq4iA6ROsz315uxKH
-dAEX39i89CDF
------END CERTIFICATE-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/generate-chains.py b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/generate-chains.py
deleted file mode 100755
index 6c92ebaa..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/generate-chains.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyEncipherment."""
-
-import sys
-sys.path += ['..']
-
-import common
-
-# Self-signed root certificate (used as trust anchor).
-root = common.create_self_signed_root_certificate('Root')
-
-# Intermediate certificate.
-intermediate = common.create_intermediate_certificate('Intermediate', root)
-
-# Target certificate.
-target = common.create_end_entity_certificate('Target', intermediate)
-target.set_key(common.get_or_generate_rsa_key(
-    2048, common.create_key_path(target.name)))
-target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
-target.get_extensions().set_property('keyUsage', 'critical,keyEncipherment')
-
-chain = [target, intermediate, root]
-common.write_chain(__doc__, chain, 'chain.pem')
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Intermediate.key
deleted file mode 100644
index 5192f6731..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Intermediate.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAnJobOpuUubTMWL6TwrCPocEpB1w6Uc6rRo/m0p95oexK1kBZ
-nQ/gbuDNiPHmyoMMbFMxr2lmtoCW2GjERR1rlHhIg1bKYTRuiBwEZWfcR7+Vpm+O
-kIeVuBmLZknPFYp0ycWaIhHfjxvBscDhBsZOYJkPeM/YdaL4Hve3zWk7B8go3t1t
-ZFnE+LSqY7wO0nTnTqJzXcaySac40Zn0kEyfUc03f9VooTWZF+f6YiPeZDbJ0962
-O2mXK8rn9AoPXt9VCgCsbSfmL/kImWnSNCw9n2XfWcrfBqSpBfku+9UVLHcZTAYD
-Cd8rB6ra5qT/eesP2n4prUzd9xP5ZUlDb4mY/QIDAQABAoIBAG4iCwg6pmu79QJs
-dOo01a6Cc+JTQEiMOfQT+9cghKAV18O52cwVgFc6DhJDXXYKl9AO6iBc1fl/kZZ8
-h5u7xw7RUN3dSdL21s0uNwFB+68R06MLTY3jbK3eeSTkv5h8mQnVyEIxo7G3aY8j
-AJ6NFE3nFvR159tDU5Aj0sXJPdSIHFOePGIqPYdZhK3R+hwbFUua2dTd8czvIwP6
-WmgQU/ZacFiOwwAUi3SCDQdBzyBTvlta0fWMrzykcp9TMkuwYEEBddFWyPDO5mzI
-HUmT5D+Tob8AvKMc90iNc03WHxDa0u9iWkQmI0DS8ohK9IH+5TdPAwznY0Vl0VwE
-pOX0U9kCgYEAzLvhuggMPUUyXdRHbXco04lLfb6wNwEG7cWoK5SoP31b34c2qAy1
-Nz6ogQiAEWK8rFNanjYGFJy+XM9GucaFdoo43ux1p0zZzfD9aEJrGNILGfn3yudC
-64adEXDTmfmYFPTUNYgyju/xqCdMZz/LN6h8S9H2Yle0SbpjVKSbsf8CgYEAw9DP
-HDxOa6SVjN9P+NN5v5iukNhJqrDU53v6rleNKDGWQ9vgMjH4R+/yHZicRFiFG+sh
-eX9ykauceNDFae4jytQ90/8y5Np69Tr0kqMhs5iqqySlUujoLO554Fw4GQO80H7B
-r0E4JkHhPNDvGhrNGaWMMK8IrTUaFgNP8vozfQMCgYEApo/8NuMxQe+36Eo5yj71
-ghPizOyEZFt7jZoPFVWeA/ky84oH13RvQgDCCigmOP7BTNmLkceV7tMOtGcVvTJb
-hnMxjXuGxJNrZ3a2U0ol402PJpUNGZBIC2G7C2NlY5GCPxpoQx0JNOzVB97g8+cc
-p611YiHxd1SvIoR3J3e8C3UCgYEAoL9BxkQbfHJX8pU/6Vxxjb+hTna/wsf3fzBf
-0c89qclLOdm+anZrA2MOtw0Y+2JPo2Oaz0q4mqzufp+j8Bn2eANT3jyZYxWX6sjD
-Db2tZOnm8SfcL/vS3U/H7U7HHoHa9q2YAm7f0UgzxuEd56goxu0H8M8/qDD3gSqm
-7yhGLFECgYEAqtKZ++ZNHbwsMl4iuqjyiYMGqRYD5Ps3Q77RqgjzDi2SsXjwP/6A
-GFmDBdLTETHQtJnCMp+z6vJJIK9wpCFmZ1dzDiKjyYZjRu6U3zQYHF85MwFClQXV
-ubx/hG94fLIXgsyGZmIsXYrtgBCHeY0sUcVNzrD+pzdzxh/ht07rzvM=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Root.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Root.key
deleted file mode 100644
index a1775a2..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Root.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAn+t97NeCsoLDIkKM0QnqvXbRn3/UOlFtD+PaxHK0UCIG/oW8
-Gy/Wwr8zUfBzcMjzrmOtDmzktNOK4SbUOEoPFf70qc7eIbsAAMe8Ty0c/oiUnG0+
-wfCx8B1b3FG/89udK27NR1eCa2T+K/xjAc/hJAVNxZBTkRH8COoIOM2zO4fmZiEi
-BBCUcaJx+it9agL93H1nGlRYr2MKWvh+RSP/eAggUkvnZH8pCgG7SlpsJlnapdQ8
-KNImuqaYYtyVKmZcsscaOqmf+S+CncXbvPcmmfl5mbxACFI28M8+lEKMMtnHxETL
-xhV6YS70JCvChZxnAtmebEvXXTY4Ge+VdS9IXQIDAQABAoIBAANLUI6+abzPoMFl
-6YyszZ8VgX/tnCuPXdXD9c+yJTC5Yrd/fb55n8znL2FyuI4MNajT+M6hQ5zN9sBo
-klqOe/0SAWw2DLFZLsjVVHW1EjHUEmuefHp2QNQXZrsFHBUj4vrwD1522QLpU6sI
-SenRpGufiFiXfoEwg6aTW5P/+L8zJx/U7Eki2i/n52b0zWOpqgaMiiVzdg+1/px2
-BZIzoMDE3QVN0WkCxGQkR/vtTQ6zrkorpYt42LK48JAiZvwpBrtYjFlthxpbEe/7
-3sJOljOin7r+6k99BP86sNkh8WANLxIT9V6+lTi7/p6iaCSbRj0HVH3BYSgBulvR
-mgOTrykCgYEAytl5zKOa0VX3MaiU0qvXbb43Fd5H8Eo2bPJYXM2p2UeUH+lJi4Ue
-HYHNM+TyKnP3T5mI84vlw/uUt+lPL8GO7Hs6x63gpCBcnFnYtvmIG0toN+vSvNYZ
-/RT/wAisIsxQogQ6ESiLGgy4u/h/sEmiV74D0loIFbXLeRW6IVtfyOcCgYEAydJt
-qfC98yFXL9jyAL8bsXPhTXGZNJf8AjSMBh4ftFYSkmStpgzbR6lz12Fe972fanW9
-fqKJvvz1MEt6maQA/NoB81xDYkThQXeKxktVKHfABpZGkAOyonys94/9GD14P0zu
-Y6G4pwBqNKNSzEInyi+tr8zifkMf9nloTlSnKBsCgYB9riLd3JwGiWm/1cBnitrN
-/uWoYfFWetSfycNftHlAyy2GXAcaL58KDysxtO8pyHH5WppUs1/nfo+VJzPN1fIU
-qQExSJT/e6GFqdExBQgESUNIKo+GOm0dtg4DUBw+7zIiP9YuXV1aBXnL1NpgQi8Y
-h/1cLjYGJX3tBr4s/q0pDwKBgHsXV4E1bnSyGf35wCfKZzaEqZ5VMY7NP4uMxvYY
-O1f+wxb8Rpim8Lq1VAzBu203/tmsc+WfdonAuD47WswIJf4RbO0jkYmG3yfRpBcq
-7QZgewLJdsHxL2tAxTG8ZS36l7Nr1V14zik07JGsJxyjIKeFCtbVDDLb98uY4pAb
-u1OPAoGAch/9YjF2F7U57w0luEJs8/CJOeOK7Ok2wzWhjs+jUZHr/GnL/QPZhSQL
-yGQWcJFpc+m1kLA0RvGjm6v51g7qaFYN42OK+2rYBejsKAEOjYVBs8rgh39k05PP
-M6dXrMBw3nQVIfkETPyhPN5e0SPYwk52LIyc0Z3D6e7JodSJnpM=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Target.key b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Target.key
deleted file mode 100644
index ad0ef16..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/keys/Target.key
+++ /dev/null
@@ -1,28 +0,0 @@
-openssl genrsa 2048
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAvnCOi7OUkIEnqUOLBPjoq5OmSbej7rh/Pwx0xYgIUWLePtkr
-N+iL5GylGpC+mlX8n9jn1ZqXWPHmo0eZ9/hz61jdvg9SuTmnPzUnur6TsNH/UYgE
-9Jai4ZoZ4O/gIoYOvst0Tb6qN0PgQEe/O/JNtyX/4Va+WmVRJ+IZpnzNj9aunKLz
-sIn6Nq6sUhcsmOTiSnU+hlPuOfu6K3+UFyZEqhdEDzBa0QLAznLPmiE6ZQb54WNF
-sKhghDNwY6aW/iymOIDTyGyZ9uoXy6H+3O/uqhXS7Z+HkzlgrvGqu4L+YclPRpgq
-aP522LjJw3lePJXEPkau6BZ7TvEWlCfzYtIgXQIDAQABAoIBAQCLn1hTQnFs1NRw
-O+4D0j479T+YkoQlNK1OW2KNpGN80ADjkTMnhV5zNdiCtpaX7u0NgOjQacwG0Svo
-kElpTYYniXrhqrhaxtNA+0bKmokLvZr0esYvUPXQc7v/d78bcLAE4IO/sEd5x1D1
-r+ScHdUurzSAUKm0+s1acWGe96d6iYZNHllp1GBJbpc8KsmcIWVJx5qCf6vZlrV3
-B6JBxc4nOEztjB70z9dD9ZaPSaDaWTZEPs0xua2t3PaHAFeIGAuxhrlMotchZlGw
-y6EfnIKzKcaz8MP67cKXFdtlgiylifWiqHnUnTw5KKZ27dIh4SqPbDFLbSQTzkTl
-xby4PERdAoGBAOewQKLVMlmC0GCEnI+sVdc5OtSQKOQoD9+RTW7K6l6Fb4W3zhPh
-vn0m2Ec2cwANLW+SYmmTM8B7kExYRLcDm4W71+gyfVPHXLB1GFB4ZFym5xDZs7fj
-UR+XfVjRmAopzv+8T4UISnDFah2YtNEUYhOj7lqwx8kJMDCeAaFUoM3LAoGBANJs
-QWA/hhjWRW4P8xweCJdyGxmvh6m1VIaDeM197qfT95pAQVe6gBHJY3txeTbwUrbx
-eiWhwi5e8hvYU2gm8JqZaC02d/06x/phyeNbJ3ELj5aGFxBEpxzXaSO1UrbB8hl4
-KxhLbFqQJViXMxbBwA/BhxaMNd2e2ZxTEJXeeIV3AoGBAI56FuWL0fC1v0r7ggPg
-aNF3wjPhiyPzdv93LXUKl+IUkKZciAA1/Jyd/LaeR04qzFwmWxqtiU+/LNemGGur
-bkJpZ7bFBck1ekyRVah2wNExWjtEhX557fNNh6nNCoCFgWRG+2fF13FOFZmpxNgm
-fsGxN+zRdaqtWdMr97isgE7NAoGBAMCGsi5ZEN2Kt03jpAEW7a97hJY0x0Ccm3DT
-u+TwkzrVM1fb8K1PA7zCcZZRlaGRs2yVdrgVz7BTyNt3S6Eg98XMFMhBbPmyHaTW
-cjzmeyjwdfk4SMPmvKwj35v/XGXBAD0TeQKqh8I43yK2fNUWgx8nZ+1WbjaPD/X6
-/lLRkZ4zAoGAGVnowegfsOZVtV6VP3a9mlKeQv7JkWcjBhiGBjt8k8NWt/ejx3ru
-u/LfNWmVcLY552dLjkziKh/ULGq6hSti8L3f1fDrgINkO0j0TcFiVW3TIRBSsnDr
-LIHMYSfeVRXrbhxQFJWwoCCSg2S8Kkn6WNBtECQb3X6vnIwct9/mqeM=
------END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/main.test b/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/main.test
deleted file mode 100644
index 0bcea7d..0000000
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyencipherment/main.test
+++ /dev/null
@@ -1,5 +0,0 @@
-chain: chain.pem
-last_cert_trust: TRUSTED_ANCHOR
-utc_time: 150302120000Z
-key_purpose: SERVER_AUTH
-expected_errors:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.pem
similarity index 73%
copy from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.pem
index a79ff5c..801b997 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.pem
@@ -1,7 +1,6 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a EC key and has the single key usage decipherOnly
 
 Certificate:
     Data:
@@ -14,31 +13,20 @@
             Not After : Jan  1 12:00:00 2016 GMT
         Subject: CN=Target
         Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
-                Exponent: 65537 (0x10001)
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub: 
+                    04:6a:64:c7:4b:c6:a0:87:b5:c2:07:13:ac:b8:0d:
+                    37:95:90:e4:e2:82:95:31:6f:62:e5:1f:b0:59:30:
+                    e9:2b:c6:e0:b4:83:9b:54:9d:61:56:d6:04:10:b7:
+                    f3:b9:5e:31:e6:cf:af:40:0e:aa:7a:2a:d8:1c:ee:
+                    5d:d1:5c:17:64:c7:37:f7:34:3d:42:6c:10:0c:ad:
+                    e3:27:a9:ef:e6:02:48:66:0f:61:92:37:fe:26:53:
+                    2c:9f:79:a7:29:7c:4c
+                ASN1 OID: secp384r1
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                DE:7D:41:4C:94:83:61:60:ED:FA:58:3C:92:33:58:E5:79:C2:07:A0
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -51,45 +39,42 @@
                   URI:http://url-for-crl/Intermediate.crl
 
             X509v3 Key Usage: critical
-                Key Agreement
+                Decipher Only
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         ac:f1:14:99:46:bf:49:87:12:8c:3e:92:8f:9e:6b:aa:e2:65:
+         a6:77:ac:62:40:f1:ee:8e:73:fc:c5:26:a5:bc:81:39:a4:a6:
+         e8:c5:24:67:f3:46:a1:c2:6b:58:ab:87:72:0e:5c:d0:11:8e:
+         29:dc:10:a3:8c:3a:0e:23:ab:d7:bc:d0:1c:ce:be:db:cf:e8:
+         fe:90:f8:3c:e6:47:c5:b2:73:ee:9f:a3:ff:b2:58:6c:fe:33:
+         59:2f:7b:80:64:14:3d:ae:18:e0:b2:f7:7b:59:70:80:a2:60:
+         c3:97:06:54:c7:7c:39:a3:b9:eb:be:56:6e:f5:c4:cd:f6:7b:
+         be:12:e8:0b:9e:6c:b9:50:99:da:8e:14:41:b1:f1:02:5f:ae:
+         a9:18:31:84:48:48:bf:f1:9b:f3:68:95:ec:ec:5b:75:2e:10:
+         25:dd:3f:80:1d:a8:54:5d:45:59:1a:43:8e:a8:30:ab:e6:00:
+         c0:75:21:db:5d:64:88:1a:a5:f2:a5:ca:e5:be:4a:a8:a9:9d:
+         73:da:6f:5b:bc:a7:5d:4a:d8:1f:6a:e6:cb:9d:72:b6:73:d2:
+         87:68:9f:9c:64:fa:0b:38:3f:ee:4e:e6:7e:37:54:61:f3:7b:
+         b1:3d:bf:35:6b:19:e8:c4:c8:c5:39:55:fa:c0:8c:9d:fd:20:
+         98:a4:e5:76
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIC1jCCAb6gAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
-BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
-aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARqZMdLxqCHtcIHE6y4
+DTeVkOTigpUxb2LlH7BZMOkrxuC0g5tUnWFW1gQQt/O5XjHmz69ADqp6Ktgc7l3R
+XBdkxzf3ND1CbBAMreMnqe/mAkhmD2GSN/4mUyyfeacpfEyjgeAwgd0wHQYDVR0O
+BBYEFN59QUyUg2Fg7fpYPJIzWOV5wgegMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAo
+Wb1AGmUHBRg4MD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
+bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
+cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDwYDVR0PAQH/BAUDAwcA
+gDATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOCAQEArPEUmUa/
+SYcSjD6Sj55rquJlpnesYkDx7o5z/MUmpbyBOaSm6MUkZ/NGocJrWKuHcg5c0BGO
+KdwQo4w6DiOr17zQHM6+28/o/pD4POZHxbJz7p+j/7JYbP4zWS97gGQUPa4Y4LL3
+e1lwgKJgw5cGVMd8OaO5675WbvXEzfZ7vhLoC55suVCZ2o4UQbHxAl+uqRgxhEhI
+v/Gb82iV7OxbdS4QJd0/gB2oVF1FWRpDjqgwq+YAwHUh211kiBql8qXK5b5KqKmd
+c9pvW7ynXUrYH2rmy51ytnPSh2ifnGT6Czg/7k7mfjdUYfN7sT2/NWsZ6MTIxTlV
++sCMnf0gmKTldg==
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.test
similarity index 77%
rename from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
rename to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.test
index 0bcea7d..a576027 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-decipherOnly.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: ec-decipherOnly.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.pem
similarity index 73%
copy from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.pem
index a79ff5c..4dcaeaf 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.pem
@@ -1,12 +1,11 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a EC key and has the single key usage digitalSignature
 
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 2 (0x2)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Intermediate
         Validity
@@ -14,31 +13,20 @@
             Not After : Jan  1 12:00:00 2016 GMT
         Subject: CN=Target
         Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
-                Exponent: 65537 (0x10001)
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub: 
+                    04:6a:64:c7:4b:c6:a0:87:b5:c2:07:13:ac:b8:0d:
+                    37:95:90:e4:e2:82:95:31:6f:62:e5:1f:b0:59:30:
+                    e9:2b:c6:e0:b4:83:9b:54:9d:61:56:d6:04:10:b7:
+                    f3:b9:5e:31:e6:cf:af:40:0e:aa:7a:2a:d8:1c:ee:
+                    5d:d1:5c:17:64:c7:37:f7:34:3d:42:6c:10:0c:ad:
+                    e3:27:a9:ef:e6:02:48:66:0f:61:92:37:fe:26:53:
+                    2c:9f:79:a7:29:7c:4c
+                ASN1 OID: secp384r1
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                DE:7D:41:4C:94:83:61:60:ED:FA:58:3C:92:33:58:E5:79:C2:07:A0
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -51,45 +39,42 @@
                   URI:http://url-for-crl/Intermediate.crl
 
             X509v3 Key Usage: critical
-                Key Agreement
+                Digital Signature
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         45:12:f7:cf:1f:00:b1:c7:9e:42:6f:a6:8e:1f:7b:52:e9:58:
+         60:a2:f8:f9:64:29:c6:08:88:08:c2:38:8a:eb:69:3e:a2:e2:
+         31:3c:92:ad:95:2d:2e:87:0e:d1:31:52:e9:e2:c4:67:e4:80:
+         6d:31:07:c8:3c:a4:60:01:e3:c7:2c:29:15:e0:3d:49:64:80:
+         59:ec:08:6d:db:7e:12:f3:f7:55:db:58:47:d4:4f:3d:76:2a:
+         86:9f:7d:04:ed:31:7a:d1:a8:3b:31:ea:13:3b:c3:33:8a:c4:
+         b2:b1:1d:34:13:74:a3:b7:95:17:d4:43:dc:b6:09:b8:43:27:
+         2b:30:be:7f:cc:11:02:5a:49:72:b0:3a:a6:74:6b:65:0f:a2:
+         95:e8:64:23:2a:47:f1:c9:ac:66:0e:77:ca:49:4f:b4:09:07:
+         f5:b1:df:b6:e5:97:b7:b7:be:d4:e3:db:87:e9:fb:7e:dd:d1:
+         7d:99:14:f8:78:4d:46:02:d9:8b:b1:b4:23:ae:71:bd:fd:c8:
+         b6:32:3e:e8:b6:ea:f1:21:f4:c7:96:e4:20:47:b2:a0:68:3a:
+         74:97:0c:db:e8:d5:aa:62:fd:0f:b5:bd:1e:8d:25:d3:40:40:
+         33:47:e7:2b:85:1e:96:91:e9:fe:39:22:29:f0:cd:08:8b:40:
+         a7:16:84:c0
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIC1TCCAb2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
-BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
-aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARqZMdLxqCHtcIHE6y4
+DTeVkOTigpUxb2LlH7BZMOkrxuC0g5tUnWFW1gQQt/O5XjHmz69ADqp6Ktgc7l3R
+XBdkxzf3ND1CbBAMreMnqe/mAkhmD2GSN/4mUyyfeacpfEyjgd8wgdwwHQYDVR0O
+BBYEFN59QUyUg2Fg7fpYPJIzWOV5wgegMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAo
+Wb1AGmUHBRg4MD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
+bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
+cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgeA
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQBFEvfPHwCx
+x55Cb6aOH3tS6Vhgovj5ZCnGCIgIwjiK62k+ouIxPJKtlS0uhw7RMVLp4sRn5IBt
+MQfIPKRgAePHLCkV4D1JZIBZ7Aht234S8/dV21hH1E89diqGn30E7TF60ag7MeoT
+O8MzisSysR00E3Sjt5UX1EPctgm4QycrML5/zBECWklysDqmdGtlD6KV6GQjKkfx
+yaxmDnfKSU+0CQf1sd+25Ze3t77U49uH6ft+3dF9mRT4eE1GAtmLsbQjrnG9/ci2
+Mj7oturxIfTHluQgR7KgaDp0lwzb6NWqYv0Ptb0ejSXTQEAzR+crhR6Wken+OSIp
+8M0Ii0CnFoTA
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.test
similarity index 75%
copy from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.test
index 0bcea7d..8bae79469 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-digitalSignature.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: ec-digitalSignature.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.pem
similarity index 73%
copy from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.pem
index a79ff5c..99c9740 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.pem
@@ -1,12 +1,11 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a EC key and has the single key usage keyAgreement
 
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 3 (0x3)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Intermediate
         Validity
@@ -14,31 +13,20 @@
             Not After : Jan  1 12:00:00 2016 GMT
         Subject: CN=Target
         Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
-                Exponent: 65537 (0x10001)
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub: 
+                    04:6a:64:c7:4b:c6:a0:87:b5:c2:07:13:ac:b8:0d:
+                    37:95:90:e4:e2:82:95:31:6f:62:e5:1f:b0:59:30:
+                    e9:2b:c6:e0:b4:83:9b:54:9d:61:56:d6:04:10:b7:
+                    f3:b9:5e:31:e6:cf:af:40:0e:aa:7a:2a:d8:1c:ee:
+                    5d:d1:5c:17:64:c7:37:f7:34:3d:42:6c:10:0c:ad:
+                    e3:27:a9:ef:e6:02:48:66:0f:61:92:37:fe:26:53:
+                    2c:9f:79:a7:29:7c:4c
+                ASN1 OID: secp384r1
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                DE:7D:41:4C:94:83:61:60:ED:FA:58:3C:92:33:58:E5:79:C2:07:A0
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -55,41 +43,38 @@
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         8b:62:48:62:1b:e7:be:0f:cf:e1:be:81:04:60:cc:28:0a:87:
+         b9:d8:1f:c8:92:7a:fb:2a:be:8a:67:a7:fc:d0:a3:90:1b:e3:
+         ee:3f:ce:f5:38:b1:06:05:9c:60:38:86:24:28:22:d5:ad:fc:
+         01:ff:1b:10:07:3e:38:5f:12:8b:53:a2:5b:8f:22:b8:4a:9e:
+         50:52:d7:31:16:4f:d0:a7:1c:40:09:b6:42:4f:6e:b1:27:b4:
+         b0:77:d0:0e:f7:f0:9c:d4:f1:ec:af:14:74:07:96:7c:4b:83:
+         16:ed:62:33:81:e9:fd:4d:d5:11:a2:b6:13:49:fa:34:ce:f7:
+         cf:4b:51:85:fa:cd:78:b1:ca:9c:ed:31:06:27:6e:79:2f:d7:
+         fc:62:54:e0:de:a9:a6:5c:4e:f1:e5:bd:20:e1:06:b7:c1:86:
+         cd:fc:f5:94:a1:fa:98:56:87:26:ce:bc:82:64:ac:d1:2f:8d:
+         4c:b3:f3:79:e7:85:61:df:4e:88:51:6f:2b:cc:d8:c0:81:a5:
+         94:67:cb:48:f0:ef:13:1d:9e:a7:42:74:79:05:f9:75:ee:2f:
+         6f:7a:8f:ac:3b:c4:a1:6e:c3:6d:89:69:de:c5:8c:e2:63:3c:
+         73:c7:53:7a:3a:47:8c:aa:41:86:8c:84:ce:db:d5:ba:b4:f9:
+         4b:eb:16:bc
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIC1TCCAb2gAwIBAgIBAzANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
-BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
-aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARqZMdLxqCHtcIHE6y4
+DTeVkOTigpUxb2LlH7BZMOkrxuC0g5tUnWFW1gQQt/O5XjHmz69ADqp6Ktgc7l3R
+XBdkxzf3ND1CbBAMreMnqe/mAkhmD2GSN/4mUyyfeacpfEyjgd8wgdwwHQYDVR0O
+BBYEFN59QUyUg2Fg7fpYPJIzWOV5wgegMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAo
+Wb1AGmUHBRg4MD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
+bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
+cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMI
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCLYkhiG+e+
+D8/hvoEEYMwoCoe52B/Iknr7Kr6KZ6f80KOQG+PuP871OLEGBZxgOIYkKCLVrfwB
+/xsQBz44XxKLU6JbjyK4Sp5QUtcxFk/QpxxACbZCT26xJ7Swd9AO9/Cc1PHsrxR0
+B5Z8S4MW7WIzgen9TdURorYTSfo0zvfPS1GF+s14scqc7TEGJ255L9f8YlTg3qmm
+XE7x5b0g4Qa3wYbN/PWUofqYVocmzryCZKzRL41Ms/N554Vh306IUW8rzNjAgaWU
+Z8tI8O8THZ6nQnR5Bfl17i9veo+sO8ShbsNtiWnexYziYzxzx1N6OkeMqkGGjITO
+29W6tPlL6xa8
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.test
similarity index 77%
copy from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.test
index 0bcea7d..1f6ee59 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyAgreement.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: ec-keyAgreement.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.pem
similarity index 73%
copy from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.pem
index a79ff5c..39717eb 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.pem
@@ -1,12 +1,11 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a EC key and has the single key usage keyEncipherment
 
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 4 (0x4)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Intermediate
         Validity
@@ -14,31 +13,20 @@
             Not After : Jan  1 12:00:00 2016 GMT
         Subject: CN=Target
         Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
-                Exponent: 65537 (0x10001)
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub: 
+                    04:6a:64:c7:4b:c6:a0:87:b5:c2:07:13:ac:b8:0d:
+                    37:95:90:e4:e2:82:95:31:6f:62:e5:1f:b0:59:30:
+                    e9:2b:c6:e0:b4:83:9b:54:9d:61:56:d6:04:10:b7:
+                    f3:b9:5e:31:e6:cf:af:40:0e:aa:7a:2a:d8:1c:ee:
+                    5d:d1:5c:17:64:c7:37:f7:34:3d:42:6c:10:0c:ad:
+                    e3:27:a9:ef:e6:02:48:66:0f:61:92:37:fe:26:53:
+                    2c:9f:79:a7:29:7c:4c
+                ASN1 OID: secp384r1
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                DE:7D:41:4C:94:83:61:60:ED:FA:58:3C:92:33:58:E5:79:C2:07:A0
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -51,45 +39,42 @@
                   URI:http://url-for-crl/Intermediate.crl
 
             X509v3 Key Usage: critical
-                Key Agreement
+                Key Encipherment
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         3b:99:9e:62:98:ae:a8:46:a9:92:86:6f:dc:e4:b6:01:d4:7b:
+         d3:31:4f:e7:47:47:f4:44:1c:de:3c:0d:b7:ea:ea:52:9f:3d:
+         76:1a:1f:62:62:f8:c5:fc:4e:d9:cc:c9:49:98:8c:44:10:11:
+         8d:3e:5b:b9:97:ed:2e:66:71:cf:9d:3c:5a:87:08:8a:82:b3:
+         83:5d:f9:05:98:a9:9a:12:f4:96:99:44:e9:c3:88:7b:c7:9a:
+         ef:13:78:46:2b:ff:75:a3:44:24:13:ef:03:18:e1:86:fb:1e:
+         56:9a:c5:08:6e:f5:f2:ac:cc:07:bc:bd:91:61:8c:18:32:8d:
+         f9:e8:e7:45:73:0d:bd:d3:25:a9:35:83:b0:cd:98:6e:36:ec:
+         88:6c:ce:fc:0d:ab:73:96:83:b9:bc:95:76:5b:19:09:bd:42:
+         21:80:c0:4b:ca:09:4d:a2:60:65:7b:cc:f6:91:25:6e:73:c5:
+         17:bc:81:d9:5d:c4:77:73:6d:ea:9f:35:26:ab:a0:77:2c:1f:
+         58:96:6d:ec:d7:ab:0f:c0:da:eb:8c:af:8e:74:af:83:88:4c:
+         ab:13:c2:62:70:58:ae:3f:5e:d6:7b:70:bd:f2:74:f7:30:0a:
+         47:24:2f:42:59:2b:b2:de:6f:a5:47:1d:ae:8c:ac:30:e3:ec:
+         32:9c:93:73
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIC1TCCAb2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
-BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
-aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+VQQDDAZUYXJnZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARqZMdLxqCHtcIHE6y4
+DTeVkOTigpUxb2LlH7BZMOkrxuC0g5tUnWFW1gQQt/O5XjHmz69ADqp6Ktgc7l3R
+XBdkxzf3ND1CbBAMreMnqe/mAkhmD2GSN/4mUyyfeacpfEyjgd8wgdwwHQYDVR0O
+BBYEFN59QUyUg2Fg7fpYPJIzWOV5wgegMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAo
+Wb1AGmUHBRg4MD8GCCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Vy
+bC1mb3ItYWlhL0ludGVybWVkaWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0
+cDovL3VybC1mb3ItY3JsL0ludGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgUg
+MBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBCwUAA4IBAQA7mZ5imK6o
+RqmShm/c5LYB1HvTMU/nR0f0RBzePA236upSnz12Gh9iYvjF/E7ZzMlJmIxEEBGN
+Plu5l+0uZnHPnTxahwiKgrODXfkFmKmaEvSWmUTpw4h7x5rvE3hGK/91o0QkE+8D
+GOGG+x5WmsUIbvXyrMwHvL2RYYwYMo356OdFcw290yWpNYOwzZhuNuyIbM78Datz
+loO5vJV2WxkJvUIhgMBLyglNomBle8z2kSVuc8UXvIHZXcR3c23qnzUmq6B3LB9Y
+lm3s16sPwNrrjK+OdK+DiEyrE8JicFiuP17We3C98nT3MApHJC9CWSuy3m+lRx2u
+jKww4+wynJNz
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.test
similarity index 76%
copy from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.test
index 0bcea7d..4307abe 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/ec-keyEncipherment.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: ec-keyEncipherment.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH
diff --git a/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/generate-chains.py b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/generate-chains.py
new file mode 100755
index 0000000..6b81970
--- /dev/null
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/generate-chains.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+# Copyright (c) 2017 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Generates a variety of chains where the target certificate varies in its key
+type and key usages."""
+
+import sys
+sys.path += ['..']
+
+import common
+
+# Self-signed root certificate (used as trust anchor).
+root = common.create_self_signed_root_certificate('Root')
+
+# Intermediate certificate.
+intermediate = common.create_intermediate_certificate('Intermediate', root)
+
+# Use either an RSA key, or an EC key for the target certificate. Generate the
+# possible keys ahead of time so as not to duplicate the work.
+
+KEYS = {
+  'rsa': common.get_or_generate_rsa_key(2048,
+                                        common.create_key_path('Target-rsa')),
+  'ec': common.get_or_generate_ec_key('secp384r1',
+                                      common.create_key_path('Target-ec'))
+};
+
+KEY_USAGES = [ 'decipherOnly',
+               'digitalSignature',
+               'keyAgreement',
+               'keyEncipherment' ]
+
+# The proper key usage depends on the key purpose (serverAuth in this case),
+# and the key type. Generate a variety of combinations.
+for key_type in sorted(KEYS.keys()):
+  for key_usage in KEY_USAGES:
+    # Target certificate.
+    target = common.create_end_entity_certificate('Target', intermediate)
+    target.get_extensions().set_property('extendedKeyUsage', 'serverAuth')
+    target.get_extensions().set_property('keyUsage',
+                                         'critical,%s' % (key_usage))
+
+    # Set the key.
+    target.set_key(KEYS[key_type])
+
+    # Write the chain.
+    chain = [target, intermediate, root]
+    description = ('Certificate chain where the target uses a %s key and has '
+                   'the single key usage %s') % (key_type.upper(), key_usage)
+    common.write_chain(description, chain, '%s-%s.pem' % (key_type, key_usage))
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/keys/Intermediate.key b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Intermediate.key
similarity index 100%
rename from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/keys/Intermediate.key
rename to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Intermediate.key
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/keys/Root.key b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Root.key
similarity index 100%
rename from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/keys/Root.key
rename to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Root.key
diff --git a/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Target-ec.key b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Target-ec.key
new file mode 100644
index 0000000..93b408d
--- /dev/null
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Target-ec.key
@@ -0,0 +1,10 @@
+openssl ecparam -name secp384r1 -genkey
+-----BEGIN EC PARAMETERS-----
+BgUrgQQAIg==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MIGkAgEBBDCzK1e0D3pjhdCX9UeDKl9gw9X08NEeuXcM/rpYQaGRPnvtGUpyfGYh
+MwSA7esyvi2gBwYFK4EEACKhZANiAARqZMdLxqCHtcIHE6y4DTeVkOTigpUxb2Ll
+H7BZMOkrxuC0g5tUnWFW1gQQt/O5XjHmz69ADqp6Ktgc7l3RXBdkxzf3ND1CbBAM
+reMnqe/mAkhmD2GSN/4mUyyfeacpfEw=
+-----END EC PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Target-rsa.key b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Target-rsa.key
new file mode 100644
index 0000000..4c7cf0077
--- /dev/null
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/keys/Target-rsa.key
@@ -0,0 +1,28 @@
+openssl genrsa 2048
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyPTD/66ZRNwHGWJZHboOE9B4tqB/ynRPpMJc3gTi6iLZKE1F
+VBRM6FbUe4pk+vnkFCPArcwlYzhZVQBR4oKsrkc72uKVeRy1lsrSSjz3uHrMnuKN
+0BcLvG4OPMIFOiFkANvDCLXmz3hdKzy6VKlaZE4b2DrrFNNardpv1qLhfg//znGF
+FMf+VGX5xkdzrm6bgedVy37qdqhI+WIlQA7Rz5CPaPeUIGmkFIoUJFM9VbhaMa58
+NnTSwizOe+mDaVYW7Pm7fLAUb5US2nywI7hdQdy8rSTZtmo/gmx0oHNoWtPk8gqT
+uRzuu87i2IaGjuAkWOPs9eOENummYnJcSwycFQIDAQABAoIBAQCIO48ILciQKw3R
+AqBhi7lxa1n6jRI1IObBTlaA2RUwH1HShZfjaSO+OucvnWHZ10Ds+lPsPsJ14kSF
+YIMiqO4B9B66w/MLORBN2s/3Lh/N+8nuSK5VDNqS8pVKUUoT34EZJ+KvbAm+St32
+quOy82BpMZ6k10R5SNNnmvdIrgFqYKCDyhMwW5tR4pQkjuHfsv8dJpvM/B+HoLTH
+/+jP1+nt4jD4Najn01nPJ8uETiJj/CLvHpRuuBep0BMWjwtlZaEuwILVCWGdSym6
+em9fuQog6ghPWk9LdGcB8eSm07S27NCFlZjcr1PEBS1IxzZHkSyUb6dnPOPgCDhe
+CjtOLHWdAoGBAOxR+ZuY94vVDwjkG6KxEE3WoqWl2uKoYFKH30bZAiZy0gJ/h+3y
+yZRXOi3yVOiRWKNVaHbOI+jRTjCIvquR0VNeZZTjwX+FohkeJ+9HTerMcl9WeLLT
+KBnwwzE1I1KvBPVrBPQ/IP6ydthdSXcF/7AvWy1d3NCmPywzzjEaZU1DAoGBANmw
+4E1n4nj/+Jxt1Ja0Jr9Le32iR3Aa7/r07U44rDb7hvKtk6qv5B/V6wsCFZ378gMS
+rl+iCWqtFMZNpDy83QpKAcOEQDs1BgZLCxwtIiEKtUIAXCAf3uHPxTeXZtAIoBl6
+b+OU7RkPWSa4orO63v1G77Lz4GaXSTHxRcMXZO/HAoGADHvQGb4c5ZAduTSDmTaN
+S+9YrDN0uqB2ZiWzT8TK7kkGewdNoO5AY8uv0RmKDrcO3aH3YL9G+leEL+ApYlrT
+mfnUl+boI9plU7paFbPIk+y05gBlY9zvs18akJDkCswgEO7UViq3jXzT9l4HMXhp
+p175DA53SbZeg/FApStlyo0CgYAkPTu55xdeiU47zFTdmbPxmIFAUumNkg5tOqTe
+prSUmp7Ge3rfqVRSsGvmczxiBnUtaci5huIGbjXNJVO4AMDTW6qbf8KpmJQeLBP3
+ZtQNqBiwmhq8BlI2ST5NmNi2vRjZ5PYHbt1hlJqExavgO7WveEWjBtJOgdTfiYjR
+h214NQKBgEuj8vmd0Vgt/hmc7vVi/cfCOvbJEzpM3f19k7YyHze9UaUYrzNF830C
+r0pNX0fEv8mKsCyFBfmmCjy6yVodUZ8pWmbwMTNbYiMPy9SBOSQr5+QTr3BOU3pM
+b2jrvBzMkuf4NwuzqDLsbf2iury0wkPQWpILghY1Adc4mjylPJdD
+-----END RSA PRIVATE KEY-----
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.pem
similarity index 75%
copy from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.pem
index a79ff5c..0b4b507 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.pem
@@ -1,12 +1,11 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a RSA key and has the single key usage decipherOnly
 
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 5 (0x5)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Intermediate
         Validity
@@ -17,28 +16,28 @@
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
+                    00:c8:f4:c3:ff:ae:99:44:dc:07:19:62:59:1d:ba:
+                    0e:13:d0:78:b6:a0:7f:ca:74:4f:a4:c2:5c:de:04:
+                    e2:ea:22:d9:28:4d:45:54:14:4c:e8:56:d4:7b:8a:
+                    64:fa:f9:e4:14:23:c0:ad:cc:25:63:38:59:55:00:
+                    51:e2:82:ac:ae:47:3b:da:e2:95:79:1c:b5:96:ca:
+                    d2:4a:3c:f7:b8:7a:cc:9e:e2:8d:d0:17:0b:bc:6e:
+                    0e:3c:c2:05:3a:21:64:00:db:c3:08:b5:e6:cf:78:
+                    5d:2b:3c:ba:54:a9:5a:64:4e:1b:d8:3a:eb:14:d3:
+                    5a:ad:da:6f:d6:a2:e1:7e:0f:ff:ce:71:85:14:c7:
+                    fe:54:65:f9:c6:47:73:ae:6e:9b:81:e7:55:cb:7e:
+                    ea:76:a8:48:f9:62:25:40:0e:d1:cf:90:8f:68:f7:
+                    94:20:69:a4:14:8a:14:24:53:3d:55:b8:5a:31:ae:
+                    7c:36:74:d2:c2:2c:ce:7b:e9:83:69:56:16:ec:f9:
+                    bb:7c:b0:14:6f:95:12:da:7c:b0:23:b8:5d:41:dc:
+                    bc:ad:24:d9:b6:6a:3f:82:6c:74:a0:73:68:5a:d3:
+                    e4:f2:0a:93:b9:1c:ee:bb:ce:e2:d8:86:86:8e:e0:
+                    24:58:e3:ec:f5:e3:84:36:e9:a6:62:72:5c:4b:0c:
+                    9c:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                F1:A9:E2:E9:58:C3:31:AD:E2:60:9B:55:C0:A2:0A:80:7B:15:10:2D
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -51,45 +50,45 @@
                   URI:http://url-for-crl/Intermediate.crl
 
             X509v3 Key Usage: critical
-                Key Agreement
+                Decipher Only
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         94:ad:29:5c:ea:65:06:e4:53:7e:84:0b:73:6c:fa:ee:b7:b4:
+         1c:75:83:27:06:80:5c:a0:21:2f:46:90:2f:bf:60:5f:3c:83:
+         9c:45:9f:de:93:fb:e5:7d:e1:a1:f2:fd:af:af:e9:06:00:33:
+         e6:6c:06:32:f3:2b:8d:0a:83:3a:c1:6f:82:9c:30:f0:0b:20:
+         22:8a:44:fa:ba:a3:fa:74:a0:c2:8e:c6:f3:cf:f3:d9:ae:ef:
+         3c:94:36:9e:0b:2d:7c:57:ff:3d:b2:76:dd:ca:2e:9f:ef:5b:
+         e6:36:09:b8:fc:5c:0f:38:ba:1d:34:21:ed:33:d7:e6:fc:4c:
+         c9:c0:dd:87:7b:64:fb:0e:97:74:33:9d:ef:34:b9:d9:fa:de:
+         2e:e1:e1:e0:ef:d2:9c:67:af:f5:8f:6b:f3:56:f2:9c:51:b1:
+         5d:81:b1:b0:c4:a8:69:02:f9:5b:d9:96:54:84:52:ae:21:f8:
+         1b:44:14:3a:45:10:7a:5f:98:c7:13:47:5b:09:af:5a:5a:a8:
+         af:b3:01:ba:ce:b6:38:bc:f0:ff:6c:ed:9e:f8:59:20:7b:69:
+         1c:a2:b6:25:04:d6:32:ee:3f:a4:be:e2:1e:eb:48:5c:64:4a:
+         f6:72:f1:94:59:b5:06:45:93:14:28:91:0b:7f:69:15:14:35:
+         77:e3:0b:45
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIDhDCCAmygAwIBAgIBBTANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
+VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI9MP/
+rplE3AcZYlkdug4T0Hi2oH/KdE+kwlzeBOLqItkoTUVUFEzoVtR7imT6+eQUI8Ct
+zCVjOFlVAFHigqyuRzva4pV5HLWWytJKPPe4esye4o3QFwu8bg48wgU6IWQA28MI
+tebPeF0rPLpUqVpkThvYOusU01qt2m/WouF+D//OcYUUx/5UZfnGR3OubpuB51XL
+fup2qEj5YiVADtHPkI9o95QgaaQUihQkUz1VuFoxrnw2dNLCLM576YNpVhbs+bt8
+sBRvlRLafLAjuF1B3LytJNm2aj+CbHSgc2ha0+TyCpO5HO67zuLYhoaO4CRY4+z1
+44Q26aZiclxLDJwVAgMBAAGjgeAwgd0wHQYDVR0OBBYEFPGp4ulYwzGt4mCbVcCi
+CoB7FRAtMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
 BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
 aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+dGVybWVkaWF0ZS5jcmwwDwYDVR0PAQH/BAUDAwcAgDATBgNVHSUEDDAKBggrBgEF
+BQcDATANBgkqhkiG9w0BAQsFAAOCAQEAlK0pXOplBuRTfoQLc2z67re0HHWDJwaA
+XKAhL0aQL79gXzyDnEWf3pP75X3hofL9r6/pBgAz5mwGMvMrjQqDOsFvgpww8Asg
+IopE+rqj+nSgwo7G88/z2a7vPJQ2ngstfFf/PbJ23coun+9b5jYJuPxcDzi6HTQh
+7TPX5vxMycDdh3tk+w6XdDOd7zS52freLuHh4O/SnGev9Y9r81bynFGxXYGxsMSo
+aQL5W9mWVIRSriH4G0QUOkUQel+YxxNHWwmvWlqor7MBus62OLzw/2ztnvhZIHtp
+HKK2JQTWMu4/pL7iHutIXGRK9nLxlFm1BkWTFCiRC39pFRQ1d+MLRQ==
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.test
similarity index 77%
copy from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.test
index 0bcea7d..55019c6 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-decipherOnly.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: rsa-decipherOnly.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.pem
similarity index 75%
copy from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.pem
index a79ff5c..2aa08ea 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.pem
@@ -1,12 +1,11 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a RSA key and has the single key usage digitalSignature
 
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 6 (0x6)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Intermediate
         Validity
@@ -17,28 +16,28 @@
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
+                    00:c8:f4:c3:ff:ae:99:44:dc:07:19:62:59:1d:ba:
+                    0e:13:d0:78:b6:a0:7f:ca:74:4f:a4:c2:5c:de:04:
+                    e2:ea:22:d9:28:4d:45:54:14:4c:e8:56:d4:7b:8a:
+                    64:fa:f9:e4:14:23:c0:ad:cc:25:63:38:59:55:00:
+                    51:e2:82:ac:ae:47:3b:da:e2:95:79:1c:b5:96:ca:
+                    d2:4a:3c:f7:b8:7a:cc:9e:e2:8d:d0:17:0b:bc:6e:
+                    0e:3c:c2:05:3a:21:64:00:db:c3:08:b5:e6:cf:78:
+                    5d:2b:3c:ba:54:a9:5a:64:4e:1b:d8:3a:eb:14:d3:
+                    5a:ad:da:6f:d6:a2:e1:7e:0f:ff:ce:71:85:14:c7:
+                    fe:54:65:f9:c6:47:73:ae:6e:9b:81:e7:55:cb:7e:
+                    ea:76:a8:48:f9:62:25:40:0e:d1:cf:90:8f:68:f7:
+                    94:20:69:a4:14:8a:14:24:53:3d:55:b8:5a:31:ae:
+                    7c:36:74:d2:c2:2c:ce:7b:e9:83:69:56:16:ec:f9:
+                    bb:7c:b0:14:6f:95:12:da:7c:b0:23:b8:5d:41:dc:
+                    bc:ad:24:d9:b6:6a:3f:82:6c:74:a0:73:68:5a:d3:
+                    e4:f2:0a:93:b9:1c:ee:bb:ce:e2:d8:86:86:8e:e0:
+                    24:58:e3:ec:f5:e3:84:36:e9:a6:62:72:5c:4b:0c:
+                    9c:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                F1:A9:E2:E9:58:C3:31:AD:E2:60:9B:55:C0:A2:0A:80:7B:15:10:2D
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -51,45 +50,45 @@
                   URI:http://url-for-crl/Intermediate.crl
 
             X509v3 Key Usage: critical
-                Key Agreement
+                Digital Signature
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         0f:47:20:8c:07:a6:4a:28:f9:a8:68:e6:1b:f7:20:5b:b1:3e:
+         7e:91:79:c0:e8:f3:c6:54:72:a9:8e:e7:c0:d7:a7:4b:67:90:
+         2d:ea:de:c3:78:8d:17:bc:5e:58:c5:7a:d1:bf:fd:b4:89:c6:
+         9b:b1:96:52:83:1e:77:e6:f4:40:bc:79:7e:71:9c:f8:5c:b1:
+         53:5d:8a:b2:9a:b2:77:09:1a:0d:d4:50:f9:93:e4:1f:d4:4c:
+         eb:01:a7:c2:42:2c:81:2c:34:8e:90:07:2f:39:6d:86:f2:f1:
+         31:e0:f5:eb:77:95:3c:66:51:02:b4:da:ba:13:12:48:07:75:
+         77:78:9d:ef:c8:d7:cc:76:74:7c:c7:a8:2c:e5:a9:1b:2b:5a:
+         ba:c2:a8:13:fb:ab:37:46:61:63:69:6e:d5:80:48:ab:96:4f:
+         dd:e3:1d:95:37:35:75:db:d1:14:28:c0:0e:87:8d:95:cd:c8:
+         97:a3:2e:0b:a2:cc:cc:92:48:f2:4c:e0:69:b3:fb:e6:33:2b:
+         38:ca:d1:64:0f:f1:93:35:b8:ba:23:9c:9f:a5:ba:7d:df:74:
+         70:d2:12:b1:6a:47:b3:f4:a0:57:00:26:69:13:14:97:b9:c7:
+         43:63:39:27:75:5c:87:08:1d:a5:d2:d2:be:89:7c:1b:a7:2d:
+         92:9e:4d:60
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIDgzCCAmugAwIBAgIBBjANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
+VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI9MP/
+rplE3AcZYlkdug4T0Hi2oH/KdE+kwlzeBOLqItkoTUVUFEzoVtR7imT6+eQUI8Ct
+zCVjOFlVAFHigqyuRzva4pV5HLWWytJKPPe4esye4o3QFwu8bg48wgU6IWQA28MI
+tebPeF0rPLpUqVpkThvYOusU01qt2m/WouF+D//OcYUUx/5UZfnGR3OubpuB51XL
+fup2qEj5YiVADtHPkI9o95QgaaQUihQkUz1VuFoxrnw2dNLCLM576YNpVhbs+bt8
+sBRvlRLafLAjuF1B3LytJNm2aj+CbHSgc2ha0+TyCpO5HO67zuLYhoaO4CRY4+z1
+44Q26aZiclxLDJwVAgMBAAGjgd8wgdwwHQYDVR0OBBYEFPGp4ulYwzGt4mCbVcCi
+CoB7FRAtMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
 BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
 aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUF
+BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAPRyCMB6ZKKPmoaOYb9yBbsT5+kXnA6PPG
+VHKpjufA16dLZ5At6t7DeI0XvF5YxXrRv/20icabsZZSgx535vRAvHl+cZz4XLFT
+XYqymrJ3CRoN1FD5k+Qf1EzrAafCQiyBLDSOkAcvOW2G8vEx4PXrd5U8ZlECtNq6
+ExJIB3V3eJ3vyNfMdnR8x6gs5akbK1q6wqgT+6s3RmFjaW7VgEirlk/d4x2VNzV1
+29EUKMAOh42VzciXoy4LoszMkkjyTOBps/vmMys4ytFkD/GTNbi6I5yfpbp933Rw
+0hKxakez9KBXACZpExSXucdDYzkndVyHCB2l0tK+iXwbpy2Snk1g
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.test
similarity index 74%
copy from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.test
index 0bcea7d..dac6e90 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-digitalSignature.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: rsa-digitalSignature.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.pem
similarity index 76%
rename from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
rename to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.pem
index a79ff5c..e32e6d2 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.pem
@@ -1,12 +1,11 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a RSA key and has the single key usage keyAgreement
 
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 7 (0x7)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Intermediate
         Validity
@@ -17,28 +16,28 @@
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
+                    00:c8:f4:c3:ff:ae:99:44:dc:07:19:62:59:1d:ba:
+                    0e:13:d0:78:b6:a0:7f:ca:74:4f:a4:c2:5c:de:04:
+                    e2:ea:22:d9:28:4d:45:54:14:4c:e8:56:d4:7b:8a:
+                    64:fa:f9:e4:14:23:c0:ad:cc:25:63:38:59:55:00:
+                    51:e2:82:ac:ae:47:3b:da:e2:95:79:1c:b5:96:ca:
+                    d2:4a:3c:f7:b8:7a:cc:9e:e2:8d:d0:17:0b:bc:6e:
+                    0e:3c:c2:05:3a:21:64:00:db:c3:08:b5:e6:cf:78:
+                    5d:2b:3c:ba:54:a9:5a:64:4e:1b:d8:3a:eb:14:d3:
+                    5a:ad:da:6f:d6:a2:e1:7e:0f:ff:ce:71:85:14:c7:
+                    fe:54:65:f9:c6:47:73:ae:6e:9b:81:e7:55:cb:7e:
+                    ea:76:a8:48:f9:62:25:40:0e:d1:cf:90:8f:68:f7:
+                    94:20:69:a4:14:8a:14:24:53:3d:55:b8:5a:31:ae:
+                    7c:36:74:d2:c2:2c:ce:7b:e9:83:69:56:16:ec:f9:
+                    bb:7c:b0:14:6f:95:12:da:7c:b0:23:b8:5d:41:dc:
+                    bc:ad:24:d9:b6:6a:3f:82:6c:74:a0:73:68:5a:d3:
+                    e4:f2:0a:93:b9:1c:ee:bb:ce:e2:d8:86:86:8e:e0:
+                    24:58:e3:ec:f5:e3:84:36:e9:a6:62:72:5c:4b:0c:
+                    9c:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                F1:A9:E2:E9:58:C3:31:AD:E2:60:9B:55:C0:A2:0A:80:7B:15:10:2D
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -55,41 +54,41 @@
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         04:b2:d1:9e:cd:5e:95:39:68:6a:fc:ba:02:35:9f:da:4a:74:
+         b3:d5:09:5f:73:ea:32:49:e5:80:a5:c5:72:64:03:74:fc:b8:
+         a3:90:a6:d8:b9:aa:53:75:30:a6:73:ee:6b:5b:93:9b:b1:48:
+         19:fd:2f:14:ea:59:6a:c7:a2:ac:c7:4b:fa:97:85:72:b5:73:
+         33:6d:64:a5:0b:6e:3d:d1:bb:7a:99:58:2a:fa:f9:92:7c:99:
+         c6:0b:8e:fe:f0:af:66:da:06:06:02:4b:93:85:c9:de:0e:08:
+         3f:38:54:f8:79:0e:08:ae:bb:3f:1c:8e:ad:73:c4:74:a1:ac:
+         5f:62:cd:67:b0:ce:5f:6b:f4:ea:51:9e:f8:e1:82:50:78:af:
+         00:69:07:d3:51:5b:dc:12:6d:26:d9:59:a8:52:da:48:c7:45:
+         15:b1:6c:ba:76:41:59:93:04:5b:39:8f:78:78:37:e1:f9:92:
+         ea:16:95:fb:d4:60:79:21:1a:68:25:87:79:9a:ea:c0:dd:e6:
+         a7:9e:0c:6f:02:96:0d:f4:73:0e:d3:f5:34:52:5e:2d:21:62:
+         72:31:f2:de:f1:f9:54:25:7f:47:5a:e4:1f:26:d3:53:d2:14:
+         b8:ad:c6:47:0b:9e:2c:5d:24:90:a1:bc:83:a1:1d:ad:8b:9d:
+         cc:1b:32:cc
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIDgzCCAmugAwIBAgIBBzANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
+VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI9MP/
+rplE3AcZYlkdug4T0Hi2oH/KdE+kwlzeBOLqItkoTUVUFEzoVtR7imT6+eQUI8Ct
+zCVjOFlVAFHigqyuRzva4pV5HLWWytJKPPe4esye4o3QFwu8bg48wgU6IWQA28MI
+tebPeF0rPLpUqVpkThvYOusU01qt2m/WouF+D//OcYUUx/5UZfnGR3OubpuB51XL
+fup2qEj5YiVADtHPkI9o95QgaaQUihQkUz1VuFoxrnw2dNLCLM576YNpVhbs+bt8
+sBRvlRLafLAjuF1B3LytJNm2aj+CbHSgc2ha0+TyCpO5HO67zuLYhoaO4CRY4+z1
+44Q26aZiclxLDJwVAgMBAAGjgd8wgdwwHQYDVR0OBBYEFPGp4ulYwzGt4mCbVcCi
+CoB7FRAtMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
 BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
 aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
 dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAEstGezV6VOWhq/LoCNZ/aSnSz1Qlfc+oy
+SeWApcVyZAN0/LijkKbYuapTdTCmc+5rW5ObsUgZ/S8U6llqx6Ksx0v6l4VytXMz
+bWSlC2490bt6mVgq+vmSfJnGC47+8K9m2gYGAkuThcneDgg/OFT4eQ4Irrs/HI6t
+c8R0oaxfYs1nsM5fa/TqUZ744YJQeK8AaQfTUVvcEm0m2VmoUtpIx0UVsWy6dkFZ
+kwRbOY94eDfh+ZLqFpX71GB5IRpoJYd5murA3eanngxvApYN9HMO0/U0Ul4tIWJy
+MfLe8flUJX9HWuQfJtNT0hS4rcZHC54sXSSQobyDoR2ti53MGzLM
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.test
similarity index 77%
copy from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.test
index 0bcea7d..51333d20 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyAgreement.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: rsa-keyAgreement.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.pem
similarity index 75%
copy from net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.pem
index a79ff5c..9ae0468b 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-rsa-ku-keyagreement/chain.pem
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.pem
@@ -1,12 +1,11 @@
 [Created by: generate-chains.py]
 
-Certificate chain with 1 intermediate, a trusted root, and a target
-certificate for serverAuth that has only keyAgreement.
+Certificate chain where the target uses a RSA key and has the single key usage keyEncipherment
 
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 1 (0x1)
+        Serial Number: 8 (0x8)
     Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Intermediate
         Validity
@@ -17,28 +16,28 @@
             Public Key Algorithm: rsaEncryption
                 Public-Key: (2048 bit)
                 Modulus:
-                    00:c2:71:61:77:a3:d3:f2:28:4a:34:25:90:1c:f7:
-                    a1:1b:3f:69:d9:ff:ce:c2:4a:bd:e1:61:a1:25:5f:
-                    47:9e:61:0e:91:14:c6:b1:26:41:8c:2a:5f:6e:8c:
-                    2d:a7:89:89:55:95:58:44:6c:4f:87:6d:7b:64:77:
-                    de:1f:eb:51:ad:48:cf:16:44:93:89:1b:d7:6c:54:
-                    76:71:86:28:11:b9:bc:c5:39:72:9f:1e:6c:78:de:
-                    43:0a:d2:91:b4:65:a2:99:e1:97:f9:ef:ea:b6:71:
-                    90:c9:fd:ed:14:9a:55:ed:17:30:43:ee:45:b1:c5:
-                    03:42:74:6e:33:d9:68:f1:28:ff:7c:78:6f:84:73:
-                    39:a3:1e:53:e0:4a:ef:92:b2:53:30:83:1f:ec:08:
-                    81:60:6b:44:ea:7e:c1:c9:cc:9f:71:7d:b5:47:6d:
-                    50:05:56:28:96:39:d7:82:46:34:ad:a9:60:05:e3:
-                    e0:4c:d9:ba:a6:70:b2:cd:ba:f4:7a:09:c1:f1:bf:
-                    d0:3b:f2:46:e9:39:30:c2:d2:09:34:48:d9:1b:22:
-                    b8:ba:c6:38:29:89:9a:01:ea:9a:a2:4e:71:eb:62:
-                    3c:e3:8f:c5:e1:36:34:d0:b4:94:44:2e:c5:6b:fd:
-                    8e:6d:1d:bb:a6:9a:78:a2:60:36:c7:2c:15:64:6c:
-                    47:29
+                    00:c8:f4:c3:ff:ae:99:44:dc:07:19:62:59:1d:ba:
+                    0e:13:d0:78:b6:a0:7f:ca:74:4f:a4:c2:5c:de:04:
+                    e2:ea:22:d9:28:4d:45:54:14:4c:e8:56:d4:7b:8a:
+                    64:fa:f9:e4:14:23:c0:ad:cc:25:63:38:59:55:00:
+                    51:e2:82:ac:ae:47:3b:da:e2:95:79:1c:b5:96:ca:
+                    d2:4a:3c:f7:b8:7a:cc:9e:e2:8d:d0:17:0b:bc:6e:
+                    0e:3c:c2:05:3a:21:64:00:db:c3:08:b5:e6:cf:78:
+                    5d:2b:3c:ba:54:a9:5a:64:4e:1b:d8:3a:eb:14:d3:
+                    5a:ad:da:6f:d6:a2:e1:7e:0f:ff:ce:71:85:14:c7:
+                    fe:54:65:f9:c6:47:73:ae:6e:9b:81:e7:55:cb:7e:
+                    ea:76:a8:48:f9:62:25:40:0e:d1:cf:90:8f:68:f7:
+                    94:20:69:a4:14:8a:14:24:53:3d:55:b8:5a:31:ae:
+                    7c:36:74:d2:c2:2c:ce:7b:e9:83:69:56:16:ec:f9:
+                    bb:7c:b0:14:6f:95:12:da:7c:b0:23:b8:5d:41:dc:
+                    bc:ad:24:d9:b6:6a:3f:82:6c:74:a0:73:68:5a:d3:
+                    e4:f2:0a:93:b9:1c:ee:bb:ce:e2:d8:86:86:8e:e0:
+                    24:58:e3:ec:f5:e3:84:36:e9:a6:62:72:5c:4b:0c:
+                    9c:15
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                8B:F3:5A:A4:F4:0E:9C:EC:39:8A:A0:B0:B9:30:72:E9:8B:75:AB:71
+                F1:A9:E2:E9:58:C3:31:AD:E2:60:9B:55:C0:A2:0A:80:7B:15:10:2D
             X509v3 Authority Key Identifier: 
                 keyid:80:14:1E:04:C6:A0:C4:28:25:30:28:59:BD:40:1A:65:07:05:18:38
 
@@ -51,45 +50,45 @@
                   URI:http://url-for-crl/Intermediate.crl
 
             X509v3 Key Usage: critical
-                Key Agreement
+                Key Encipherment
             X509v3 Extended Key Usage: 
                 TLS Web Server Authentication
     Signature Algorithm: sha256WithRSAEncryption
-         87:b2:f4:c9:6e:18:e1:0e:6c:52:46:e0:b9:e3:17:9b:fa:84:
-         52:da:41:17:dd:3f:5a:f2:95:1d:d8:2f:5f:73:65:0a:85:dd:
-         62:d8:a1:86:37:f0:40:81:57:09:ff:4d:1c:37:a5:1e:a8:75:
-         fb:6a:54:3d:03:92:28:2f:8c:ab:7e:fc:bb:a4:b9:1e:35:2c:
-         7c:fe:b0:f8:87:6b:11:e4:8f:72:00:68:54:bd:5e:f3:a8:4f:
-         d3:20:58:c9:b7:96:28:9c:44:f5:16:8d:24:17:d5:19:e8:73:
-         2b:55:cf:d5:ba:cd:ac:55:e5:ab:cc:6c:2b:1d:bb:bd:5c:80:
-         c0:cb:a3:5d:99:22:c8:ca:68:22:64:55:1c:46:fd:a9:27:a2:
-         46:0c:af:17:fb:65:bc:79:24:d9:a1:06:57:ea:c6:5f:15:2b:
-         c7:45:47:1a:c0:9c:d9:90:33:37:b4:7e:e9:51:ba:7f:f5:b0:
-         6a:c9:92:13:5d:da:b4:d6:f2:90:01:c3:a9:b7:bf:19:e3:13:
-         58:a3:e3:63:6d:aa:17:cf:17:a9:c6:db:ce:30:75:5d:e2:be:
-         16:57:04:a4:74:90:78:64:92:c5:68:d2:cc:5b:14:44:a6:01:
-         52:a2:6e:be:d6:f9:b0:5b:b5:22:36:78:41:73:a9:62:1b:0f:
-         77:34:a9:21
+         17:96:62:41:5f:7c:6d:1d:be:59:39:cd:8f:8c:4b:ca:f3:14:
+         bd:84:2c:69:37:ab:f7:1c:e7:1e:2d:a2:2d:30:02:0b:6e:4d:
+         51:94:64:8c:d0:3a:d9:0e:a7:7a:7c:2b:42:3c:56:4b:f5:ad:
+         20:ca:be:af:b1:b4:a5:b5:4c:e8:2e:7d:f0:02:02:bf:d8:85:
+         07:89:e9:d8:4a:ad:2e:2f:ba:ae:34:b3:b9:7e:fb:bb:bd:e0:
+         5e:15:a8:01:43:e0:13:71:3e:aa:ca:3d:43:0c:0e:97:f6:9a:
+         b5:88:0e:73:35:17:b7:35:f7:e6:3f:b9:74:23:3c:fd:05:ed:
+         1d:45:ee:2d:27:79:37:b8:0e:b9:fb:19:f1:b6:78:47:01:b3:
+         6d:5d:72:4a:11:a7:f7:13:f8:92:a7:a6:d4:6a:72:21:df:d1:
+         63:fc:3a:aa:53:e2:a8:b7:5c:7d:92:15:ad:e5:5f:bb:80:62:
+         5b:4a:5b:5f:20:03:28:9a:dc:3d:68:2d:9e:e8:22:4a:28:5b:
+         95:3b:72:b1:7a:ba:e2:f2:94:d0:55:bb:7e:74:a0:c7:56:5e:
+         d9:92:0a:93:a5:c1:97:e0:bc:8f:4a:0b:9b:c7:6c:44:7e:0f:
+         0b:c4:db:11:e0:e7:6d:ae:d3:73:9c:34:b4:8e:cc:4e:d0:b4:
+         b0:1c:bb:f3
 -----BEGIN CERTIFICATE-----
-MIIDgzCCAmugAwIBAgIBATANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
+MIIDgzCCAmugAwIBAgIBCDANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAxJbnRl
 cm1lZGlhdGUwHhcNMTUwMTAxMTIwMDAwWhcNMTYwMTAxMTIwMDAwWjARMQ8wDQYD
-VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCcWF3
-o9PyKEo0JZAc96EbP2nZ/87CSr3hYaElX0eeYQ6RFMaxJkGMKl9ujC2niYlVlVhE
-bE+HbXtkd94f61GtSM8WRJOJG9dsVHZxhigRubzFOXKfHmx43kMK0pG0ZaKZ4Zf5
-7+q2cZDJ/e0UmlXtFzBD7kWxxQNCdG4z2WjxKP98eG+EczmjHlPgSu+SslMwgx/s
-CIFga0TqfsHJzJ9xfbVHbVAFViiWOdeCRjStqWAF4+BM2bqmcLLNuvR6CcHxv9A7
-8kbpOTDC0gk0SNkbIri6xjgpiZoB6pqiTnHrYjzjj8XhNjTQtJRELsVr/Y5tHbum
-mniiYDbHLBVkbEcpAgMBAAGjgd8wgdwwHQYDVR0OBBYEFIvzWqT0DpzsOYqgsLkw
-cumLdatxMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
+VQQDDAZUYXJnZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI9MP/
+rplE3AcZYlkdug4T0Hi2oH/KdE+kwlzeBOLqItkoTUVUFEzoVtR7imT6+eQUI8Ct
+zCVjOFlVAFHigqyuRzva4pV5HLWWytJKPPe4esye4o3QFwu8bg48wgU6IWQA28MI
+tebPeF0rPLpUqVpkThvYOusU01qt2m/WouF+D//OcYUUx/5UZfnGR3OubpuB51XL
+fup2qEj5YiVADtHPkI9o95QgaaQUihQkUz1VuFoxrnw2dNLCLM576YNpVhbs+bt8
+sBRvlRLafLAjuF1B3LytJNm2aj+CbHSgc2ha0+TyCpO5HO67zuLYhoaO4CRY4+z1
+44Q26aZiclxLDJwVAgMBAAGjgd8wgdwwHQYDVR0OBBYEFPGp4ulYwzGt4mCbVcCi
+CoB7FRAtMB8GA1UdIwQYMBaAFIAUHgTGoMQoJTAoWb1AGmUHBRg4MD8GCCsGAQUF
 BwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3VybC1mb3ItYWlhL0ludGVybWVk
 aWF0ZS5jZXIwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL3VybC1mb3ItY3JsL0lu
-dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgMIMBMGA1UdJQQMMAoGCCsGAQUF
-BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQCHsvTJbhjhDmxSRuC54xeb+oRS2kEX3T9a
-8pUd2C9fc2UKhd1i2KGGN/BAgVcJ/00cN6UeqHX7alQ9A5IoL4yrfvy7pLkeNSx8
-/rD4h2sR5I9yAGhUvV7zqE/TIFjJt5YonET1Fo0kF9UZ6HMrVc/Vus2sVeWrzGwr
-Hbu9XIDAy6NdmSLIymgiZFUcRv2pJ6JGDK8X+2W8eSTZoQZX6sZfFSvHRUcawJzZ
-kDM3tH7pUbp/9bBqyZITXdq01vKQAcOpt78Z4xNYo+NjbaoXzxepxtvOMHVd4r4W
-VwSkdJB4ZJLFaNLMWxREpgFSom6+1vmwW7UiNnhBc6liGw93NKkh
+dGVybWVkaWF0ZS5jcmwwDgYDVR0PAQH/BAQDAgUgMBMGA1UdJQQMMAoGCCsGAQUF
+BwMBMA0GCSqGSIb3DQEBCwUAA4IBAQAXlmJBX3xtHb5ZOc2PjEvK8xS9hCxpN6v3
+HOceLaItMAILbk1RlGSM0DrZDqd6fCtCPFZL9a0gyr6vsbSltUzoLn3wAgK/2IUH
+ienYSq0uL7quNLO5fvu7veBeFagBQ+ATcT6qyj1DDA6X9pq1iA5zNRe3NffmP7l0
+Izz9Be0dRe4tJ3k3uA65+xnxtnhHAbNtXXJKEaf3E/iSp6bUanIh39Fj/DqqU+Ko
+t1x9khWt5V+7gGJbSltfIAMomtw9aC2e6CJKKFuVO3Kxerri8pTQVbt+dKDHVl7Z
+kgqTpcGX4LyPSgubx2xEfg8LxNsR4OdtrtNznDS0jsxO0LSwHLvz
 -----END CERTIFICATE-----
 
 Certificate:
diff --git a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.test
similarity index 75%
copy from net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
copy to net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.test
index 0bcea7d..eaaf596c 100644
--- a/net/data/verify_certificate_chain_unittest/serverauth-ec-ku-decipheronly/main.test
+++ b/net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.test
@@ -1,4 +1,4 @@
-chain: chain.pem
+chain: rsa-keyEncipherment.pem
 last_cert_trust: TRUSTED_ANCHOR
 utc_time: 150302120000Z
 key_purpose: SERVER_AUTH