Refactor WebCrypto code

content/child/webcrypto/status.h

 // 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.
 
 #ifndef CONTENT_CHILD_WEBCRYPTO_STATUS_H_
 #define CONTENT_CHILD_WEBCRYPTO_STATUS_H_
 
 #include <string>
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebCrypto.h"
@@ skipping 51 matching lines @@
                                           const std::string& expected_type);
 
   // The property |property| was a string, however could not be successfully
   // base64 decoded.
   static Status ErrorJwkBase64Decode(const std::string& property);
 
   // The "ext" parameter was specified but was
   // incompatible with the value requested by the Web Crypto call.
   static Status ErrorJwkExtInconsistent();
 
-  // The "alg" parameter could not be converted to an equivalent
-  // WebCryptoAlgorithm. Either it was malformed or unrecognized.
-  static Status ErrorJwkUnrecognizedAlgorithm();
-
   // The "alg" parameter is incompatible with the (optional) Algorithm
   // specified by the Web Crypto import operation.
   static Status ErrorJwkAlgorithmInconsistent();
 
   // The "use" parameter was specified, however it couldn't be converted to an
   // equivalent Web Crypto usage.
   static Status ErrorJwkUnrecognizedUse();
 
   // The "key_ops" parameter was specified, however one of the values in the
   // array couldn't be converted to an equivalent Web Crypto usage.
   static Status ErrorJwkUnrecognizedKeyop();
 
   // The "use" parameter was specified, however it is incompatible with that
   // specified by the Web Crypto import operation.
   static Status ErrorJwkUseInconsistent();
 
   // The "key_ops" parameter was specified, however it is incompatible with that
   // specified by the Web Crypto import operation.
   static Status ErrorJwkKeyopsInconsistent();
 
   // Both the "key_ops" and the "use" parameters were specified, however they
   // are incompatible with each other.
   static Status ErrorJwkUseAndKeyopsInconsistent();
 
-  // The "kty" parameter was given and was a string, however it was
-  // unrecognized.
-  static Status ErrorJwkUnrecognizedKty();
+  // The "kty" parameter was given and was a string, however it was not the
+  // expected value.
+  static Status ErrorJwkUnexpectedKty(const std::string& expected);
 
   // The amount of key data provided was incompatible with the selected
   // algorithm. For instance if the algorith name was A128CBC then EXACTLY
   // 128-bits of key data must have been provided. If 192-bits of key data were
   // given that is an error.
   static Status ErrorJwkIncorrectKeyLength();
 
   // The JWK was for an RSA private key but only partially provided the optional
   // parameters (p, q, dq, dq, qi).
   static Status ErrorJwkIncompleteOptionalRsaPrivateKey();
 
   // ------------------------------------
   // Other errors
   // ------------------------------------
 
   // No key data was provided when importing an spki, pkcs8, or jwk formatted
   // key. This does not apply to raw format, since it is possible to have empty
   // key data there.
   static Status ErrorImportEmptyKeyData();
 
+  // Tried importing a key using an unsupported format for the key type (for
+  // instance importing an HMAC key using format=spki).
+  static Status ErrorUnsupportedImportKeyFormat();
+
+  // Tried exporting a key using an unsupported format for the key type (for
+  // instance exporting an HMAC key using format=spki).
+  static Status ErrorUnsupportedExportKeyFormat();
+
   // The key data buffer provided for importKey() is an incorrect length for
   // AES.
   static Status ErrorImportAesKeyLength();
 
   // 192-bit AES keys are valid, however unsupported.
   static Status ErrorAes192BitUnsupported();
 
   // The wrong key was used for the operation. For instance, a public key was
   // used to verify a RsaSsaPkcs1v1_5 signature, or tried exporting a private
   // key using spki format.
@@ skipping 70 matching lines @@
   Type type_;
   blink::WebCryptoErrorType error_type_;
   std::string error_details_;
 };
 
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBCRYPTO_STATUS_H_