Update SHA1_LENGTH -> kSHA1Length to match previous change to SHA256_LENGTH.

crypto/hmac_win.cc

 // 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.
 
 #include "crypto/hmac.h"
 
 #include <windows.h>
 #include <wincrypt.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
 #include "crypto/scoped_capi_types.h"
+#include "crypto/sha2.h"

[wtc, 2011/09/24 01:39:41]

BUG(kind of): Please also undo the changes in this file.
The references to SHA256_LENGTH in this file are actually
to the SHA256_LENGTH macro defined in "crypto/third_party/nss/blapi.h",
which is an NSS file that we copied.

 #include "crypto/third_party/nss/blapi.h"
 #include "crypto/third_party/nss/sha256.h"
 
 namespace crypto {
 
 namespace {
 
 // Implementation of HMAC-SHA-256:
 //
 // SHA-256 is supported in Windows XP SP3 or later.  We still need to support
 // Windows XP SP2, so unfortunately we have to implement HMAC-SHA-256 here.
 
 enum {
   SHA256_BLOCK_SIZE = 64  // Block size (in bytes) of the input to SHA-256.
 };
 
 // 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,
                        unsigned char* output, size_t output_len) {
   SHA256Context ctx;
 
   // Pre-process the key, if necessary.
   unsigned char key0[SHA256_BLOCK_SIZE];
   if (key_len > SHA256_BLOCK_SIZE) {
     SHA256_Begin(&ctx);
     SHA256_Update(&ctx, key, key_len);
-    SHA256_End(&ctx, key0, NULL, SHA256_LENGTH);
-    memset(key0 + SHA256_LENGTH, 0, SHA256_BLOCK_SIZE - SHA256_LENGTH);
+    SHA256_End(&ctx, key0, NULL, kSHA256Length);
+    memset(key0 + kSHA256Length, 0, SHA256_BLOCK_SIZE - kSHA256Length);
   } else {
     memcpy(key0, key, key_len);
     memset(key0 + key_len, 0, SHA256_BLOCK_SIZE - key_len);
   }
 
   unsigned char padded_key[SHA256_BLOCK_SIZE];
-  unsigned char inner_hash[SHA256_LENGTH];
+  unsigned char inner_hash[kSHA256Length];
 
   // XOR key0 with ipad.
   for (int i = 0; i < SHA256_BLOCK_SIZE; ++i)
     padded_key[i] = key0[i] ^ 0x36;
 
   // Compute the inner hash.
   SHA256_Begin(&ctx);
   SHA256_Update(&ctx, padded_key, SHA256_BLOCK_SIZE);
   SHA256_Update(&ctx, text, text_len);
-  SHA256_End(&ctx, inner_hash, NULL, SHA256_LENGTH);
+  SHA256_End(&ctx, inner_hash, NULL, kSHA256Length);
 
   // XOR key0 with opad.
   for (int i = 0; i < SHA256_BLOCK_SIZE; ++i)
     padded_key[i] = key0[i] ^ 0x5c;
 
   // Compute the outer hash.
   SHA256_Begin(&ctx);
   SHA256_Update(&ctx, padded_key, SHA256_BLOCK_SIZE);
-  SHA256_Update(&ctx, inner_hash, SHA256_LENGTH);
+  SHA256_Update(&ctx, inner_hash, kSHA256Length);
   SHA256_End(&ctx, output, NULL, output_len);
 }
 
 }  // namespace
 
 struct HMACPlatformData {
   ~HMACPlatformData() {
     if (!raw_key_.empty()) {
       SecureZeroMemory(&raw_key_[0], raw_key_.size());
     }
@@ skipping 16 matching lines @@
 }
 
 bool HMAC::Init(const unsigned char* key, int key_length) {
   if (plat_->provider_ || plat_->key_ || !plat_->raw_key_.empty()) {
     // Init must not be called more than once on the same HMAC object.
     NOTREACHED();
     return false;
   }
 
   if (hash_alg_ == SHA256) {
-    if (key_length < SHA256_LENGTH / 2)
+    if (key_length < kSHA256Length / 2)
       return false;  // Key is too short.
     plat_->raw_key_.assign(key, key + key_length);
     return true;
   }
 
   if (!CryptAcquireContext(plat_->provider_.receive(), NULL, NULL,
                            PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
     NOTREACHED();
     return false;
   }
@@ skipping 71 matching lines @@
 
   if (!CryptHashData(hash, reinterpret_cast<const BYTE*>(data.data()),
                      static_cast<DWORD>(data.size()), 0))
     return false;
 
   DWORD sha1_size = digest_length;
   return !!CryptGetHashParam(hash, HP_HASHVAL, digest, &sha1_size, 0);
 }
 
 }  // namespace crypto