[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/nss/aes_key_nss.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/nss/aes_key_nss.h"
 
 #include "base/logging.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/jwk.h"
 #include "content/child/webcrypto/nss/key_nss.h"
@@ skipping 24 matching lines @@
                       blink::WebCryptoKeyUsageDecrypt |
                       blink::WebCryptoKeyUsageWrapKey |
                       blink::WebCryptoKeyUsageUnwrapKey),
       jwk_suffix_(jwk_suffix) {
 }
 
 Status AesAlgorithm::GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
                                  bool extractable,
                                  blink::WebCryptoKeyUsageMask usages,
                                  GenerateKeyResult* result) const {
-  Status status = CheckKeyCreationUsages(all_key_usages_, usages);
+  Status status = CheckKeyCreationUsages(all_key_usages_, usages, false);

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

This may as well just pass true, and then remove the check in
GenerateSecretKeyNss/GenerateSecretKeyOpenssl

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

Done.

   if (status.IsError())
     return status;
 
   unsigned int keylen_bits;
   status = GetAesKeyGenLengthInBits(algorithm.aesKeyGenParams(), &keylen_bits);
   if (status.IsError())
     return status;
 
   return GenerateSecretKeyNss(
       blink::WebCryptoKeyAlgorithm::createAes(algorithm.id(), keylen_bits),
       extractable, usages, keylen_bits / 8, CKM_AES_KEY_GEN, result);
 }
 
 Status AesAlgorithm::VerifyKeyUsagesBeforeImportKey(
     blink::WebCryptoKeyFormat format,
     blink::WebCryptoKeyUsageMask usages) const {
   switch (format) {
     case blink::WebCryptoKeyFormatRaw:
     case blink::WebCryptoKeyFormatJwk:
-      return CheckKeyCreationUsages(all_key_usages_, usages);
+      return CheckKeyCreationUsages(all_key_usages_, usages, true);
     default:
       return Status::ErrorUnsupportedImportKeyFormat();
   }
 }
 Status AesAlgorithm::ImportKeyRaw(const CryptoData& key_data,
                                   const blink::WebCryptoAlgorithm& algorithm,
                                   bool extractable,
                                   blink::WebCryptoKeyUsageMask usages,
                                   blink::WebCryptoKey* key) const {
   const unsigned int keylen_bytes = key_data.byte_length();
@@ skipping 57 matching lines @@
     blink::WebCryptoKeyUsageMask usages,
     const CryptoData& key_data,
     blink::WebCryptoKey* key) const {
   return ImportKeyRaw(key_data, CreateAlgorithm(algorithm.id()), extractable,
                       usages, key);
 }
 
 }  // namespace webcrypto
 
 }  // namespace content