[WebCrypto] Throw syntaxError if keyUsage is empty in ImportKey

content/child/webcrypto/test/rsa_ssa_unittest.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 "base/logging.h"
 #include "base/stl_util.h"
 #include "content/child/webcrypto/algorithm_dispatch.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/status.h"
 #include "content/child/webcrypto/test/test_helpers.h"
@@ skipping 805 matching lines @@
   blink::WebCryptoKey private_key;
 
   ASSERT_EQ(Status::ErrorCreateKeyEmptyUsages(),
             GenerateKeyPair(CreateRsaHashedKeyGenAlgorithm(
                                 blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
                                 blink::WebCryptoAlgorithmIdSha256,
                                 modulus_length, public_exponent),
                             true, 0, &public_key, &private_key));
 }
 
+TEST(WebCryptoRsaSsaTest, ImportKeyEmptyUsages) {

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

Could you also add the same sort of test to ecdh_unittest.cc.

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

Added test.

+  blink::WebCryptoKey key;
+  // Public without usage does not throw error.
+  ASSERT_EQ(Status::Success(),
+            ImportKey(blink::WebCryptoKeyFormatSpki,
+                      CryptoData(HexStringToBytes(kPublicKeySpkiDerHex)),
+                      CreateRsaHashedImportAlgorithm(
+                          blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                          blink::WebCryptoAlgorithmIdSha256),
+                      true, 0, &key));
+  // Private key usage will generate error.

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

Could you add two more tests for JWK:
  (1) Import a JWK public key with empty usages (OK)
  (2) Import a JWK private key with empty usages (fails)

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

Done. Have done export key and import key as jwk. Bit extra steps, but getting
jwk structure looked bit more complicated.

+  ASSERT_EQ(Status::ErrorImportKeyEmptyUsages(),
+            ImportKey(blink::WebCryptoKeyFormatPkcs8,
+                      CryptoData(HexStringToBytes(kPrivateKeyPkcs8DerHex)),
+                      CreateRsaHashedImportAlgorithm(
+                          blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5,
+                          blink::WebCryptoAlgorithmIdSha1),
+                      true, 0, &key));
+
+}
+
 TEST(WebCryptoRsaSsaTest, ImportExportJwkRsaPublicKey) {
   struct TestCase {
     const blink::WebCryptoAlgorithmId hash;
     const blink::WebCryptoKeyUsageMask usage;
     const char* const jwk_alg;
   };
   const TestCase kTests[] = {
       {blink::WebCryptoAlgorithmIdSha1, blink::WebCryptoKeyUsageVerify, "RS1"},
       {blink::WebCryptoAlgorithmIdSha256,
        blink::WebCryptoKeyUsageVerify,
@@ skipping 148 matching lines @@
                               true, usages, &key);
     EXPECT_EQ(test_error, StatusToString(status));
   }
 }
 
 }  // namespace
 
 }  // namespace webcrypto
 
 }  // namespace content