[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/nss/rsa_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/rsa_key_nss.h"
 
 #include <secasn1.h>
 
 #include "base/logging.h"
 #include "content/child/webcrypto/crypto_data.h"
@@ skipping 486 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);

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

I am proposing a refactor in:

https://codereview.chromium.org/786363002/diff/1/content/child/webcrypto/webc...

Which will simplify the number of updates you need to do for this (will just
have to update the one function rather than 3)

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

Adapted to your changes.

   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 65 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() ||

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

I am proposing a refactor in https://codereview.chromium.org/787123003/ which
will reduce the number of places you need to update.

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

Adapted to your changes.

+          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 144 matching lines @@
 
   JwkRsaInfo jwk;
   Status status =
       ReadRsaKeyJwk(key_data, jwk_algorithm, extractable, usages, &jwk);
   if (status.IsError())
     return status;
 
   // Once the key type is known, verify the usages.
   status = CheckKeyCreationUsages(
       jwk.is_private_key ? all_private_key_usages_ : all_public_key_usages_,
-      usages);
+      usages, jwk.is_private_key ? true : false);

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

This is already a bool no need for ternary operator.

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

Corrected.

   if (status.IsError())
     return Status::ErrorCreateKeyBadUsages();

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

On a side note, I wander whey this isn't just "return status"

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

Adapted to just return status.

 
   return jwk.is_private_key
              ? ImportRsaPrivateKey(algorithm, extractable, usages, jwk, key)
              : ImportRsaPublicKey(algorithm, extractable, usages,
                                   CryptoData(jwk.n), CryptoData(jwk.e), key);
 }
 
 Status RsaHashedAlgorithm::ExportKeyJwk(const blink::WebCryptoKey& key,
                                         std::vector<uint8_t>* buffer) const {
   const char* jwk_algorithm =
@@ skipping 99 matching lines @@
                  key->algorithm().rsaHashedParams()->publicExponent().size())) {
     return Status::ErrorUnexpected();
   }
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content