Refactor to share more code between OpenSSL and NSS implementations.

content/renderer/webcrypto/webcrypto_util.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_UTIL_H_
 #define CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_UTIL_H_
 
-#include <map>
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
+#include "third_party/WebKit/public/platform/WebCryptoKey.h"
 
 namespace content {
 
 namespace webcrypto {
 
+// TODO(eroman): Move Status class to a separate file
+
 // Status indicates whether an operation completed successfully, or with an
 // error. The error is used for verification in unit-tests, as well as for
 // display to the user.
 //
 // As such, it is important that errors DO NOT reveal any sensitive material
 // (like key bytes).
 //
 // Care must be taken with what errors are reported back to blink when doing
 // compound operations like unwrapping a JWK key. In this case, errors
 // generated by the JWK import are not appropriate to report since the wrapped
@@ skipping 84 matching lines @@
   // No key data was provided when importing an spki, pkcs8, or jwk formatted
   // key. This does not apply to raw format, since it is possible to have empty
   // key data there.
   static Status ErrorImportEmptyKeyData();
 
   // The wrong key was used for the operation. For instance, a public key was
   // used to verify a RsaSsaPkcs1v1_5 signature, or tried exporting a private
   // key using spki format.
   static Status ErrorUnexpectedKeyType();
 
+  static Status ErrorKeyAlgorithmMismatch();

[Ryan Sleevi, 2014/02/07 01:19:21]

Why are you introducing this in this change?

[eroman, 2014/02/07 21:15:57]

Will change to ErrorUnexpected for now()

+
   // When doing an AES-CBC encryption/decryption, the "iv" parameter was not 16
   // bytes.
   static Status ErrorIncorrectSizeAesCbcIv();
 
   // The data provided to an encrypt/decrypt/sign/verify operation was too
   // large. This can either represent an internal limitation (for instance
   // representing buffer lengths as uints), or an algorithm restriction (for
   // instance RSAES can operation on messages relative to the length of the
   // key's modulus).
   static Status ErrorDataTooLarge();
@@ skipping 58 matching lines @@
 
 // Shrinks a WebArrayBuffer to a new size.
 // TODO(eroman): This works by re-allocating a new buffer. It would be better if
 //               the WebArrayBuffer could just be truncated instead.
 void ShrinkBuffer(blink::WebArrayBuffer* buffer, unsigned int new_size);
 
 // Creates a WebArrayBuffer from a uint8 byte array
 blink::WebArrayBuffer CreateArrayBuffer(const uint8* data,
                                         unsigned int data_size);
 
+// TODO(eroman): Move this to JWK file.
 // This function decodes unpadded 'base64url' encoded data, as described in
 // RFC4648 (http://www.ietf.org/rfc/rfc4648.txt) Section 5.
 // In Web Crypto, this type of encoding is only used inside JWK.
 bool Base64DecodeUrlSafe(const std::string& input, std::string* output);
 
 CONTENT_EXPORT bool IsHashAlgorithm(blink::WebCryptoAlgorithmId alg_id);
 
 // Returns the "hash" param for an algorithm if it exists, otherwise returns
 // a null algorithm.
 blink::WebCryptoAlgorithm GetInnerHashAlgorithm(
@@ skipping 39 matching lines @@
 
 // Creates and AES-GCM algorithm.
 blink::WebCryptoAlgorithm CreateAesGcmAlgorithm(
     const std::vector<uint8>& iv,
     const std::vector<uint8>& additional_data,
     uint8 tag_length_bytes);
 
 // Returns the internal block size for SHA-*
 unsigned int ShaBlockSizeBytes(blink::WebCryptoAlgorithmId hash_id);
 
+bool IsAlgorithmAsymmetric(const blink::WebCryptoAlgorithm& algorithm);

[Ryan Sleevi, 2014/02/07 01:19:21]

Ditto

[eroman, 2014/02/07 21:15:57]

Was moving it out of webcrypto_impl.cc.
Will leave it to a followup cl then.

+
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_WEBCRYPTO_WEBCRYPTO_UTIL_H_