summaryrefslogtreecommitdiffstats
path: root/net/third_party
diff options
context:
space:
mode:
authorricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 11:55:10 +0000
committerricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-10 11:55:10 +0000
commit0553072d237ad2b977e948591de3f87eee536a9c (patch)
tree58b462d22b2342db07c041ac8abaf061e671d1e5 /net/third_party
parent9377d2ad77c6d7ee0190c90544eaed0ff0c7fc9c (diff)
downloadchromium_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 'net/third_party')
-rw-r--r--net/third_party/mozilla_security_manager/nsKeygenHandler.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp b/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp
index 4cf47c4..f239cc1 100644
--- a/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp
+++ b/net/third_party/mozilla_security_manager/nsKeygenHandler.cpp
@@ -215,13 +215,9 @@ std::string GenKeyAndSignChallenge(int key_size_in_bits,
}
// Convert the signed public key and challenge into base64/ascii.
- if (!base::Base64Encode(std::string(reinterpret_cast<char*>(signedItem.data),
- signedItem.len),
- &result_blob)) {
- LOG(ERROR) << "Couldn't convert signed public key into base64";
- isSuccess = false;
- goto failure;
- }
+ base::Base64Encode(
+ std::string(reinterpret_cast<char*>(signedItem.data), signedItem.len),
+ &result_blob);
failure:
if (!isSuccess) {