[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/nss/hmac_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 <cryptohi.h>
 #include <pk11pub.h>
 #include <secerr.h>
 #include <sechash.h>
 
 #include "base/logging.h"
@@ skipping 41 matching lines @@
 }
 
 class HmacImplementation : public AlgorithmImplementation {
  public:
   HmacImplementation() {}
 
   Status GenerateKey(const blink::WebCryptoAlgorithm& algorithm,
                      bool extractable,
                      blink::WebCryptoKeyUsageMask usages,
                      GenerateKeyResult* result) const override {
-    Status status = CheckKeyCreationUsages(kAllKeyUsages, usages);
+    Status status = CheckKeyCreationUsages(kAllKeyUsages, usages, false);

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

Same here.

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

Done.

     if (status.IsError())
       return status;
 
     const blink::WebCryptoHmacKeyGenParams* params =
         algorithm.hmacKeyGenParams();
 
     const blink::WebCryptoAlgorithm& hash = params->hash();
     CK_MECHANISM_TYPE mechanism = CKM_INVALID_MECHANISM;
     if (!WebCryptoHashToHMACMechanism(hash, &mechanism))
       return Status::ErrorUnsupported();
 
     unsigned int keylen_bits = 0;
     status = GetHmacKeyGenLengthInBits(params, &keylen_bits);
     if (status.IsError())
       return status;
 
     return GenerateSecretKeyNss(
         blink::WebCryptoKeyAlgorithm::createHmac(hash.id(), keylen_bits),
         extractable, usages, keylen_bits / 8, mechanism, result);
   }
 
   Status VerifyKeyUsagesBeforeImportKey(
       blink::WebCryptoKeyFormat format,
       blink::WebCryptoKeyUsageMask usages) const override {
     switch (format) {
       case blink::WebCryptoKeyFormatRaw:
       case blink::WebCryptoKeyFormatJwk:
-        return CheckKeyCreationUsages(kAllKeyUsages, usages);
+        return CheckKeyCreationUsages(kAllKeyUsages, usages, true);
       default:
         return Status::ErrorUnsupportedImportKeyFormat();
     }
   }
 
   Status ImportKeyRaw(const CryptoData& key_data,
                       const blink::WebCryptoAlgorithm& algorithm,
                       bool extractable,
                       blink::WebCryptoKeyUsageMask usages,
                       blink::WebCryptoKey* key) const override {
@@ skipping 135 matching lines @@
 
 }  // namespace
 
 AlgorithmImplementation* CreatePlatformHmacImplementation() {
   return new HmacImplementation;
 }
 
 }  // namespace webcrypto
 
 }  // namespace content