diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 23:55:59 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 23:55:59 +0000 |
| commit | d91f84376fe8dd249770ac19b7c08f8fcc20f446 (patch) | |
| tree | 8d66a665eac06063bfcf50236fca05f2e4f8f1ea /chrome | |
| parent | a92b86497b6ee02c99a2e4b4a8cf7fb458ab6310 (diff) | |
| download | chromium_src-d91f84376fe8dd249770ac19b7c08f8fcc20f446.zip chromium_src-d91f84376fe8dd249770ac19b7c08f8fcc20f446.tar.gz chromium_src-d91f84376fe8dd249770ac19b7c08f8fcc20f446.tar.bz2 | |
Separate the key setting code in the constructor of HMAC class into the Init
method.
Overload the Init method for char* and std::string.
Add DCHECKs to the destruction methods in ~HMAC in hmac_win.cc.
The patch is written by Takeshi Yoshino <tyoshino@google.com>.
Original code review: http://codereview.chromium.org/88062
R=wtc
http://crbug.com/2297
TEST=base_unittests should pass. Safe browsing should continue to work.
Review URL: http://codereview.chromium.org/113001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc index ea19736..4f9d776 100644 --- a/chrome/browser/safe_browsing/safe_browsing_util.cc +++ b/chrome/browser/safe_browsing/safe_browsing_util.cc @@ -170,9 +170,9 @@ bool VerifyMAC(const std::string& key, const std::string& mac, std::string decoded_mac; net::Base64Decode(mac_copy, &decoded_mac); - base::HMAC hmac(base::HMAC::SHA1, - reinterpret_cast<const unsigned char*>(decoded_key.data()), - static_cast<int>(decoded_key.length())); + base::HMAC hmac(base::HMAC::SHA1); + if (!hmac.Init(decoded_key)) + return false; const std::string data_str(data, data_length); unsigned char digest[kSafeBrowsingMacDigestSize]; if (!hmac.Sign(data_str, digest, kSafeBrowsingMacDigestSize)) |