Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Side by Side Diff: Source/modules/crypto/SubtleCrypto.h

Issue 267133002: [webcrypto] Allow both ArrayBuffer and ArrayBufferView as inputs to crypto.subtle methods. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename ArrayBytes --> ArrayPiece Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef SubtleCrypto_h 31 #ifndef SubtleCrypto_h
32 #define SubtleCrypto_h 32 #define SubtleCrypto_h
33 33
34 #include "bindings/v8/ScriptPromise.h" 34 #include "bindings/v8/ScriptPromise.h"
35 #include "bindings/v8/ScriptWrappable.h" 35 #include "bindings/v8/ScriptWrappable.h"
36 #include "platform/heap/Handle.h" 36 #include "platform/heap/Handle.h"
37 #include "wtf/ArrayPiece.h"
37 #include "wtf/Forward.h" 38 #include "wtf/Forward.h"
38 #include "wtf/PassRefPtr.h" 39 #include "wtf/PassRefPtr.h"
39 #include "wtf/RefCounted.h" 40 #include "wtf/RefCounted.h"
40 41
41 namespace WebCore { 42 namespace WebCore {
42 43
43 class Dictionary; 44 class Dictionary;
44 class Key; 45 class Key;
45 46
46 class SubtleCrypto : public GarbageCollectedFinalized<SubtleCrypto>, public Scr iptWrappable { 47 class SubtleCrypto : public GarbageCollectedFinalized<SubtleCrypto>, public Scri ptWrappable {
47 public: 48 public:
48 static SubtleCrypto* create() 49 static SubtleCrypto* create()
49 { 50 {
50 return new SubtleCrypto(); 51 return new SubtleCrypto();
51 } 52 }
52 53
53 ScriptPromise encrypt(const Dictionary&, Key*, ArrayBufferView* data); 54 ScriptPromise encrypt(const Dictionary&, Key*, const ArrayPiece&);
54 ScriptPromise decrypt(const Dictionary&, Key*, ArrayBufferView* data); 55 ScriptPromise decrypt(const Dictionary&, Key*, const ArrayPiece&);
55 ScriptPromise sign(const Dictionary&, Key*, ArrayBufferView* data); 56 ScriptPromise sign(const Dictionary&, Key*, const ArrayPiece&);
56 // Note that this is not named "verify" because when compiling on Mac that e xpands to a macro and breaks. 57 // Note that this is not named "verify" because when compiling on Mac that e xpands to a macro and breaks.
57 ScriptPromise verifySignature(const Dictionary&, Key*, ArrayBufferView* sign ature, ArrayBufferView* data); 58 ScriptPromise verifySignature(const Dictionary&, Key*, const ArrayPiece& sig nature, const ArrayPiece& data);
58 ScriptPromise digest(const Dictionary&, ArrayBufferView* data); 59 ScriptPromise digest(const Dictionary&, const ArrayPiece& data);
59 60
60 ScriptPromise generateKey(const Dictionary&, bool extractable, const Vector< String>& keyUsages); 61 ScriptPromise generateKey(const Dictionary&, bool extractable, const Vector< String>& keyUsages);
61 ScriptPromise importKey(const String&, ArrayBufferView*, const Dictionary&, bool extractable, const Vector<String>& keyUsages); 62 ScriptPromise importKey(const String&, const ArrayPiece&, const Dictionary&, bool extractable, const Vector<String>& keyUsages);
62 ScriptPromise exportKey(const String&, Key*); 63 ScriptPromise exportKey(const String&, Key*);
63 64
64 ScriptPromise wrapKey(const String&, Key*, Key*, const Dictionary&); 65 ScriptPromise wrapKey(const String&, Key*, Key*, const Dictionary&);
65 ScriptPromise unwrapKey(const String&, ArrayBufferView*, Key*, const Diction ary&, const Dictionary&, bool, const Vector<String>&); 66 ScriptPromise unwrapKey(const String&, const ArrayPiece&, Key*, const Dictio nary&, const Dictionary&, bool, const Vector<String>&);
66 67
67 void trace(Visitor*) { } 68 void trace(Visitor*) { }
68 69
69 private: 70 private:
70 SubtleCrypto(); 71 SubtleCrypto();
71 }; 72 };
72 73
73 } // namespace WebCore 74 } // namespace WebCore
74 75
75 #endif 76 #endif
OLDNEW
« no previous file with comments | « LayoutTests/crypto/unwrapKey-badParameters-expected.txt ('k') | Source/modules/crypto/SubtleCrypto.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698