diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 21:15:27 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 21:15:27 +0000 |
| commit | b13b9bdddf305f4992a97508a757600f40232faa (patch) | |
| tree | 0649e1056f6e6c67921c7104ec406665c5c2b224 /net/base/transport_security_state.cc | |
| parent | 927c151d93c1d458dc8e92e4b4dcb07874a0c436 (diff) | |
| download | chromium_src-b13b9bdddf305f4992a97508a757600f40232faa.zip chromium_src-b13b9bdddf305f4992a97508a757600f40232faa.tar.gz chromium_src-b13b9bdddf305f4992a97508a757600f40232faa.tar.bz2 | |
Update SHA1_LENGTH -> kSHA1Length to match previous change to SHA256_LENGTH.
(I didn't try and understand or fix why kSHA1Length is in base:: while kSHA256Length is in crypto::.)
BUG=92247
TEST=compiles
Review URL: http://codereview.chromium.org/7972024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/transport_security_state.cc')
| -rw-r--r-- | net/base/transport_security_state.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc index fd6f11b..31454fd 100644 --- a/net/base/transport_security_state.cc +++ b/net/base/transport_security_state.cc @@ -11,11 +11,6 @@ #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 - #include "base/base64.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" @@ -597,7 +592,7 @@ static bool AddHash(const std::string& type_and_base64, 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); |