Change the WebCrypto behavior when importing EC private keys without a public key.

content/child/webcrypto/test/ecdsa_unittest.cc

 // Copyright 2014 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.
 
 #include "base/stl_util.h"
 #include "content/child/webcrypto/algorithm_dispatch.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/jwk.h"
 #include "content/child/webcrypto/status.h"
 #include "content/child/webcrypto/test/test_helpers.h"
@@ skipping 283 matching lines @@
   for (size_t test_index = 0; test_index < tests->GetSize(); ++test_index) {
     SCOPED_TRACE(test_index);
 
     const base::DictionaryValue* test;
     ASSERT_TRUE(tests->GetDictionary(test_index, &test));
 
     blink::WebCryptoNamedCurve curve = GetCurveNameFromDictionary(test);
     const base::DictionaryValue* jwk_dict;
     EXPECT_TRUE(test->GetDictionary("jwk", &jwk_dict));
     std::vector<uint8_t> jwk_bytes = MakeJsonVector(*jwk_dict);
-    std::vector<uint8_t> pkcs8_bytes = GetBytesFromHexString(test, "pkcs8");
+    std::vector<uint8_t> pkcs8_bytes = GetBytesFromHexString(
+        test, test->HasKey("exported_pkcs8") ? "exported_pkcs8" : "pkcs8");
 
     // -------------------------------------------------
     // Test from JWK, and then export to {JWK, PKCS8}
     // -------------------------------------------------
 
     // Import the key using JWK
     blink::WebCryptoKey key;
     ASSERT_EQ(Status::Success(),
               ImportKey(blink::WebCryptoKeyFormatJwk, CryptoData(jwk_bytes),
                         CreateEcdsaImportAlgorithm(curve), true,
@@ skipping 23 matching lines @@
 
     // Export the key as PKCS8
     ASSERT_EQ(Status::Success(),
               ExportKey(blink::WebCryptoKeyFormatPkcs8, key, &exported_bytes));
     EXPECT_EQ(CryptoData(pkcs8_bytes), CryptoData(exported_bytes));
 
     // -------------------------------------------------
     // Test from PKCS8, and then export to {JWK, PKCS8}
     // -------------------------------------------------
 
+    // The imported PKCS8 bytes may differ from the exported bytes (in the case
+    // where the publicKey was missing, it will be synthesized and written back
+    // during export).
+    std::vector<uint8_t> pkcs8_input_bytes = GetBytesFromHexString(
+        test, test->HasKey("original_pkcs8") ? "original_pkcs8" : "pkcs8");
+    CryptoData pkcs8_input_data(pkcs8_input_bytes.empty() ? pkcs8_bytes
+                                                          : pkcs8_input_bytes);
+
     // Import the key using PKCS8
     ASSERT_EQ(Status::Success(),
-              ImportKey(blink::WebCryptoKeyFormatPkcs8, CryptoData(pkcs8_bytes),
+              ImportKey(blink::WebCryptoKeyFormatPkcs8, pkcs8_input_data,
                         CreateEcdsaImportAlgorithm(curve), true,
                         blink::WebCryptoKeyUsageSign, &key));
 
     // Export the key as PKCS8
     ASSERT_EQ(Status::Success(),
               ExportKey(blink::WebCryptoKeyFormatPkcs8, key, &exported_bytes));
     EXPECT_EQ(CryptoData(pkcs8_bytes), CryptoData(exported_bytes));
 
     // Export the key as JWK
     ASSERT_EQ(Status::Success(),
               ExportKey(blink::WebCryptoKeyFormatJwk, key, &exported_bytes));
     EXPECT_EQ(CryptoData(jwk_bytes), CryptoData(exported_bytes));
   }
 }
 
 }  // namespace
 
 }  // namespace webcrypto
 
 }  // namespace content