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

Unified Diff: content/renderer/webcrypto/webcrypto_impl.h

Issue 25906002: [webcrypto] Add JWK import for HMAC and AES-CBC key. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes for eroman plus more tests Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/webcrypto/webcrypto_impl.h
diff --git a/content/renderer/webcrypto/webcrypto_impl.h b/content/renderer/webcrypto/webcrypto_impl.h
index f0b7dc514a27d13fdbbed1fb3e1b2544d0ea149b..87e0da8a3a0d94a69f12d3fc7ebb771184b5fcc4 100644
--- a/content/renderer/webcrypto/webcrypto_impl.h
+++ b/content/renderer/webcrypto/webcrypto_impl.h
@@ -17,6 +17,7 @@ class CONTENT_EXPORT WebCryptoImpl
: NON_EXPORTED_BASE(public WebKit::WebCrypto) {
public:
WebCryptoImpl();
+ virtual ~WebCryptoImpl();
virtual void encrypt(
const WebKit::WebCryptoAlgorithm& algorithm,
@@ -63,8 +64,6 @@ class CONTENT_EXPORT WebCryptoImpl
unsigned data_size,
WebKit::WebCryptoResult result);
- static void ShrinkBuffer(WebKit::WebArrayBuffer* buffer, unsigned new_size);
-
protected:
friend class WebCryptoImplTest;
@@ -114,6 +113,15 @@ class CONTENT_EXPORT WebCryptoImpl
unsigned data_size,
bool* signature_match);
+ bool ImportKeyJwk(
+ const unsigned char* key_data,
+ unsigned key_data_size,
+ bool extractable,
+ const WebKit::WebCryptoAlgorithm& algorithm,
+ WebKit::WebCryptoKeyUsageMask usage_mask,
+ scoped_ptr<WebKit::WebCryptoKeyHandle>* handle,
+ WebKit::WebCryptoKeyType* type);
+
private:
DISALLOW_COPY_AND_ASSIGN(WebCryptoImpl);
};

Powered by Google App Engine
This is Rietveld 408576698