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

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

Issue 109223002: [webcrypto] Add crypto.subtle.wrapKey() and crypto.subtle.unwrapKey() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase test expectations (to match latest changes I had made) Created 7 years 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
« no previous file with comments | « Source/modules/crypto/NormalizeAlgorithm.cpp ('k') | Source/modules/crypto/SubtleCrypto.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ScriptPromise decrypt(const Dictionary&, Key*, ArrayBufferView* data, Except ionState&); 51 ScriptPromise decrypt(const Dictionary&, Key*, ArrayBufferView* data, Except ionState&);
52 ScriptPromise sign(const Dictionary&, Key*, ArrayBufferView* data, Exception State&); 52 ScriptPromise sign(const Dictionary&, Key*, ArrayBufferView* data, Exception State&);
53 // Note that this is not named "verify" because when compiling on Mac that e xpands to a macro and breaks. 53 // Note that this is not named "verify" because when compiling on Mac that e xpands to a macro and breaks.
54 ScriptPromise verifySignature(const Dictionary&, Key*, ArrayBufferView* sign ature, ArrayBufferView* data, ExceptionState&); 54 ScriptPromise verifySignature(const Dictionary&, Key*, ArrayBufferView* sign ature, ArrayBufferView* data, ExceptionState&);
55 ScriptPromise digest(const Dictionary&, ArrayBufferView* data, ExceptionStat e&); 55 ScriptPromise digest(const Dictionary&, ArrayBufferView* data, ExceptionStat e&);
56 56
57 ScriptPromise generateKey(const Dictionary&, bool extractable, const Vector< String>& keyUsages, ExceptionState&); 57 ScriptPromise generateKey(const Dictionary&, bool extractable, const Vector< String>& keyUsages, ExceptionState&);
58 ScriptPromise importKey(const String&, ArrayBufferView*, const Dictionary&, bool extractable, const Vector<String>& keyUsages, ExceptionState&); 58 ScriptPromise importKey(const String&, ArrayBufferView*, const Dictionary&, bool extractable, const Vector<String>& keyUsages, ExceptionState&);
59 ScriptPromise exportKey(const String&, Key*, ExceptionState&); 59 ScriptPromise exportKey(const String&, Key*, ExceptionState&);
60 60
61 ScriptPromise wrapKey(const String&, Key*, Key*, const Dictionary&, Exceptio nState&);
62 ScriptPromise unwrapKey(const String&, ArrayBufferView*, Key*, const Diction ary&, const Dictionary&, bool, const Vector<String>&, ExceptionState&);
63
61 private: 64 private:
62 SubtleCrypto(); 65 SubtleCrypto();
63 }; 66 };
64 67
65 } // namespace WebCore 68 } // namespace WebCore
66 69
67 #endif 70 #endif
OLDNEW
« no previous file with comments | « Source/modules/crypto/NormalizeAlgorithm.cpp ('k') | Source/modules/crypto/SubtleCrypto.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698