| Index: base/sha1_win.cc
|
| ===================================================================
|
| --- base/sha1_win.cc (revision 102606)
|
| +++ base/sha1_win.cc (working copy)
|
| @@ -19,20 +19,20 @@
|
| 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 @@
|
| 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 @@
|
| 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;
|
|
|