[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/test/aes_cbc_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/status.h"
 #include "content/child/webcrypto/test/test_helpers.h"
 #include "content/child/webcrypto/webcrypto_util.h"
@@ skipping 177 matching lines @@
   }
 }
 
 TEST(WebCryptoAesCbcTest, GenerateKeyBadLength) {
   const unsigned short kKeyLen[] = {0, 127, 257};
   blink::WebCryptoKey key;
   for (size_t i = 0; i < arraysize(kKeyLen); ++i) {
     SCOPED_TRACE(i);
     EXPECT_EQ(Status::ErrorGenerateAesKeyLength(),
               GenerateSecretKey(CreateAesCbcKeyGenAlgorithm(kKeyLen[i]), true,
-                                0, &key));
+                                blink::WebCryptoKeyUsageEncrypt, &key));
   }
 }
 
+TEST(WebCryptoAesCbcTest, ImportKeyEmptyUsage) {
+  blink::WebCryptoKey key;
+  ASSERT_EQ(Status::ErrorCreateKeyEmptyUsages(),
+            ImportKey(blink::WebCryptoKeyFormatRaw,
+                      CryptoData(std::vector<uint8_t>(16)),
+                      CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc),
+                      true, 0, &key));
+}
+
 // If key_ops is specified but empty, no key usages are allowed for the key.
 TEST(WebCryptoAesCbcTest, ImportKeyJwkEmptyKeyOps) {
   blink::WebCryptoKey key;
   base::DictionaryValue dict;
   dict.SetString("kty", "oct");
   dict.SetBoolean("ext", false);
   dict.SetString("k", "GADWrMRHwQfoNaXU5fZvTg");
   dict.Set("key_ops", new base::ListValue);  // Takes ownership.
 
-  EXPECT_EQ(Status::Success(),
-            ImportKeyJwkFromDict(
-                dict, CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc), false,
-                0, &key));
-
-  EXPECT_EQ(0, key.usages());
-
   // The JWK does not contain encrypt usages.
   EXPECT_EQ(Status::ErrorJwkKeyopsInconsistent(),
             ImportKeyJwkFromDict(
                 dict, CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc), false,
                 blink::WebCryptoKeyUsageEncrypt, &key));
 
   // The JWK does not contain sign usage (nor is it applicable).
   EXPECT_EQ(Status::ErrorCreateKeyBadUsages(),
             ImportKeyJwkFromDict(
                 dict, CreateAlgorithm(blink::WebCryptoAlgorithmIdAesCbc), false,
@@ skipping 298 matching lines @@
   // Unwrap the key pair.
   blink::WebCryptoAlgorithm rsa_import_algorithm =
       CreateRsaHashedImportAlgorithm(blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
                                      blink::WebCryptoAlgorithmIdSha256);
 
   blink::WebCryptoKey unwrapped_public_key;
 
   ASSERT_EQ(
       Status::Success(),
       UnwrapKey(blink::WebCryptoKeyFormatSpki, CryptoData(wrapped_public_key),
-                wrapping_key, wrap_algorithm, rsa_import_algorithm, true, 0,
-                &unwrapped_public_key));
+                wrapping_key, wrap_algorithm, rsa_import_algorithm, true,
+                blink::WebCryptoKeyUsageVerify, &unwrapped_public_key));
 
   blink::WebCryptoKey unwrapped_private_key;
 
   ASSERT_EQ(
       Status::Success(),
       UnwrapKey(blink::WebCryptoKeyFormatPkcs8, CryptoData(wrapped_private_key),
                 wrapping_key, wrap_algorithm, rsa_import_algorithm, true,
                 blink::WebCryptoKeyUsageSign, &unwrapped_private_key));
 
   // Export unwrapped key pair as SPKI + PKCS8
@@ skipping 12 matching lines @@
 
   EXPECT_NE(public_key_spki, wrapped_public_key);
   EXPECT_NE(private_key_pkcs8, wrapped_private_key);
 }
 
 }  // namespace
 
 }  // namespace webcrypto
 
 }  // namespace content