[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 570 matching lines @@
       private_key_handle.release(), blink::WebCryptoKeyTypePrivate, extractable,
       key_algorithm, private_usages);
 
   result->AssignKeyPair(public_key, private_key);
   return Status::Success();
 }
 
 Status RsaHashedAlgorithm::VerifyKeyUsagesBeforeImportKey(
     blink::WebCryptoKeyFormat format,
     blink::WebCryptoKeyUsageMask usages) const {
+  bool checkEmptyKeyUsage = true;
   switch (format) {
     case blink::WebCryptoKeyFormatSpki:
-      return CheckKeyCreationUsages(all_public_key_usages_, usages);
+      return CheckKeyCreationUsages(all_public_key_usages_, usages,
+                 checkEmptyKeyUsage);

[eroman, 2014/12/09 17:42:55]

This is incorrect.

I am losing confidence in your ability to write this change. Please test and
verify your changes before sending them for review.

     case blink::WebCryptoKeyFormatPkcs8:
-      return CheckKeyCreationUsages(all_private_key_usages_, usages);
+      return CheckKeyCreationUsages(all_private_key_usages_, usages,
+                 checkEmptyKeyUsage);
     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,
+              checkEmptyKeyUsages).IsSuccess() ||

[eroman, 2014/12/09 17:42:55]

Incorrect for the same reason as above.

+          CheckKeyCreationUsages(all_public_key_usages_, usages,
+              checkEmptyKeyUsages).IsSuccess()) {
         return Status::Success();
       }
       return Status::ErrorCreateKeyBadUsages();
     default:
       return Status::ErrorUnsupportedImportKeyFormat();
   }
 }
 
 Status RsaHashedAlgorithm::ImportKeyPkcs8(
     const CryptoData& key_data,
@@ skipping 266 matching lines @@
                  key->algorithm().rsaHashedParams()->publicExponent().size())) {
     return Status::ErrorUnexpected();
   }
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content