third_party/WebKit/Source/modules/crypto/SubtleCrypto.h - Issue 2141843002: Copy array buffer data used by WebCrypto in the order expected by draft specification.

Unified Diff: third_party/WebKit/Source/modules/crypto/SubtleCrypto.h

Issue 2141843002: Copy array buffer data used by WebCrypto in the order expected by draft specification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Change FIXME --> TODO(eroman) Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/crypto/NormalizeAlgorithm.cpp ('k') | third_party/WebKit/Source/modules/crypto/SubtleCrypto.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/crypto/SubtleCrypto.h

diff --git a/third_party/WebKit/Source/modules/crypto/SubtleCrypto.h b/third_party/WebKit/Source/modules/crypto/SubtleCrypto.h

index dd9aa94a86c04db2e6ac29f7855b569dd82103b7..fef7a2e071a8bb3c49f33a702da97e746e8e9c6f 100644

--- a/third_party/WebKit/Source/modules/crypto/SubtleCrypto.h

+++ b/third_party/WebKit/Source/modules/crypto/SubtleCrypto.h

@@ -36,7 +36,6 @@

#include "bindings/core/v8/ScriptWrappable.h"

#include "bindings/modules/v8/ArrayBufferOrArrayBufferViewOrDictionary.h"

#include "bindings/modules/v8/DictionaryOrString.h"

-#include "core/dom/DOMArrayPiece.h"

#include "platform/heap/Handle.h"

#include "wtf/Forward.h"

@@ -55,19 +54,19 @@ public:

return new SubtleCrypto();

}

- ScriptPromise encrypt(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const DOMArrayPiece&);

- ScriptPromise decrypt(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const DOMArrayPiece&);

- ScriptPromise sign(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const DOMArrayPiece&);

+ ScriptPromise encrypt(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const BufferSource&);

+ ScriptPromise decrypt(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const BufferSource&);

+ ScriptPromise sign(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const BufferSource&);

// Note that this is not named "verify" because when compiling on Mac that expands to a macro and breaks.

- ScriptPromise verifySignature(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const DOMArrayPiece& signature, const DOMArrayPiece& data);

- ScriptPromise digest(ScriptState*, const AlgorithmIdentifier&, const DOMArrayPiece& data);

+ ScriptPromise verifySignature(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const BufferSource& signature, const BufferSource& data);

+ ScriptPromise digest(ScriptState*, const AlgorithmIdentifier&, const BufferSource& data);

ScriptPromise generateKey(ScriptState*, const AlgorithmIdentifier&, bool extractable, const Vector<String>& keyUsages);

ScriptPromise importKey(ScriptState*, const String&, const ArrayBufferOrArrayBufferViewOrDictionary&, const AlgorithmIdentifier&, bool extractable, const Vector<String>& keyUsages);

ScriptPromise exportKey(ScriptState*, const String&, CryptoKey*);

ScriptPromise wrapKey(ScriptState*, const String&, CryptoKey*, CryptoKey*, const AlgorithmIdentifier&);

- ScriptPromise unwrapKey(ScriptState*, const String&, const DOMArrayPiece&, CryptoKey*, const AlgorithmIdentifier&, const AlgorithmIdentifier&, bool, const Vector<String>&);

+ ScriptPromise unwrapKey(ScriptState*, const String&, const BufferSource&, CryptoKey*, const AlgorithmIdentifier&, const AlgorithmIdentifier&, bool, const Vector<String>&);

ScriptPromise deriveBits(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, unsigned);

ScriptPromise deriveKey(ScriptState*, const AlgorithmIdentifier&, CryptoKey*, const AlgorithmIdentifier&, bool extractable, const Vector<String>&);