1 files changed, 6 insertions, 19 deletions

diff --git a/crypto/hmac_win.cc b/crypto/hmac_win.cc
index ef3e261..ffd08ce8 100644
--- a/crypto/hmac_win.cc
+++ b/crypto/hmac_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -28,19 +28,6 @@ enum {
   SHA256_BLOCK_SIZE = 64  // Block size (in bytes) of the input to SHA-256.
 };
 
-// NSS doesn't accept size_t for text size, divide the data into smaller
-// chunks as needed.
-void Wrapped_SHA256_Update(SHA256Context* ctx, const unsigned char* text,
-                           size_t text_len) {
-  const unsigned int kChunkSize = 1 << 30;
-  while (text_len > kChunkSize) {
-    SHA256_Update(ctx, text, kChunkSize);
-    text += kChunkSize;
-    text_len -= kChunkSize;
-  }
-  SHA256_Update(ctx, text, (unsigned int)text_len);
-}
-
 // See FIPS 198: The Keyed-Hash Message Authentication Code (HMAC).
 void ComputeHMACSHA256(const unsigned char* key, size_t key_len,
                        const unsigned char* text, size_t text_len,
@@ -51,7 +38,7 @@ void ComputeHMACSHA256(const unsigned char* key, size_t key_len,
   unsigned char key0[SHA256_BLOCK_SIZE];
   if (key_len > SHA256_BLOCK_SIZE) {
     SHA256_Begin(&ctx);
-    Wrapped_SHA256_Update(&ctx, key, key_len);
+    SHA256_Update(&ctx, key, key_len);
     SHA256_End(&ctx, key0, NULL, SHA256_LENGTH);
     memset(key0 + SHA256_LENGTH, 0, SHA256_BLOCK_SIZE - SHA256_LENGTH);
   } else {
@@ -70,7 +57,7 @@ void ComputeHMACSHA256(const unsigned char* key, size_t key_len,
   // Compute the inner hash.
   SHA256_Begin(&ctx);
   SHA256_Update(&ctx, padded_key, SHA256_BLOCK_SIZE);
-  Wrapped_SHA256_Update(&ctx, text, text_len);
+  SHA256_Update(&ctx, text, text_len);
   SHA256_End(&ctx, inner_hash, NULL, SHA256_LENGTH);
 
   // XOR key0 with opad.
@@ -81,7 +68,7 @@ void ComputeHMACSHA256(const unsigned char* key, size_t key_len,
   SHA256_Begin(&ctx);
   SHA256_Update(&ctx, padded_key, SHA256_BLOCK_SIZE);
   SHA256_Update(&ctx, inner_hash, SHA256_LENGTH);
-  SHA256_End(&ctx, output, NULL, (unsigned int) output_len);
+  SHA256_End(&ctx, output, NULL, output_len);
 }
 
 }  // namespace
@@ -151,8 +138,8 @@ bool HMAC::Init(const unsigned char* key, int key_length) {
   memcpy(key_blob->key_data, key, key_length);
 
   if (!CryptImportKey(plat_->provider_, &key_blob_storage[0],
-                      (DWORD)key_blob_storage.size(), 0,
-                      CRYPT_IPSEC_HMAC_KEY, plat_->key_.receive())) {
+                      key_blob_storage.size(), 0, CRYPT_IPSEC_HMAC_KEY,
+                      plat_->key_.receive())) {
     NOTREACHED();
     return false;
   }