[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/openssl/ec_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/ec_key_openssl.h"
 
 #include <openssl/ec.h>
 #include <openssl/ec_key.h>
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
@@ skipping 265 matching lines @@
     return status;
 
   result->AssignKeyPair(public_key, private_key);
   return Status::Success();
 }
 
 // TODO(eroman): This is identical to RSA.
 Status EcAlgorithm::VerifyKeyUsagesBeforeImportKey(
     blink::WebCryptoKeyFormat format,
     blink::WebCryptoKeyUsageMask usages) const {
+  bool checkEmptyUsage = true;

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

Same comment as earlier.

   switch (format) {
     case blink::WebCryptoKeyFormatSpki:
-      return CheckKeyCreationUsages(all_public_key_usages_, usages);
+      return CheckKeyCreationUsages(all_public_key_usages_, usages,
+                 checkEmptyUsage);
     case blink::WebCryptoKeyFormatPkcs8:
-      return CheckKeyCreationUsages(all_private_key_usages_, usages);
+      return CheckKeyCreationUsages(all_private_key_usages_, usages,
+                 checkEmptyUsage);
     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,
+              checkEmptyUsage).IsSuccess() ||
+          CheckKeyCreationUsages(all_public_key_usages_, usages,
+              checkEmptyUsage).IsSuccess()) {
         return Status::Success();
       }
       return Status::ErrorCreateKeyBadUsages();
     default:
       return Status::ErrorUnsupportedImportKeyFormat();
   }
 }
 
 Status EcAlgorithm::ImportKeyPkcs8(const CryptoData& key_data,
                                    const blink::WebCryptoAlgorithm& algorithm,
@@ skipping 264 matching lines @@
       key->algorithm().ecParams()->namedCurve()) {
     return Status::ErrorUnexpected();
   }
 
   return Status::Success();
 }
 
 }  // namespace webcrypto
 
 }  // namespace content