[webcrypto] Reject failed operations with a DOMException rather than null.

public/platform/WebCrypto.h

 /*
  * 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebCrypto_h
 #define WebCrypto_h
 
 #include "WebCommon.h"
 #include "WebCryptoAlgorithm.h"
 #include "WebCryptoKey.h"
 #include "WebPrivatePtr.h"
+#include "WebString.h"
 #include "WebVector.h"
 
 namespace WebCore { class CryptoResult; }
 
 #if INSIDE_BLINK
 namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
 namespace blink {
 
 class WebArrayBuffer;
 class WebString;
 
+// FIXME: Remove once Blink has rolled into Chromium.
+#define WEBCRYPTO_HAS_ERROR_TYPE 1
+
+enum WebCryptoErrorType {
+    WebCryptoErrorTypeType,
+    WebCryptoErrorTypeNotSupported,
+    WebCryptoErrorTypeSyntax,
+    WebCryptoErrorTypeInvalidState,
+    WebCryptoErrorTypeInvalidAccess,
+    WebCryptoErrorTypeUnknown,
+    WebCryptoErrorTypeData,
+    WebCryptoErrorTypeOperation,
+};
+
 class WebCryptoResult {
 public:
     WebCryptoResult(const WebCryptoResult& o)
     {
         assign(o);
     }
 
     ~WebCryptoResult()
     {
         reset();
     }
 
     WebCryptoResult& operator=(const WebCryptoResult& o)
     {
         assign(o);
         return *this;
     }
 
-    BLINK_PLATFORM_EXPORT void completeWithError();
-
     // Note that WebString is NOT safe to pass across threads.
     //
-    // Error details are intended to be displayed to developers for debugging.
-    // They MUST NEVER reveal any secret information such as bytes of the key
-    // or plain text. An appropriate error would be something like:
+    // Error details are surfaced in an exception, and MUST NEVER reveal any
+    // secret information such as bytes of the key or plain text. An
+    // appropriate error would be something like:
     //   "iv must be 16 bytes long".
-    BLINK_PLATFORM_EXPORT void completeWithError(const WebString&);
+    BLINK_PLATFORM_EXPORT void completeWithError(WebCryptoErrorType, const WebString&);
 
     // Note that WebArrayBuffer is NOT safe to create from another thread.
     BLINK_PLATFORM_EXPORT void completeWithBuffer(const WebArrayBuffer&);
     // Makes a copy of the input data given as a pointer and byte length.
     BLINK_PLATFORM_EXPORT void completeWithBuffer(const void*, unsigned);
     BLINK_PLATFORM_EXPORT void completeWithBoolean(bool);
     BLINK_PLATFORM_EXPORT void completeWithKey(const WebCryptoKey&);
     BLINK_PLATFORM_EXPORT void completeWithKeyPair(const WebCryptoKey& publicKey, const WebCryptoKey& privateKey);
 
 #if INSIDE_BLINK
@@ skipping 93 matching lines @@
     // Implementations MUST carefully sanitize algorithm inputs before using
     // them, as they come directly from the user. Few checks have been done on
     // algorithm parameters prior to passing to the embedder.
     //
     // Only the following checks can be assumed as having already passed:
     //
     //  * The key is extractable when calling into exportKey/wrapKey.
     //  * The key usages permit the operation being requested.
     //  * The key's algorithm matches that of the requested operation.
     //
-    virtual void encrypt(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(); }
-    virtual void decrypt(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(); }
-    virtual void sign(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(); }
-    virtual void verifySignature(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* signature, unsigned signatureSize, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(); }
-    virtual void digest(const WebCryptoAlgorithm&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(); }
-    virtual void generateKey(const WebCryptoAlgorithm&, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult result) { result.completeWithError(); }
-    virtual void importKey(WebCryptoKeyFormat, const unsigned char* keyData, unsigned keyDataSize, const WebCryptoAlgorithm&, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult result) { result.completeWithError(); }
-    virtual void exportKey(WebCryptoKeyFormat, const WebCryptoKey&, WebCryptoResult result) { result.completeWithError(); }
-    virtual void wrapKey(WebCryptoKeyFormat, const WebCryptoKey& key, const WebCryptoKey& wrappingKey, const WebCryptoAlgorithm&, WebCryptoResult result) { result.completeWithError(); }
-    virtual void unwrapKey(WebCryptoKeyFormat, const unsigned char* wrappedKey, unsigned wrappedKeySize, const WebCryptoKey&, const WebCryptoAlgorithm& unwrapAlgorithm, const WebCryptoAlgorithm& unwrappedKeyAlgorithm, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult result) { result.completeWithError(); }
+    virtual void encrypt(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void decrypt(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void sign(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void verifySignature(const WebCryptoAlgorithm&, const WebCryptoKey&, const unsigned char* signature, unsigned signatureSize, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void digest(const WebCryptoAlgorithm&, const unsigned char* data, unsigned dataSize, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void generateKey(const WebCryptoAlgorithm&, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void importKey(WebCryptoKeyFormat, const unsigned char* keyData, unsigned keyDataSize, const WebCryptoAlgorithm&, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void exportKey(WebCryptoKeyFormat, const WebCryptoKey&, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void wrapKey(WebCryptoKeyFormat, const WebCryptoKey& key, const WebCryptoKey& wrappingKey, const WebCryptoAlgorithm&, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
+    virtual void unwrapKey(WebCryptoKeyFormat, const unsigned char* wrappedKey, unsigned wrappedKeySize, const WebCryptoKey&, const WebCryptoAlgorithm& unwrapAlgorithm, const WebCryptoAlgorithm& unwrappedKeyAlgorithm, bool extractable, WebCryptoKeyUsageMask, WebCryptoResult result) { result.completeWithError(WebCryptoErrorTypeNotSupported, ""); }
 
     // This is the exception to the "Completing the request" guarantees
     // outlined above. This is useful for Blink internal crypto and is not part
     // of the WebCrypto standard. createDigestor must provide the result via
     // the WebCryptoDigestor object synchronously. createDigestor may return 0
     // if it fails to create a WebCryptoDigestor. If it succeeds, the
     // WebCryptoDigestor returned by createDigestor must be freed by the
     // caller.
     virtual WebCryptoDigestor* createDigestor(WebCryptoAlgorithmId algorithmId) { return 0; }
 
@@ skipping 45 matching lines @@
     // Returns true on success.
     virtual bool serializeKeyForClone(const WebCryptoKey&, WebVector<unsigned char>&) { return false; }
 
 protected:
     virtual ~WebCrypto() { }
 };
 
 } // namespace blink
 
 #endif