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

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

Issue 336173002: [webcrypto] Require importKey() for JWK to provide data as a Javascript object rather than a JSON a… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update additional tests Created 6 years, 6 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 ScriptPromise encrypt(ScriptState*, const Dictionary&, Key*, const ArrayPiec e&); 53 ScriptPromise encrypt(ScriptState*, const Dictionary&, Key*, const ArrayPiec e&);
54 ScriptPromise decrypt(ScriptState*, const Dictionary&, Key*, const ArrayPiec e&); 54 ScriptPromise decrypt(ScriptState*, const Dictionary&, Key*, const ArrayPiec e&);
55 ScriptPromise sign(ScriptState*, const Dictionary&, Key*, const ArrayPiece&) ; 55 ScriptPromise sign(ScriptState*, 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. 56 // Note that this is not named "verify" because when compiling on Mac that e xpands to a macro and breaks.
57 ScriptPromise verifySignature(ScriptState*, const Dictionary&, Key*, const A rrayPiece& signature, const ArrayPiece& data); 57 ScriptPromise verifySignature(ScriptState*, const Dictionary&, Key*, const A rrayPiece& signature, const ArrayPiece& data);
58 ScriptPromise digest(ScriptState*, const Dictionary&, const ArrayPiece& data ); 58 ScriptPromise digest(ScriptState*, const Dictionary&, const ArrayPiece& data );
59 59
60 ScriptPromise generateKey(ScriptState*, const Dictionary&, bool extractable, const Vector<String>& keyUsages); 60 ScriptPromise generateKey(ScriptState*, const Dictionary&, bool extractable, const Vector<String>& keyUsages);
61 ScriptPromise importKey(ScriptState*, const String&, const ArrayPiece&, cons t Dictionary&, bool extractable, const Vector<String>& keyUsages); 61 ScriptPromise importKey(ScriptState*, const String&, const ArrayPiece&, cons t Dictionary&, bool extractable, const Vector<String>& keyUsages);
62 ScriptPromise importKey(ScriptState*, const String&, const Dictionary&, cons t Dictionary&, bool extractable, const Vector<String>& keyUsages);
62 ScriptPromise exportKey(ScriptState*, const String&, Key*); 63 ScriptPromise exportKey(ScriptState*, const String&, Key*);
63 64
64 ScriptPromise wrapKey(ScriptState*, const String&, Key*, Key*, const Diction ary&); 65 ScriptPromise wrapKey(ScriptState*, const String&, Key*, Key*, const Diction ary&);
65 ScriptPromise unwrapKey(ScriptState*, const String&, const ArrayPiece&, Key* , const Dictionary&, const Dictionary&, bool, const Vector<String>&); 66 ScriptPromise unwrapKey(ScriptState*, const String&, const ArrayPiece&, Key* , const Dictionary&, 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/rsassa-pkcs1-v1_5-sign-verify.html ('k') | Source/modules/crypto/SubtleCrypto.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698