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

content/renderer/webcrypto/webcrypto_util.h

Index: content/renderer/webcrypto/webcrypto_util.h
diff --git a/content/renderer/webcrypto/webcrypto_util.h b/content/renderer/webcrypto/webcrypto_util.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ae80d34a1cbb09dbd68ad66fe04068c5304ae21
--- /dev/null
+++ b/content/renderer/webcrypto/webcrypto_util.h
@@ -0,0 +1,54 @@
+// 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_UTI_H_

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

typo I presume: UTI --> UTIL

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

Done.

+#define CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_UTI_H_
+
+#include <map>
+#include <string>
+#include <vector>
+#include "base/basictypes.h"
+#include "third_party/WebKit/public/platform/WebArrayBuffer.h"
+#include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
+
+namespace content {

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

I'm not entirely sure on whether we should put this into something like
webcrypto_util namespace. Certainly some of the function names in here are very
generic (like "Start").. Let me get back to you on this...

+
+const uint8* Start(const std::vector<uint8>& data);

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

I'm not sure how I feel about this being in the header, since it feels like
"unittest" code. But I suppose it is used by webcrypto_util.cc as well as the
unittest so makes sense.

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

I would like to remove this altogether, because I'm used to the std::vector / C
array equivalence syntax using &vec[0]. Is that idiom not well known enough that
we must wrap it in a helper? Or is this to get a unified syntax for a later move
to C++11's vector::data()?

[eroman, 2013/10/29 03:03:46]

The reason for Start() was to avoid doing &vec[0] on empty vectors. Since this
pattern was necessary in several places of the unittests I extracted it to a
helper.

I am not particularly fond of it, and happy to see it go if you have a better
solution.

+
+void ShrinkBuffer(WebKit::WebArrayBuffer* buffer, unsigned new_size);
+
+bool Base64DecodeUrlSafe(const std::string& input, std::string* output);

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

Please move the function-level comments from the .cc file to the .h file.

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

Done.

+
+WebKit::WebCryptoAlgorithm CreateAlgorithm(WebKit::WebCryptoAlgorithmId id);
+
+WebKit::WebCryptoAlgorithm CreateHmacAlgorithmByKeyLen(
+    unsigned short hash_key_length);
+
+WebKit::WebCryptoAlgorithm CreateHmacAlgorithmByHashId(
+    WebKit::WebCryptoAlgorithmId hashId);
+
+WebKit::WebCryptoAlgorithm CreateHmacKeyGenAlgorithm(
+    WebKit::WebCryptoAlgorithmId hashId,
+    unsigned hash_length);

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

side comment: We may want to change the parameter names to indicate whether they
are bits or bytes. The WebCrypto API is inconsistent in that most key lengths
are in bits, however for Hmac key generation it actually takes it in bytes.

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

I thought that was going to be fixed in the spec. That said, I like including
units in variable names. Please let me know if you want to make a bigger naming
change.

+
+WebKit::WebCryptoAlgorithm CreateRsaEsAlgorithm();
+
+WebKit::WebCryptoAlgorithm CreateRsaSsaAlgorithmByKeyLen(
+    unsigned short hash_key_length);
+
+WebKit::WebCryptoAlgorithm CreateRsaOaepAlgorithmByKeyLen(
+    unsigned short hash_key_length);
+
+WebKit::WebCryptoAlgorithm CreateAesCbcAlgorithm(const std::vector<uint8>& iv);
+
+WebKit::WebCryptoAlgorithm CreateAesGcmAlgorithm(const std::vector<uint8>& iv,
+    const std::vector<uint8>& additionalData, unsigned char tagLength);

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

use hacker_style_naming for variables in chromium

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

Done.

+
+WebKit::WebCryptoAlgorithm CreateAesCbcKeyGenAlgorithm(unsigned short length);
+
+WebKit::WebCryptoAlgorithm CreateAesGcmKeyGenAlgorithm(unsigned short length);
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_UTI_H_