google_apis/gaia/oauth_request_signer.cc - Issue 86913002: Make base::Base64Encode() return void

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: google_apis/gaia/oauth_request_signer.cc

Issue 86913002: Make base::Base64Encode() return void (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: One more chromeos-specific fix. Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: google_apis/gaia/oauth_request_signer.cc

diff --git a/google_apis/gaia/oauth_request_signer.cc b/google_apis/gaia/oauth_request_signer.cc

index fe65d4fa5bbdb0243a9a4c82edaf40ca8eb23ee4..115c14d6f01f8c1f8ed43f4956abfa4d8af8daa3 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;

}