diff options
| author | ricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 11:55:10 +0000 |
|---|---|---|
| committer | ricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 11:55:10 +0000 |
| commit | 0553072d237ad2b977e948591de3f87eee536a9c (patch) | |
| tree | 58b462d22b2342db07c041ac8abaf061e671d1e5 /google_apis/gaia/oauth_request_signer.cc | |
| parent | 9377d2ad77c6d7ee0190c90544eaed0ff0c7fc9c (diff) | |
| download | chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.zip chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.tar.gz chromium_src-0553072d237ad2b977e948591de3f87eee536a9c.tar.bz2 | |
The comment in base64.h implies that base::Base64Encode() can return false, but
this cannot happen in practice. Fix the comment.
The implementation of Base64Encode() attempts to check for the return value
MODP_B64_ERROR as a failure, but modp_b64_encode() cannot return this
value. Remove the check.
Remove unneeded integer cast.
Change the return type to void.
BUG=323357
TEST=base_unittests, compile all
TBR=jochen@chromium.org,miket@chromium.org,joi@chromium.org,akalin@chromium.org,sergeyu@chromium.org
Review URL: https://codereview.chromium.org/86913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/gaia/oauth_request_signer.cc')
| -rw-r--r-- | google_apis/gaia/oauth_request_signer.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/google_apis/gaia/oauth_request_signer.cc b/google_apis/gaia/oauth_request_signer.cc index fe65d4f..115c14d 100644 --- a/google_apis/gaia/oauth_request_signer.cc +++ b/google_apis/gaia/oauth_request_signer.cc @@ -204,10 +204,12 @@ bool SignHmacSha1(const std::string& text, DCHECK(hmac.DigestLength() == kHmacDigestLength); unsigned char digest[kHmacDigestLength]; bool result = hmac.Init(key) && - hmac.Sign(text, digest, kHmacDigestLength) && - base::Base64Encode(std::string(reinterpret_cast<const char*>(digest), - kHmacDigestLength), - signature_return); + hmac.Sign(text, digest, kHmacDigestLength); + if (result) { + base::Base64Encode( + std::string(reinterpret_cast<const char*>(digest), kHmacDigestLength), + signature_return); + } return result; } |