Consolidate some more verify_certificate_chain_unittest/ data.

net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.pem

Index: net/data/verify_certificate_chain_unittest/target-serverauth-various-keyusages/rsa-keyEncipherment.pem
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%
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-keyEncipherment.pem
index a79ff5cd4d701e54d5a2e65655f7c33de37cf278..9ae0468b0002e264e6a9d761f40c6e584c170b29 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 @@ Certificate:
             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 @@ Certificate:
                   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: