| Index: content/renderer/webcrypto_impl.h
|
| diff --git a/content/renderer/webcrypto_impl.h b/content/renderer/webcrypto_impl.h
|
| index cb4a7663fefced62a65c79806c2b72ee46734787..362be61307402eb35fd5f3041ca6c149e0d8ca32 100644
|
| --- a/content/renderer/webcrypto_impl.h
|
| +++ b/content/renderer/webcrypto_impl.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebCrypto.h"
|
|
|
| @@ -23,9 +24,24 @@ class CONTENT_EXPORT WebCryptoImpl
|
| const unsigned char* data,
|
| unsigned data_size,
|
| WebKit::WebCryptoResult result);
|
| + virtual void importKey(
|
| + WebKit::WebCryptoKeyFormat format,
|
| + const unsigned char* key_data,
|
| + unsigned key_data_size,
|
| + const WebKit::WebCryptoAlgorithm& algorithm,
|
| + bool extractable,
|
| + WebKit::WebCryptoKeyUsageMask usage_mask,
|
| + WebKit::WebCryptoResult result);
|
| + virtual void sign(
|
| + const WebKit::WebCryptoAlgorithm& algorithm,
|
| + const WebKit::WebCryptoKey& key,
|
| + const unsigned char* data,
|
| + unsigned data_size,
|
| + WebKit::WebCryptoResult result);
|
|
|
| protected:
|
| FRIEND_TEST_ALL_PREFIXES(WebCryptoImplTest, DigestSampleSets);
|
| + FRIEND_TEST_ALL_PREFIXES(WebCryptoImplTest, HMACSampleSets);
|
|
|
| void Init();
|
|
|
| @@ -34,6 +50,20 @@ class CONTENT_EXPORT WebCryptoImpl
|
| const unsigned char* data,
|
| unsigned data_size,
|
| WebKit::WebArrayBuffer* buffer);
|
| + bool ImportKeyInternal(
|
| + WebKit::WebCryptoKeyFormat format,
|
| + const unsigned char* key_data,
|
| + unsigned key_data_size,
|
| + const WebKit::WebCryptoAlgorithm& algorithm,
|
| + WebKit::WebCryptoKeyUsageMask usage_mask,
|
| + scoped_ptr<WebKit::WebCryptoKeyHandle>* handle,
|
| + WebKit::WebCryptoKeyType* type);
|
| + bool SignInternal(
|
| + const WebKit::WebCryptoAlgorithm& algorithm,
|
| + const WebKit::WebCryptoKey& key,
|
| + const unsigned char* data,
|
| + unsigned data_size,
|
| + WebKit::WebArrayBuffer* buffer);
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl);
|
|
|