Expose WebCrypto's algorithm normalization.

Source/modules/crypto/NormalizeAlgorithm.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/crypto/NormalizeAlgorithm.h"
 
 #include "bindings/v8/Dictionary.h"
-#include "platform/CryptoResult.h"
 #include "platform/NotImplemented.h"
 #include "public/platform/WebCryptoAlgorithmParams.h"
 #include "public/platform/WebString.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/ArrayBufferView.h"
 #include "wtf/MathExtras.h"
 #include "wtf/Uint8Array.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
 #include <algorithm>
@@ skipping 32 matching lines @@
 
 typedef char ParamsTypeOrUndefined;
 const ParamsTypeOrUndefined Undefined = -1;
 
 struct AlgorithmInfo {
     // The canonical (case-sensitive) name for the algorithm.
     const char* name;
 
     // A map from the operation to the expected parameter type of the algorithm.
     // If an operation is not applicable for the algorithm, set to Undefined.
-    const ParamsTypeOrUndefined operationToParamsType[LastAlgorithmOperation + 1];
+    const ParamsTypeOrUndefined operationToParamsType[blink::WebCryptoOperationLast + 1];
 };
 
 // A mapping from the algorithm ID to information about the algorithm.
 const AlgorithmInfo algorithmIdToInfo[] = {
     { // Index 0
         "AES-CBC", {
             blink::WebCryptoAlgorithmParamsTypeAesCbcParams, // Encrypt
             blink::WebCryptoAlgorithmParamsTypeAesCbcParams, // Decrypt
             Undefined, // Sign
             Undefined, // Verify
@@ skipping 156 matching lines @@
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaSsaPkcs1v1_5 == 2, RsaSsaPkcs1v1_5_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha1 == 3, Sha1_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha256 == 4, Sha256_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha384 == 5, Sha384_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdSha512 == 6, Sha512_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesGcm == 7, AesGcm_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdRsaOaep == 8, RsaOaep_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesCtr == 9, AesCtr_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdAesKw == 10, AesKw_idDoesntMatch);
 COMPILE_ASSERT(blink::WebCryptoAlgorithmIdLast == 10, Last_idDoesntMatch);
-COMPILE_ASSERT(10 == LastAlgorithmOperation, UpdateParamsMapping);
+COMPILE_ASSERT(10 == blink::WebCryptoOperationLast, UpdateParamsMapping);
 
 #if ASSERT_ENABLED
 
 // Essentially std::is_sorted() (however that function is new to C++11).
 template <typename Iterator>
 bool isSorted(Iterator begin, Iterator end)
 {
     if (begin == end)
         return true;
 
@@ skipping 97 matching lines @@
     return true;
 }
 
 const AlgorithmInfo* lookupAlgorithmInfo(blink::WebCryptoAlgorithmId id)
 {
     if (id < 0 || id >= WTF_ARRAY_LENGTH(algorithmIdToInfo))
         return 0;
     return &algorithmIdToInfo[id];
 }
 
-void completeWithSyntaxError(const String& message, CryptoResult* result)
+void setSyntaxError(const String& message, AlgorithmError* error)
 {
-    result->completeWithError(blink::WebCryptoErrorTypeSyntax, message);
+    error->errorType = blink::WebCryptoErrorTypeSyntax;
+    error->errorDetails = message;
 }
 
-void completeWithNotSupportedError(const String& message, CryptoResult* result)
+void setNotSupportedError(const String& message, AlgorithmError* error)
 {
-    result->completeWithError(blink::WebCryptoErrorTypeNotSupported, message);
+    error->errorType = blink::WebCryptoErrorTypeNotSupported;
+    error->errorDetails = message;
 }
 
-void completeWithDataError(const String& message, CryptoResult* result)
+void setDataError(const String& message, AlgorithmError* error)
 {
-    result->completeWithError(blink::WebCryptoErrorTypeData, message);
+    error->errorType = blink::WebCryptoErrorTypeData;
+    error->errorDetails = message;
 }
 
 // ErrorContext holds a stack of string literals which describe what was
 // happening at the time the error occurred. This is helpful because
 // parsing of the algorithm dictionary can be recursive and it is difficult to
 // tell what went wrong from a failure alone.
 class ErrorContext {
 public:
     void add(const char* message)
     {
@@ skipping 47 matching lines @@
     // This inline size is large enough to avoid having to grow the Vector in
     // the majority of cases (up to 1 nested algorithm identifier).
     Vector<const char*, 10> m_messages;
 };
 
 // Defined by the WebCrypto spec as:
 //
 //     typedef (ArrayBuffer or ArrayBufferView) CryptoOperationData;
 //
 // FIXME: Currently only supports ArrayBufferView.
-bool getOptionalCryptoOperationData(const Dictionary& raw, const char* propertyName, bool& hasProperty, RefPtr<ArrayBufferView>& buffer, const ErrorContext& context, CryptoResult* result)
+bool getOptionalCryptoOperationData(const Dictionary& raw, const char* propertyName, bool& hasProperty, RefPtr<ArrayBufferView>& buffer, const ErrorContext& context, AlgorithmError* error)
 {
     if (!raw.get(propertyName, buffer)) {
         hasProperty = false;
         return true;
     }
 
     hasProperty = true;
 
     if (!buffer) {
-        completeWithSyntaxError(context.toString(propertyName, "Not an ArrayBufferView"), result);
+        setSyntaxError(context.toString(propertyName, "Not an ArrayBufferView"), error);
         return false;
     }
 
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //     typedef (ArrayBuffer or ArrayBufferView) CryptoOperationData;
 //
 // FIXME: Currently only supports ArrayBufferView.
-bool getCryptoOperationData(const Dictionary& raw, const char* propertyName, RefPtr<ArrayBufferView>& buffer, const ErrorContext& context, CryptoResult* result)
+bool getCryptoOperationData(const Dictionary& raw, const char* propertyName, RefPtr<ArrayBufferView>& buffer, const ErrorContext& context, AlgorithmError* error)
 {
     bool hasProperty;
-    bool ok = getOptionalCryptoOperationData(raw, propertyName, hasProperty, buffer, context, result);
+    bool ok = getOptionalCryptoOperationData(raw, propertyName, hasProperty, buffer, context, error);
     if (!hasProperty) {
-        completeWithSyntaxError(context.toString(propertyName, "Missing required property"), result);
+        setSyntaxError(context.toString(propertyName, "Missing required property"), error);
         return false;
     }
     return ok;
 }
 
-bool getUint8Array(const Dictionary& raw, const char* propertyName, RefPtr<Uint8Array>& array, const ErrorContext& context, CryptoResult* result)
+bool getUint8Array(const Dictionary& raw, const char* propertyName, RefPtr<Uint8Array>& array, const ErrorContext& context, AlgorithmError* error)
 {
     if (!raw.get(propertyName, array) || !array) {
-        completeWithSyntaxError(context.toString(propertyName, "Missing or not a Uint8Array"), result);
+        setSyntaxError(context.toString(propertyName, "Missing or not a Uint8Array"), error);
         return false;
     }
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //     typedef Uint8Array BigInteger;
-bool getBigInteger(const Dictionary& raw, const char* propertyName, RefPtr<Uint8Array>& array, const ErrorContext& context, CryptoResult* result)
+bool getBigInteger(const Dictionary& raw, const char* propertyName, RefPtr<Uint8Array>& array, const ErrorContext& context, AlgorithmError* error)
 {
-    if (!getUint8Array(raw, propertyName, array, context, result))
+    if (!getUint8Array(raw, propertyName, array, context, error))
         return false;
 
     if (!array->byteLength()) {
-        completeWithSyntaxError(context.toString(propertyName, "BigInteger should not be empty"), result);
+        setSyntaxError(context.toString(propertyName, "BigInteger should not be empty"), error);
         return false;
     }
 
     if (!raw.get(propertyName, array) || !array) {
-        completeWithSyntaxError(context.toString(propertyName, "Missing or not a Uint8Array"), result);
+        setSyntaxError(context.toString(propertyName, "Missing or not a Uint8Array"), error);
         return false;
     }
     return true;
 }
 
 // Gets an integer according to WebIDL's [EnforceRange].
-bool getOptionalInteger(const Dictionary& raw, const char* propertyName, bool& hasProperty, double& value, double minValue, double maxValue, const ErrorContext& context, CryptoResult* result)
+bool getOptionalInteger(const Dictionary& raw, const char* propertyName, bool& hasProperty, double& value, double minValue, double maxValue, const ErrorContext& context, AlgorithmError* error)
 {
     double number;
     bool ok = raw.get(propertyName, number, hasProperty);
 
     if (!hasProperty)
         return true;
 
     if (!ok || std::isnan(number)) {
-        completeWithSyntaxError(context.toString(propertyName, "Is not a number"), result);
+        setSyntaxError(context.toString(propertyName, "Is not a number"), error);
         return false;
     }
 
     number = trunc(number);
 
     if (std::isinf(number) || number < minValue || number > maxValue) {
-        completeWithSyntaxError(context.toString(propertyName, "Outside of numeric range"), result);
+        setSyntaxError(context.toString(propertyName, "Outside of numeric range"), error);
         return false;
     }
 
     value = number;
     return true;
 }
 
-bool getInteger(const Dictionary& raw, const char* propertyName, double& value, double minValue, double maxValue, const ErrorContext& context, CryptoResult* result)
+bool getInteger(const Dictionary& raw, const char* propertyName, double& value, double minValue, double maxValue, const ErrorContext& context, AlgorithmError* error)
 {
     bool hasProperty;
-    if (!getOptionalInteger(raw, propertyName, hasProperty, value, minValue, maxValue, context, result))
+    if (!getOptionalInteger(raw, propertyName, hasProperty, value, minValue, maxValue, context, error))
         return false;
 
     if (!hasProperty) {
-        completeWithSyntaxError(context.toString(propertyName, "Missing required property"), result);
+        setSyntaxError(context.toString(propertyName, "Missing required property"), error);
         return false;
     }
 
     return true;
 }
 
-bool getUint32(const Dictionary& raw, const char* propertyName, uint32_t& value, const ErrorContext& context, CryptoResult* result)
+bool getUint32(const Dictionary& raw, const char* propertyName, uint32_t& value, const ErrorContext& context, AlgorithmError* error)
 {
     double number;
-    if (!getInteger(raw, propertyName, number, 0, 0xFFFFFFFF, context, result))
+    if (!getInteger(raw, propertyName, number, 0, 0xFFFFFFFF, context, error))
         return false;
     value = number;
     return true;
 }
 
-bool getUint16(const Dictionary& raw, const char* propertyName, uint16_t& value, const ErrorContext& context, CryptoResult* result)
+bool getUint16(const Dictionary& raw, const char* propertyName, uint16_t& value, const ErrorContext& context, AlgorithmError* error)
 {
     double number;
-    if (!getInteger(raw, propertyName, number, 0, 0xFFFF, context, result))
+    if (!getInteger(raw, propertyName, number, 0, 0xFFFF, context, error))
         return false;
     value = number;
     return true;
 }
 
-bool getUint8(const Dictionary& raw, const char* propertyName, uint8_t& value, const ErrorContext& context, CryptoResult* result)
+bool getUint8(const Dictionary& raw, const char* propertyName, uint8_t& value, const ErrorContext& context, AlgorithmError* error)
 {
     double number;
-    if (!getInteger(raw, propertyName, number, 0, 0xFF, context, result))
+    if (!getInteger(raw, propertyName, number, 0, 0xFF, context, error))
         return false;
     value = number;
     return true;
 }
 
-bool getOptionalUint32(const Dictionary& raw, const char* propertyName, bool& hasValue, uint32_t& value, const ErrorContext& context, CryptoResult* result)
+bool getOptionalUint32(const Dictionary& raw, const char* propertyName, bool& hasValue, uint32_t& value, const ErrorContext& context, AlgorithmError* error)
 {
     double number;
-    if (!getOptionalInteger(raw, propertyName, hasValue, number, 0, 0xFFFFFFFF, context, result))
+    if (!getOptionalInteger(raw, propertyName, hasValue, number, 0, 0xFFFFFFFF, context, error))
         return false;
     if (hasValue)
         value = number;
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //    dictionary AesCbcParams : Algorithm {
 //      CryptoOperationData iv;
 //    };
-bool parseAesCbcParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseAesCbcParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     RefPtr<ArrayBufferView> iv;
-    if (!getCryptoOperationData(raw, "iv", iv, context, result))
+    if (!getCryptoOperationData(raw, "iv", iv, context, error))
         return false;
 
     if (iv->byteLength() != 16) {
-        completeWithDataError(context.toString("iv", "Must be 16 bytes"), result);
+        setDataError(context.toString("iv", "Must be 16 bytes"), error);
         return false;
     }
 
     params = adoptPtr(new blink::WebCryptoAesCbcParams(static_cast<unsigned char*>(iv->baseAddress()), iv->byteLength()));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //    dictionary AesKeyGenParams : Algorithm {
 //      [EnforceRange] unsigned short length;
 //    };
-bool parseAesKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseAesKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     uint16_t length;
-    if (!getUint16(raw, "length", length, context, result))
+    if (!getUint16(raw, "length", length, context, error))
         return false;
 
     params = adoptPtr(new blink::WebCryptoAesKeyGenParams(length));
     return true;
 }
 
-bool parseAlgorithm(const Dictionary&, AlgorithmOperation, blink::WebCryptoAlgorithm&, ErrorContext, CryptoResult*);
+bool parseAlgorithm(const Dictionary&, blink::WebCryptoOperation, blink::WebCryptoAlgorithm&, ErrorContext, AlgorithmError*);
 
-bool parseHash(const Dictionary& raw, blink::WebCryptoAlgorithm& hash, ErrorContext context, CryptoResult* result)
+bool parseHash(const Dictionary& raw, blink::WebCryptoAlgorithm& hash, ErrorContext context, AlgorithmError* error)
 {
     Dictionary rawHash;
     if (!raw.get("hash", rawHash)) {
-        completeWithSyntaxError(context.toString("hash", "Missing or not a dictionary"), result);
+        setSyntaxError(context.toString("hash", "Missing or not a dictionary"), error);
         return false;
     }
 
     context.add("hash");
-    return parseAlgorithm(rawHash, Digest, hash, context, result);
+    return parseAlgorithm(rawHash, blink::WebCryptoOperationDigest, hash, context, error);
 }
 
 // Defined by the WebCrypto spec as:
 //
 //    dictionary HmacImportParams : Algorithm {
 //      AlgorithmIdentifier hash;
 //    };
-bool parseHmacImportParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseHmacImportParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     blink::WebCryptoAlgorithm hash;
-    if (!parseHash(raw, hash, context, result))
+    if (!parseHash(raw, hash, context, error))
         return false;
 
     params = adoptPtr(new blink::WebCryptoHmacImportParams(hash));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //    dictionary HmacKeyGenParams : Algorithm {
 //      AlgorithmIdentifier hash;
 //      // The length (in bits) of the key to generate. If unspecified, the
 //      // recommended length will be used, which is the size of the associated hash function's block
 //      // size.
 //      unsigned long length;
 //    };
-bool parseHmacKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseHmacKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     blink::WebCryptoAlgorithm hash;
-    if (!parseHash(raw, hash, context, result))
+    if (!parseHash(raw, hash, context, error))
         return false;
 
     bool hasLength;
     uint32_t length = 0;
-    if (!getOptionalUint32(raw, "length", hasLength, length, context, result))
+    if (!getOptionalUint32(raw, "length", hasLength, length, context, error))
         return false;
 
     params = adoptPtr(new blink::WebCryptoHmacKeyGenParams(hash, hasLength, length));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //    dictionary RsaHashedImportParams {
 //      AlgorithmIdentifier hash;
 //    };
-bool parseRsaHashedImportParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseRsaHashedImportParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     blink::WebCryptoAlgorithm hash;
-    if (!parseHash(raw, hash, context, result))
+    if (!parseHash(raw, hash, context, error))
         return false;
 
     params = adoptPtr(new blink::WebCryptoRsaHashedImportParams(hash));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //    dictionary RsaHashedKeyGenParams : RsaKeyGenParams {
 //      AlgorithmIdentifier hash;
 //    };
 //
 //    dictionary RsaKeyGenParams : Algorithm {
 //      unsigned long modulusLength;
 //      BigInteger publicExponent;
 //    };
-bool parseRsaHashedKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseRsaHashedKeyGenParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     uint32_t modulusLength;
-    if (!getUint32(raw, "modulusLength", modulusLength, context, result))
+    if (!getUint32(raw, "modulusLength", modulusLength, context, error))
         return false;
 
     RefPtr<Uint8Array> publicExponent;
-    if (!getBigInteger(raw, "publicExponent", publicExponent, context, result))
+    if (!getBigInteger(raw, "publicExponent", publicExponent, context, error))
         return false;
 
     blink::WebCryptoAlgorithm hash;
-    if (!parseHash(raw, hash, context, result))
+    if (!parseHash(raw, hash, context, error))
         return false;
 
     params = adoptPtr(new blink::WebCryptoRsaHashedKeyGenParams(hash, modulusLength, static_cast<const unsigned char*>(publicExponent->baseAddress()), publicExponent->byteLength()));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //    dictionary AesCtrParams : Algorithm {
 //      CryptoOperationData counter;
 //      [EnforceRange] octet length;
 //    };
-bool parseAesCtrParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseAesCtrParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     RefPtr<ArrayBufferView> counter;
-    if (!getCryptoOperationData(raw, "counter", counter, context, result))
+    if (!getCryptoOperationData(raw, "counter", counter, context, error))
         return false;
 
     uint8_t length;
-    if (!getUint8(raw, "length", length, context, result))
+    if (!getUint8(raw, "length", length, context, error))
         return false;
 
     params = adoptPtr(new blink::WebCryptoAesCtrParams(length, static_cast<const unsigned char*>(counter->baseAddress()), counter->byteLength()));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //     dictionary AesGcmParams : Algorithm {
 //       CryptoOperationData iv;
 //       CryptoOperationData? additionalData;
 //       [EnforceRange] octet? tagLength;  // May be 0-128
 //     }
-bool parseAesGcmParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseAesGcmParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     RefPtr<ArrayBufferView> iv;
-    if (!getCryptoOperationData(raw, "iv", iv, context, result))
+    if (!getCryptoOperationData(raw, "iv", iv, context, error))
         return false;
 
     bool hasAdditionalData;
     RefPtr<ArrayBufferView> additionalData;
-    if (!getOptionalCryptoOperationData(raw, "additionalData", hasAdditionalData, additionalData, context, result))
+    if (!getOptionalCryptoOperationData(raw, "additionalData", hasAdditionalData, additionalData, context, error))
         return false;
 
     double tagLength;
     bool hasTagLength;
-    if (!getOptionalInteger(raw, "tagLength", hasTagLength, tagLength, 0, 128, context, result))
+    if (!getOptionalInteger(raw, "tagLength", hasTagLength, tagLength, 0, 128, context, error))
         return false;
 
     const unsigned char* ivStart = static_cast<const unsigned char*>(iv->baseAddress());
     unsigned ivLength = iv->byteLength();
 
     const unsigned char* additionalDataStart = hasAdditionalData ? static_cast<const unsigned char*>(additionalData->baseAddress()) : 0;
     unsigned additionalDataLength = hasAdditionalData ? additionalData->byteLength() : 0;
 
     params = adoptPtr(new blink::WebCryptoAesGcmParams(ivStart, ivLength, hasAdditionalData, additionalDataStart, additionalDataLength, hasTagLength, tagLength));
     return true;
 }
 
 // Defined by the WebCrypto spec as:
 //
 //     dictionary RsaOaepParams : Algorithm {
 //       CryptoOperationData? label;
 //     };
-bool parseRsaOaepParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, CryptoResult* result)
+bool parseRsaOaepParams(const Dictionary& raw, OwnPtr<blink::WebCryptoAlgorithmParams>& params, const ErrorContext& context, AlgorithmError* error)
 {
     bool hasLabel;
     RefPtr<ArrayBufferView> label;
-    if (!getOptionalCryptoOperationData(raw, "label", hasLabel, label, context, result))
+    if (!getOptionalCryptoOperationData(raw, "label", hasLabel, label, context, error))
         return false;
 
     const unsigned char* labelStart = hasLabel ? static_cast<const unsigned char*>(label->baseAddress()) : 0;
     unsigned labelLength = hasLabel ? label->byteLength() : 0;
 
     params = adoptPtr(new blink::WebCryptoRsaOaepParams(hasLabel, labelStart, labelLength));
     return true;
 }
 
-bool parseAlgorithmParams(const Dictionary& raw, blink::WebCryptoAlgorithmParamsType type, OwnPtr<blink::WebCryptoAlgorithmParams>& params, ErrorContext& context, CryptoResult* result)
+bool parseAlgorithmParams(const Dictionary& raw, blink::WebCryptoAlgorithmParamsType type, OwnPtr<blink::WebCryptoAlgorithmParams>& params, ErrorContext& context, AlgorithmError* error)
 {
     switch (type) {
     case blink::WebCryptoAlgorithmParamsTypeNone:
         return true;
     case blink::WebCryptoAlgorithmParamsTypeAesCbcParams:
         context.add("AesCbcParams");
-        return parseAesCbcParams(raw, params, context, result);
+        return parseAesCbcParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeAesKeyGenParams:
         context.add("AesKeyGenParams");
-        return parseAesKeyGenParams(raw, params, context, result);
+        return parseAesKeyGenParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeHmacImportParams:
         context.add("HmacImportParams");
-        return parseHmacImportParams(raw, params, context, result);
+        return parseHmacImportParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeHmacKeyGenParams:
         context.add("HmacKeyGenParams");
-        return parseHmacKeyGenParams(raw, params, context, result);
+        return parseHmacKeyGenParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeRsaHashedKeyGenParams:
         context.add("RsaHashedKeyGenParams");
-        return parseRsaHashedKeyGenParams(raw, params, context, result);
+        return parseRsaHashedKeyGenParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeRsaHashedImportParams:
         context.add("RsaHashedImportParams");
-        return parseRsaHashedImportParams(raw, params, context, result);
+        return parseRsaHashedImportParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeAesCtrParams:
         context.add("AesCtrParams");
-        return parseAesCtrParams(raw, params, context, result);
+        return parseAesCtrParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeAesGcmParams:
         context.add("AesGcmParams");
-        return parseAesGcmParams(raw, params, context, result);
+        return parseAesGcmParams(raw, params, context, error);
     case blink::WebCryptoAlgorithmParamsTypeRsaOaepParams:
         context.add("RsaOaepParams");
-        return parseRsaOaepParams(raw, params, context, result);
+        return parseRsaOaepParams(raw, params, context, error);
         break;
     }
     ASSERT_NOT_REACHED();
     return false;
 }
 
-const char* operationToString(AlgorithmOperation op)
+const char* operationToString(blink::WebCryptoOperation op)
 {
     switch (op) {
-    case Encrypt:
+    case blink::WebCryptoOperationEncrypt:
         return "encrypt";
-    case Decrypt:
+    case blink::WebCryptoOperationDecrypt:
         return "decrypt";
-    case Sign:
+    case blink::WebCryptoOperationSign:
         return "sign";
-    case Verify:
+    case blink::WebCryptoOperationVerify:
         return "verify";
-    case Digest:
+    case blink::WebCryptoOperationDigest:
         return "digest";
-    case GenerateKey:
+    case blink::WebCryptoOperationGenerateKey:
         return "generateKey";
-    case ImportKey:
+    case blink::WebCryptoOperationImportKey:
         return "importKey";
-    case DeriveKey:
+    case blink::WebCryptoOperationDeriveKey:
         return "deriveKey";
-    case DeriveBits:
+    case blink::WebCryptoOperationDeriveBits:
         return "deriveBits";
-    case WrapKey:
+    case blink::WebCryptoOperationWrapKey:
         return "wrapKey";
-    case UnwrapKey:
+    case blink::WebCryptoOperationUnwrapKey:
         return "unwrapKey";
     }
     return 0;
 }
 
-bool parseAlgorithm(const Dictionary& raw, AlgorithmOperation op, blink::WebCryptoAlgorithm& algorithm, ErrorContext context, CryptoResult* result)
+bool parseAlgorithm(const Dictionary& raw, blink::WebCryptoOperation op, blink::WebCryptoAlgorithm& algorithm, ErrorContext context, AlgorithmError* error)
 {
     context.add("Algorithm");
 
     if (!raw.isObject()) {
-        completeWithSyntaxError(context.toString("Not an object"), result);
+        setSyntaxError(context.toString("Not an object"), error);
         return false;
     }
 
     String algorithmName;
     if (!raw.get("name", algorithmName)) {
-        completeWithSyntaxError(context.toString("name", "Missing or not a string"), result);
+        setSyntaxError(context.toString("name", "Missing or not a string"), error);
         return false;
     }
 
     blink::WebCryptoAlgorithmId algorithmId;
     if (!lookupAlgorithmIdByName(algorithmName, algorithmId)) {
         // FIXME: The spec says to return a SyntaxError if the input contains
         //        any non-ASCII characters.
-        completeWithNotSupportedError(context.toString("Unrecognized name"), result);
+        setNotSupportedError(context.toString("Unrecognized name"), error);
         return false;
     }
 
     // Remove the "Algorithm:" prefix for all subsequent errors.
     context.removeLast();
 
     const AlgorithmInfo* algorithmInfo = lookupAlgorithmInfo(algorithmId);
 
     if (algorithmInfo->operationToParamsType[op] == Undefined) {
         context.add(algorithmIdToName(algorithmId));
-        completeWithNotSupportedError(context.toString("Unsupported operation", operationToString(op)), result);
+        setNotSupportedError(context.toString("Unsupported operation", operationToString(op)), error);
         return false;
     }
 
     blink::WebCryptoAlgorithmParamsType paramsType = static_cast<blink::WebCryptoAlgorithmParamsType>(algorithmInfo->operationToParamsType[op]);
 
     OwnPtr<blink::WebCryptoAlgorithmParams> params;
-    if (!parseAlgorithmParams(raw, paramsType, params, context, result))
+    if (!parseAlgorithmParams(raw, paramsType, params, context, error))
         return false;
 
     algorithm = blink::WebCryptoAlgorithm(algorithmId, params.release());
     return true;
 }
 
 } // namespace
 
-bool parseAlgorithm(const Dictionary& raw, AlgorithmOperation op, blink::WebCryptoAlgorithm& algorithm, CryptoResult* result)
+bool normalizeAlgorithm(const Dictionary& raw, blink::WebCryptoOperation op, blink::WebCryptoAlgorithm& algorithm, AlgorithmError* error)
 {
-    return parseAlgorithm(raw, op, algorithm, ErrorContext(), result);
+    return parseAlgorithm(raw, op, algorithm, ErrorContext(), error);
 }
 
 const char* algorithmIdToName(blink::WebCryptoAlgorithmId id)
 {
     return lookupAlgorithmInfo(id)->name;
 }
 
 } // namespace WebCore