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

components/webcrypto/algorithm_implementation.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 "components/webcrypto/algorithm_implementation.h"
 
 #include "components/webcrypto/blink_key_handle.h"
 #include "components/webcrypto/status.h"
 
 namespace webcrypto {
@@ skipping 57 matching lines @@
   return Status::ErrorUnsupported();
 }
 
 Status AlgorithmImplementation::GetKeyLength(
     const blink::WebCryptoAlgorithm& key_length_algorithm,
     bool* has_length_bits,
     unsigned int* length_bits) const {
   return Status::ErrorUnsupported();
 }
 
-Status AlgorithmImplementation::VerifyKeyUsagesBeforeImportKey(
-    blink::WebCryptoKeyFormat format,
-    blink::WebCryptoKeyUsageMask usages) const {
-  return Status::ErrorUnsupportedImportKeyFormat();
-}
-
 Status AlgorithmImplementation::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::WebCryptoKeyFormatSpki:
-      return ImportKeySpki(key_data, algorithm, extractable, usages, key);
-    case blink::WebCryptoKeyFormatPkcs8:
-      return ImportKeyPkcs8(key_data, algorithm, extractable, usages, key);
-    case blink::WebCryptoKeyFormatJwk:
-      return ImportKeyJwk(key_data, algorithm, extractable, usages, key);
-    default:
-      return Status::ErrorUnsupported();
-  }
-}
-
-Status AlgorithmImplementation::ImportKeyRaw(
-    const CryptoData& key_data,
-    const blink::WebCryptoAlgorithm& algorithm,
-    bool extractable,
-    blink::WebCryptoKeyUsageMask usages,
-    blink::WebCryptoKey* key) const {
-  return Status::ErrorUnsupportedImportKeyFormat();
-}
-
-Status AlgorithmImplementation::ImportKeyPkcs8(
-    const CryptoData& key_data,
-    const blink::WebCryptoAlgorithm& algorithm,
-    bool extractable,
-    blink::WebCryptoKeyUsageMask usages,
-    blink::WebCryptoKey* key) const {
-  return Status::ErrorUnsupportedImportKeyFormat();
-}
-
-Status AlgorithmImplementation::ImportKeySpki(
-    const CryptoData& key_data,
-    const blink::WebCryptoAlgorithm& algorithm,
-    bool extractable,
-    blink::WebCryptoKeyUsageMask usages,
-    blink::WebCryptoKey* key) const {
-  return Status::ErrorUnsupportedImportKeyFormat();
-}
-
-Status AlgorithmImplementation::ImportKeyJwk(
-    const CryptoData& key_data,
-    const blink::WebCryptoAlgorithm& algorithm,
-    bool extractable,
-    blink::WebCryptoKeyUsageMask usages,
-    blink::WebCryptoKey* key) const {
-  return Status::ErrorUnsupportedImportKeyFormat();
+  return Status::ErrorUnsupported();
 }
 
 Status AlgorithmImplementation::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::WebCryptoKeyFormatSpki:
-      return ExportKeySpki(key, buffer);
-    case blink::WebCryptoKeyFormatPkcs8:
-      return ExportKeyPkcs8(key, buffer);
-    case blink::WebCryptoKeyFormatJwk:
-      return ExportKeyJwk(key, buffer);
-    default:
-      return Status::ErrorUnsupported();
-  }
-}
-
-Status AlgorithmImplementation::ExportKeyRaw(
-    const blink::WebCryptoKey& key,
-    std::vector<uint8_t>* buffer) const {
-  return Status::ErrorUnsupportedExportKeyFormat();
-}
-
-Status AlgorithmImplementation::ExportKeyPkcs8(
-    const blink::WebCryptoKey& key,
-    std::vector<uint8_t>* buffer) const {
-  return Status::ErrorUnsupportedExportKeyFormat();
-}
-
-Status AlgorithmImplementation::ExportKeySpki(
-    const blink::WebCryptoKey& key,
-    std::vector<uint8_t>* buffer) const {
-  return Status::ErrorUnsupportedExportKeyFormat();
-}
-
-Status AlgorithmImplementation::ExportKeyJwk(
-    const blink::WebCryptoKey& key,
-    std::vector<uint8_t>* buffer) const {
-  return Status::ErrorUnsupportedExportKeyFormat();
+  return Status::ErrorUnsupported();
 }
 
 Status AlgorithmImplementation::SerializeKeyForClone(
     const blink::WebCryptoKey& key,
     blink::WebVector<uint8_t>* key_data) const {
   *key_data = GetSerializedKeyData(key);
   return Status::Success();
 }
 
 Status AlgorithmImplementation::DeserializeKeyForClone(
     const blink::WebCryptoKeyAlgorithm& algorithm,
     blink::WebCryptoKeyType type,
     bool extractable,
     blink::WebCryptoKeyUsageMask usages,
     const CryptoData& key_data,
     blink::WebCryptoKey* key) const {
   return Status::ErrorUnsupported();
 }
 
 }  // namespace webcrypto