[webcrypto] Add JWK import for HMAC and AES-CBC key.

content/renderer/webcrypto/webcrypto_impl.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_IMPL_H_
 #define CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_IMPL_H_
 
+#include <map>
+#include <string>

[eroman, 2013/10/28 23:02:00]

These two headers appear unused in this file. Add them to the specific C++ file
instead.

[padolph, 2013/10/29 02:25:40]

Done.

 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebCrypto.h"
 
 namespace content {
 
 class CONTENT_EXPORT WebCryptoImpl
     : NON_EXPORTED_BASE(public WebKit::WebCrypto) {
  public:
   WebCryptoImpl();
+  virtual ~WebCryptoImpl();

[eroman, 2013/10/28 23:02:00]

Any reason to add the destructor definition? Since there are no member fields
doesn't seem like one is particularly interesting.

[padolph, 2013/10/29 02:25:40]

Clang complained when I didn't have this. Should I be paying attention to clang
errors?

 
   virtual void encrypt(
       const WebKit::WebCryptoAlgorithm& algorithm,
       const WebKit::WebCryptoKey& key,
       const unsigned char* data,
       unsigned data_size,
       WebKit::WebCryptoResult result);
   virtual void decrypt(
       const WebKit::WebCryptoAlgorithm& algorithm,
       const WebKit::WebCryptoKey& key,
@@ skipping 26 matching lines @@
       WebKit::WebCryptoResult result);
   virtual void verifySignature(
       const WebKit::WebCryptoAlgorithm& algorithm,
       const WebKit::WebCryptoKey& key,
       const unsigned char* signature,
       unsigned signature_size,
       const unsigned char* data,
       unsigned data_size,
       WebKit::WebCryptoResult result);
 
-  static void ShrinkBuffer(WebKit::WebArrayBuffer* buffer, unsigned new_size);
-
  protected:
   friend class WebCryptoImplTest;
 
   void Init();
 
   bool EncryptInternal(
       const WebKit::WebCryptoAlgorithm& algorithm,
       const WebKit::WebCryptoKey& key,
       const unsigned char* data,
       unsigned data_size,
@@ skipping 29 matching lines @@
       WebKit::WebArrayBuffer* buffer);
   bool VerifySignatureInternal(
       const WebKit::WebCryptoAlgorithm& algorithm,
       const WebKit::WebCryptoKey& key,
       const unsigned char* signature,
       unsigned signature_size,
       const unsigned char* data,
       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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_IMPL_H_