[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/openssl/rsa_key_openssl.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/openssl/rsa_key_openssl.h"
 
 #include <openssl/evp.h>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 140 matching lines @@
 }
 
 }  // namespace
 
 Status RsaHashedAlgorithm::GenerateKey(
     const blink::WebCryptoAlgorithm& algorithm,
     bool extractable,
     blink::WebCryptoKeyUsageMask combined_usages,
     GenerateKeyResult* result) const {
   Status status = CheckKeyCreationUsages(
-      all_public_key_usages_ | all_private_key_usages_, combined_usages);
+      all_public_key_usages_ | all_private_key_usages_, combined_usages, false);
   if (status.IsError())
     return status;
 
   const blink::WebCryptoKeyUsageMask public_usages =
       combined_usages & all_public_key_usages_;
   const blink::WebCryptoKeyUsageMask private_usages =
       combined_usages & all_private_key_usages_;
 
   if (private_usages == 0)
     return Status::ErrorCreateKeyEmptyUsages();
@@ skipping 57 matching lines @@
 
   result->AssignKeyPair(public_key, private_key);
   return Status::Success();
 }
 
 Status RsaHashedAlgorithm::VerifyKeyUsagesBeforeImportKey(
     blink::WebCryptoKeyFormat format,
     blink::WebCryptoKeyUsageMask usages) const {
   switch (format) {
     case blink::WebCryptoKeyFormatSpki:
-      return CheckKeyCreationUsages(all_public_key_usages_, usages);
+      return CheckKeyCreationUsages(all_public_key_usages_, usages, false);
     case blink::WebCryptoKeyFormatPkcs8:
-      return CheckKeyCreationUsages(all_private_key_usages_, usages);
+      return CheckKeyCreationUsages(all_private_key_usages_, usages, true);
     case blink::WebCryptoKeyFormatJwk:
       // The JWK could represent either a public key or private key. The usages
       // must make sense for one of the two. The usages will be checked again by
       // ImportKeyJwk() once the key type has been determined.
-      if (CheckKeyCreationUsages(all_private_key_usages_, usages).IsSuccess() ||
-          CheckKeyCreationUsages(all_public_key_usages_, usages).IsSuccess()) {
+      if (CheckKeyCreationUsages(
+              all_private_key_usages_, usages, true).IsSuccess() ||
+          CheckKeyCreationUsages(
+              all_public_key_usages_, usages, false).IsSuccess()) {
         return Status::Success();
       }
       return Status::ErrorCreateKeyBadUsages();
     default:
       return Status::ErrorUnsupportedImportKeyFormat();
   }
 }
 
 Status RsaHashedAlgorithm::ImportKeyPkcs8(
     const CryptoData& key_data,
@@ skipping 186 matching lines @@
                  key->algorithm().rsaHashedParams()->publicExponent().size())) {
     return Status::ErrorUnexpected();
   }
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content