[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/webcrypto_util.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 "content/child/webcrypto/webcrypto_util.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 211 matching lines @@
     return Status::Success();
 
   // BoringSSL does not support 192-bit AES.
   if (keylen_bytes == 24)
     return Status::ErrorAes192BitUnsupported();
 
   return Status::ErrorImportAesKeyLength();
 }
 
 Status CheckKeyCreationUsages(blink::WebCryptoKeyUsageMask all_possible_usages,
-                              blink::WebCryptoKeyUsageMask actual_usages) {
+                              blink::WebCryptoKeyUsageMask actual_usages,
+                              bool check_usage) {

[eroman, 2014/12/09 21:04:46]

This is poorly named -- the entire purpose of this function is in fact to check
usages.

|allow_empty_usages| for example would be a better name.

[Habib Virji, 2014/12/15 18:48:56]

Done.

+  // In case import key calls this function, it checks for empty usage

[eroman, 2014/12/09 21:04:46]

This comment is unnecessary (will apply to both importKey and generateKey)

[Habib Virji, 2014/12/15 18:48:56]

Removed

+  if (check_usage && actual_usages == 0)
+    return Status::ErrorImportKeyEmptyUsages();
+
   if (!ContainsKeyUsages(all_possible_usages, actual_usages))
     return Status::ErrorCreateKeyBadUsages();
   return Status::Success();
 }
 
 Status GetRsaKeyGenParameters(
     const blink::WebCryptoRsaHashedKeyGenParams* params,
     unsigned int* public_exponent,
     unsigned int* modulus_length_bits) {
   *modulus_length_bits = params->modulusLengthBits();
@@ skipping 15 matching lines @@
   // avoid feeding OpenSSL data that will hang use a whitelist.
   if (*public_exponent != 3 && *public_exponent != 65537)
     return Status::ErrorGenerateKeyPublicExponent();
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content