[webcrypto] Minor cleanup/consolidation of JWK source.

content/child/webcrypto/webcrypto_util.h

 // Copyright 2014 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_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_
 #define CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
 #include "base/strings/string_piece.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
-#include "third_party/WebKit/public/platform/WebCrypto.h"  // TODO(eroman): delete
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoKey.h"
 
 namespace content {
 
 namespace webcrypto {
 
 class Status;
 
 // Returns a pointer to the start of |data|, or NULL if it is empty. This is a
 // convenience function for getting the pointer, and should not be used beyond
 // the expected lifetime of |data|.
 CONTENT_EXPORT const uint8* Uint8VectorStart(const std::vector<uint8>& data);
 
 // 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.
 CONTENT_EXPORT bool Base64DecodeUrlSafe(const std::string& input,
                                         std::string* output);
 
 // Returns an unpadded 'base64url' encoding of the input data, the opposite of
 // Base64DecodeUrlSafe() above.
 std::string Base64EncodeUrlSafe(const base::StringPiece& input);
 std::string Base64EncodeUrlSafe(const std::vector<uint8>& input);
@@ skipping 23 matching lines @@
 // algorithm that is not SHA*.
 CONTENT_EXPORT blink::WebCryptoAlgorithm CreateHmacImportAlgorithm(
     blink::WebCryptoAlgorithmId hash_id);
 
 // Creates an import algorithm for RSA algorithms that take a hash.
 // It is an error to call this with a hash_id that is not a SHA*.
 CONTENT_EXPORT blink::WebCryptoAlgorithm CreateRsaHashedImportAlgorithm(
     blink::WebCryptoAlgorithmId id,
     blink::WebCryptoAlgorithmId hash_id);
 
-// TODO(eroman): Move these to jwk.cc
-// Creates an RSASSA-PKCS1-v1_5 algorithm. It is an error to call this with a
-// hash_id that is not a SHA*.
-blink::WebCryptoAlgorithm CreateRsaSsaImportAlgorithm(
-    blink::WebCryptoAlgorithmId hash_id);
-
-// Creates an RSA-OAEP algorithm. It is an error to call this with a hash_id
-// that is not a SHA*.
-blink::WebCryptoAlgorithm CreateRsaOaepImportAlgorithm(
-    blink::WebCryptoAlgorithmId hash_id);
-
-// TODO(eroman): Move to shared_crypto.cc
-// Returns the internal block size for SHA-*
-unsigned int ShaBlockSizeBytes(blink::WebCryptoAlgorithmId hash_id);
-
 bool CreateSecretKeyAlgorithm(const blink::WebCryptoAlgorithm& algorithm,
                               unsigned int keylen_bytes,
                               blink::WebCryptoKeyAlgorithm* key_algorithm);
 
 }  // namespace webcrypto
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_