Index: content/renderer/webcrypto/webcrypto_impl.h |
diff --git a/content/renderer/webcrypto/webcrypto_impl.h b/content/renderer/webcrypto/webcrypto_impl.h |
index 5979b628c4f27b35eb7f50711dbc166b97715dc6..7cefe41b387b3b8749a4680150a85e3f76204114 100644 |
--- a/content/renderer/webcrypto/webcrypto_impl.h |
+++ b/content/renderer/webcrypto/webcrypto_impl.h |
@@ -16,6 +16,7 @@ class CONTENT_EXPORT WebCryptoImpl |
: NON_EXPORTED_BASE(public WebKit::WebCrypto) { |
public: |
WebCryptoImpl(); |
+ virtual ~WebCryptoImpl(); |
virtual void encrypt( |
const WebKit::WebCryptoAlgorithm& algorithm, |
@@ -62,9 +63,7 @@ class CONTENT_EXPORT WebCryptoImpl |
unsigned data_size, |
WebKit::WebCryptoResult result); |
- static void ShrinkBuffer(WebKit::WebArrayBuffer* buffer, unsigned new_size); |
static WebKit::WebCryptoKey NullKey(); |
- |
protected: |
friend class WebCryptoImplTest; |
@@ -115,6 +114,14 @@ class CONTENT_EXPORT WebCryptoImpl |
unsigned data_size, |
bool* signature_match); |
+ bool ImportKeyJwk( |
+ const unsigned char* key_data, |
+ unsigned key_data_size, |
+ const WebKit::WebCryptoAlgorithm& algorithm, |
+ bool extractable, |
+ WebKit::WebCryptoKeyUsageMask usage_mask, |
+ WebKit::WebCryptoKey* key); |
+ |
private: |
DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl); |
}; |