[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/test/rsa_ssa_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/logging.h"
 #include "base/stl_util.h"
 #include "content/child/webcrypto/algorithm_dispatch.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/status.h"
 #include "content/child/webcrypto/test/test_helpers.h"
@@ skipping 805 matching lines @@
   blink::WebCryptoKey private_key;
 
   ASSERT_EQ(Status::ErrorCreateKeyEmptyUsages(),
             GenerateKeyPair(CreateRsaHashedKeyGenAlgorithm(
                                 blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
                                 blink::WebCryptoAlgorithmIdSha256,
                                 modulus_length, public_exponent),
                             true, 0, &public_key, &private_key));
 }
 
+TEST(WebCryptoRsaSsaTest, ImportKeyEmptyUsages) {

[eroman, 2014/12/17 01:23:51]

Add a test for

if (!SupportsRsaPrivateKeyImport())
  return;

[Habib Virji, 2014/12/17 15:41:54]

Done.

+  blink::WebCryptoKey public_key;
+  blink::WebCryptoKey private_key;
+  blink::WebCryptoKey key;

[eroman, 2014/12/17 01:23:51]

It is unclear what this variable means. Can you instead re-use private_key
later?

[Habib Virji, 2014/12/17 15:41:54]

Done.

+
+  // Public without usage does not throw an error.
+  ASSERT_EQ(Status::Success(),

[eroman, 2014/12/17 01:23:51]

It would be good if each of these successful ImportKey() were followed by a
verification of the usages. Something like:

EXPECT_EQ(0, public_key.usages());

[Habib Virji, 2014/12/17 15:41:54]

Done.

+            ImportKey(blink::WebCryptoKeyFormatSpki,
+                      CryptoData(HexStringToBytes(kPublicKeySpkiDerHex)),
+                      CreateRsaHashedImportAlgorithm(
+                          blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                          blink::WebCryptoAlgorithmIdSha256),
+                      true, 0, &public_key));
+
+  // Private empty usage will throw an error.
+  ASSERT_EQ(Status::ErrorCreateKeyEmptyUsages(),
+            ImportKey(blink::WebCryptoKeyFormatPkcs8,
+                      CryptoData(HexStringToBytes(kPrivateKeyPkcs8DerHex)),
+                      CreateRsaHashedImportAlgorithm(
+                          blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                          blink::WebCryptoAlgorithmIdSha1),
+                      true, 0, &private_key));
+
+  std::vector<uint8_t> public_jwk;
+  ASSERT_EQ(Status::Success(),
+            ExportKey(blink::WebCryptoKeyFormatJwk, public_key, &public_jwk));
+
+  ASSERT_EQ(Status::Success(),
+            ImportKey(blink::WebCryptoKeyFormatJwk,
+                      CryptoData(public_jwk),
+                      CreateRsaHashedImportAlgorithm(
+                          blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                          blink::WebCryptoAlgorithmIdSha256),
+                      true, 0, &key));
+
+  // With correct usage to get correct imported private_key
+  std::vector<uint8_t> private_jwk;
+  ImportKey(blink::WebCryptoKeyFormatPkcs8,
+            CryptoData(HexStringToBytes(kPrivateKeyPkcs8DerHex)),
+            CreateRsaHashedImportAlgorithm(
+                 blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                 blink::WebCryptoAlgorithmIdSha1),
+            true, blink::WebCryptoKeyUsageSign, &private_key);
+
+  ASSERT_EQ(Status::Success(),
+            ExportKey(blink::WebCryptoKeyFormatJwk, private_key, &private_jwk));
+
+  ASSERT_EQ(Status::ErrorCreateKeyEmptyUsages(),
+            ImportKey(blink::WebCryptoKeyFormatJwk,
+                CryptoData(private_jwk),
+                CreateRsaHashedImportAlgorithm(
+                    blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                    blink::WebCryptoAlgorithmIdSha1),
+                true, 0, &key));
+}
+
 TEST(WebCryptoRsaSsaTest, ImportExportJwkRsaPublicKey) {
   struct TestCase {
     const blink::WebCryptoAlgorithmId hash;
     const blink::WebCryptoKeyUsageMask usage;
     const char* const jwk_alg;
   };
   const TestCase kTests[] = {
       {blink::WebCryptoAlgorithmIdSha1, blink::WebCryptoKeyUsageVerify, "RS1"},
       {blink::WebCryptoAlgorithmIdSha256,
        blink::WebCryptoKeyUsageVerify,
@@ skipping 148 matching lines @@
                               true, usages, &key);
     EXPECT_EQ(test_error, StatusToString(status));
   }
 }
 
 }  // namespace
 
 }  // namespace webcrypto
 
 }  // namespace content