commit 0bb976e4a86cd456a35d861e7fb7f9e9a729a1a5
author eroman <eroman@chromium.org> Wed Aug 03 06:36:38 2016
committer Commit bot <commit-bot@chromium.org> Wed Aug 03 06:38:36 2016
tree cc8abf9c5416696171980cd2d5053bde42d9f118
parent 248909e76eda5a15bec1969df6c690af1bd2b148

[webcrypto] Check for empty key usages *after* key creation rather than before, to match the spec's order of failures.

This affects:
  * importKey()
  * generateKey()
  * unwrapKey()

This also removes a "fail-fast optimization" on key usage when importing JWK asymmetric keys, as that was not supported by the spec.

BUG=611801

Review-Url: https://codereview.chromium.org/2163053002
Cr-Commit-Position: refs/heads/master@{#409471}

components/webcrypto/algorithms/aes.cc

diff --git a/components/webcrypto/algorithms/aes.cc b/components/webcrypto/algorithms/aes.cc
index 7ba9a50..f46ea15a 100644
--- a/components/webcrypto/algorithms/aes.cc
+++ b/components/webcrypto/algorithms/aes.cc
@@ -8,6 +8,7 @@
 
 #include "base/logging.h"
 #include "components/webcrypto/algorithms/secret_key_util.h"
+#include "components/webcrypto/algorithms/util.h"
 #include "components/webcrypto/blink_key_handle.h"
 #include "components/webcrypto/crypto_data.h"
 #include "components/webcrypto/jwk.h"
@@ -59,7 +60,7 @@
                                  bool extractable,
                                  blink::WebCryptoKeyUsageMask usages,
                                  GenerateKeyResult* result) const {
-  Status status = CheckSecretKeyCreationUsages(all_key_usages_, usages);
+  Status status = CheckKeyCreationUsages(all_key_usages_, usages);
   if (status.IsError())
     return status;
 
@@ -77,23 +78,44 @@
       extractable, usages, keylen_bits, result);
 }
 
-Status AesAlgorithm::VerifyKeyUsagesBeforeImportKey(
-    blink::WebCryptoKeyFormat format,
-    blink::WebCryptoKeyUsageMask usages) const {
+Status AesAlgorithm::ImportKey(blink::WebCryptoKeyFormat format,
+                               const CryptoData& key_data,
+                               const blink::WebCryptoAlgorithm& algorithm,
+                               bool extractable,
+                               blink::WebCryptoKeyUsageMask usages,
+                               blink::WebCryptoKey* key) const {
   switch (format) {
     case blink::WebCryptoKeyFormatRaw:
+      return ImportKeyRaw(key_data, algorithm, extractable, usages, key);
     case blink::WebCryptoKeyFormatJwk:
-      return CheckSecretKeyCreationUsages(all_key_usages_, usages);
+      return ImportKeyJwk(key_data, algorithm, extractable, usages, key);
     default:
       return Status::ErrorUnsupportedImportKeyFormat();
   }
 }
 
+Status AesAlgorithm::ExportKey(blink::WebCryptoKeyFormat format,
+                               const blink::WebCryptoKey& key,
+                               std::vector<uint8_t>* buffer) const {
+  switch (format) {
+    case blink::WebCryptoKeyFormatRaw:
+      return ExportKeyRaw(key, buffer);
+    case blink::WebCryptoKeyFormatJwk:
+      return ExportKeyJwk(key, buffer);
+    default:
+      return Status::ErrorUnsupportedExportKeyFormat();
+  }
+}
+
 Status AesAlgorithm::ImportKeyRaw(const CryptoData& key_data,
                                   const blink::WebCryptoAlgorithm& algorithm,
                                   bool extractable,
                                   blink::WebCryptoKeyUsageMask usages,
                                   blink::WebCryptoKey* key) const {
+  Status status = CheckKeyCreationUsages(all_key_usages_, usages);
+  if (status.IsError())
+    return status;
+
   const unsigned int keylen_bytes = key_data.byte_length();
 
   // 192-bit AES is intentionally unsupported (http://crbug.com/533699).
@@ -117,10 +139,14 @@
                                   bool extractable,
                                   blink::WebCryptoKeyUsageMask usages,
                                   blink::WebCryptoKey* key) const {
+  Status status = CheckKeyCreationUsages(all_key_usages_, usages);
+  if (status.IsError())
+    return status;
+
   std::vector<uint8_t> raw_data;
   JwkReader jwk;
-  Status status = ReadSecretKeyNoExpectedAlgJwk(key_data, extractable, usages,
-                                                &raw_data, &jwk);
+  status = ReadSecretKeyNoExpectedAlgJwk(key_data, extractable, usages,
+                                         &raw_data, &jwk);
   if (status.IsError())
     return status;