summaryrefslogtreecommitdiffstats
path: root/base/sha1_win.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 21:15:27 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 21:15:27 +0000
commitb13b9bdddf305f4992a97508a757600f40232faa (patch)
tree0649e1056f6e6c67921c7104ec406665c5c2b224 /base/sha1_win.cc
parent927c151d93c1d458dc8e92e4b4dcb07874a0c436 (diff)
downloadchromium_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 'base/sha1_win.cc')
-rw-r--r--base/sha1_win.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/base/sha1_win.cc b/base/sha1_win.cc
index 233749b5..2edfb3d 100644
--- a/base/sha1_win.cc
+++ b/base/sha1_win.cc
@@ -19,20 +19,20 @@ std::string SHA1HashString(const std::string& str) {
if (!CryptAcquireContext(provider.receive(), NULL, NULL, PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT)) {
LOG(ERROR) << "CryptAcquireContext failed: " << GetLastError();
- return std::string(SHA1_LENGTH, '\0');
+ return std::string(kSHA1Length, '\0');
}
{
ScopedHCRYPTHASH hash;
if (!CryptCreateHash(provider, CALG_SHA1, 0, 0, hash.receive())) {
LOG(ERROR) << "CryptCreateHash failed: " << GetLastError();
- return std::string(SHA1_LENGTH, '\0');
+ return std::string(kSHA1Length, '\0');
}
if (!CryptHashData(hash, reinterpret_cast<CONST BYTE*>(str.data()),
static_cast<DWORD>(str.length()), 0)) {
LOG(ERROR) << "CryptHashData failed: " << GetLastError();
- return std::string(SHA1_LENGTH, '\0');
+ return std::string(kSHA1Length, '\0');
}
DWORD hash_len = 0;
@@ -41,7 +41,7 @@ std::string SHA1HashString(const std::string& str) {
reinterpret_cast<unsigned char*>(&hash_len),
&buffer_size, 0)) {
LOG(ERROR) << "CryptGetHashParam(HP_HASHSIZE) failed: " << GetLastError();
- return std::string(SHA1_LENGTH, '\0');
+ return std::string(kSHA1Length, '\0');
}
std::string result;
@@ -51,13 +51,13 @@ std::string SHA1HashString(const std::string& str) {
reinterpret_cast<BYTE*>(WriteInto(&result, hash_len + 1)), &hash_len,
0))) {
LOG(ERROR) << "CryptGetHashParam(HP_HASHVAL) failed: " << GetLastError();
- return std::string(SHA1_LENGTH, '\0');
+ return std::string(kSHA1Length, '\0');
}
- if (hash_len != SHA1_LENGTH) {
+ if (hash_len != kSHA1Length) {
LOG(ERROR) << "Returned hash value is wrong length: " << hash_len
- << " should be " << SHA1_LENGTH;
- return std::string(SHA1_LENGTH, '\0');
+ << " should be " << kSHA1Length;
+ return std::string(kSHA1Length, '\0');
}
return result;