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

net/base/transport_security_state.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 "net/base/transport_security_state.h"
 
 #include <nspr.h>
 
 #include <cryptohi.h>
 #include <hasht.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
-// NSS leaks #defines from its headers which will upset base/sha1.h.
-#if defined(SHA1_LENGTH)
-#undef SHA1_LENGTH
-#endif

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

Excellent!

-
 #include "base/base64.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 543 matching lines @@
   enabled_hosts_.clear();
   return Deserialise(input, dirty, &enabled_hosts_);
 }
 
 static bool AddHash(const std::string& type_and_base64,
                     std::vector<SHA1Fingerprint>* out) {
   std::string hash_str;
   if (type_and_base64.find("sha1/") == 0 &&
       base::Base64Decode(type_and_base64.substr(5, type_and_base64.size() - 5),
                          &hash_str) &&
-      hash_str.size() == base::SHA1_LENGTH) {
+      hash_str.size() == base::kSHA1Length) {
     SHA1Fingerprint hash;
     memcpy(hash.data, hash_str.data(), sizeof(hash.data));
     out->push_back(hash);
     return true;
   }
   return false;
 }
 
 // static
 bool TransportSecurityState::Deserialise(
@@ skipping 411 matching lines @@
   }
 
   LOG(ERROR) << "Rejecting public key chain for domain " << domain
              << ". Validated chain: " << HashesToBase64String(hashes)
              << ", expected: " << HashesToBase64String(public_key_hashes);
 
   return false;
 }
 
 }  // namespace