Index: trunk/src/content/child/webcrypto/shared_crypto.h |
=================================================================== |
--- trunk/src/content/child/webcrypto/shared_crypto.h (revision 266902) |
+++ trunk/src/content/child/webcrypto/shared_crypto.h (working copy) |
@@ -5,8 +5,6 @@ |
#ifndef CONTENT_CHILD_WEBCRYPTO_SHARED_CRYPTO_H_ |
#define CONTENT_CHILD_WEBCRYPTO_SHARED_CRYPTO_H_ |
-#include <vector> |
- |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
@@ -39,9 +37,7 @@ |
// | |
// v |
// WebCryptoImpl (Implements the blink::WebCrypto interface for |
-// | asynchronous completions; posts tasks to |
-// | the webcrypto worker pool to fulfill the request |
-// using the synchronous methods of shared_crypto.h) |
+// | asynchronous completions) |
// | |
// | [shared_crypto_unittest.cc] |
// | / |
@@ -71,7 +67,7 @@ |
// * Inferring default parameters when not specified |
// * Validating key exportability |
// * Validating algorithm with key.algorithm |
-// * Converting the Blink key to a more specific platform::{PublicKey, |
+// * Converting the blink key to a more specific platform::{PublicKey, |
// PrivateKey, SymKey} and making sure it was the right type. |
// * Validating alogorithm specific parameters (for instance, was the iv for |
// AES-CBC 16 bytes). |
@@ -80,16 +76,16 @@ |
CONTENT_EXPORT Status Encrypt(const blink::WebCryptoAlgorithm& algorithm, |
const blink::WebCryptoKey& key, |
const CryptoData& data, |
- std::vector<uint8>* buffer); |
+ blink::WebArrayBuffer* buffer); |
CONTENT_EXPORT Status Decrypt(const blink::WebCryptoAlgorithm& algorithm, |
const blink::WebCryptoKey& key, |
const CryptoData& data, |
- std::vector<uint8>* buffer); |
+ blink::WebArrayBuffer* buffer); |
CONTENT_EXPORT Status Digest(const blink::WebCryptoAlgorithm& algorithm, |
const CryptoData& data, |
- std::vector<uint8>* buffer); |
+ blink::WebArrayBuffer* buffer); |
CONTENT_EXPORT scoped_ptr<blink::WebCryptoDigestor> CreateDigestor( |
blink::WebCryptoAlgorithmId algorithm); |
@@ -116,12 +112,12 @@ |
CONTENT_EXPORT Status ExportKey(blink::WebCryptoKeyFormat format, |
const blink::WebCryptoKey& key, |
- std::vector<uint8>* buffer); |
+ blink::WebArrayBuffer* buffer); |
CONTENT_EXPORT Status Sign(const blink::WebCryptoAlgorithm& algorithm, |
const blink::WebCryptoKey& key, |
const CryptoData& data, |
- std::vector<uint8>* buffer); |
+ blink::WebArrayBuffer* buffer); |
CONTENT_EXPORT Status |
VerifySignature(const blink::WebCryptoAlgorithm& algorithm, |
@@ -135,7 +131,7 @@ |
const blink::WebCryptoKey& wrapping_key, |
const blink::WebCryptoKey& key_to_wrap, |
const blink::WebCryptoAlgorithm& wrapping_algorithm, |
- std::vector<uint8>* buffer); |
+ blink::WebArrayBuffer* buffer); |
CONTENT_EXPORT Status |
UnwrapKey(blink::WebCryptoKeyFormat format, |
@@ -147,18 +143,17 @@ |
blink::WebCryptoKeyUsageMask usage_mask, |
blink::WebCryptoKey* key); |
-// Called on the target Blink thread. |
-CONTENT_EXPORT bool SerializeKeyForClone(const blink::WebCryptoKey& key, |
- blink::WebVector<uint8>* key_data); |
+CONTENT_EXPORT Status |
+ SerializeKeyForClone(const blink::WebCryptoKey& key, |
+ blink::WebVector<unsigned char>* data); |
-// Called on the target Blink thread. |
-CONTENT_EXPORT bool DeserializeKeyForClone( |
- const blink::WebCryptoKeyAlgorithm& algorithm, |
- blink::WebCryptoKeyType type, |
- bool extractable, |
- blink::WebCryptoKeyUsageMask usage_mask, |
- const CryptoData& key_data, |
- blink::WebCryptoKey* key); |
+CONTENT_EXPORT Status |
+ DeserializeKeyForClone(const blink::WebCryptoKeyAlgorithm& algorithm, |
+ blink::WebCryptoKeyType type, |
+ bool extractable, |
+ blink::WebCryptoKeyUsageMask usage_mask, |
+ const CryptoData& key_data, |
+ blink::WebCryptoKey* key); |
} // namespace webcrypto |