Revert 239759 "The comment in base64.h implies that base::Base64..."

> 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

TBR=ricea@chromium.org

Review URL: https://codereview.chromium.org/101113004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239921 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 23 insertions, 9 deletions

diff --git a/remoting/base/rsa_key_pair.cc b/remoting/base/rsa_key_pair.cc
index 28dd2ef..1cea077 100644
--- a/remoting/base/rsa_key_pair.cc
+++ b/remoting/base/rsa_key_pair.cc
@@ -63,7 +63,9 @@ std::string RsaKeyPair::ToString() const {
   CHECK(key_->ExportPrivateKey(&key_buf));
   std::string key_str(key_buf.begin(), key_buf.end());
   std::string key_base64;
-  base::Base64Encode(key_str, &key_base64);
+  if (!base::Base64Encode(key_str, &key_base64)) {
+    LOG(FATAL) << "Base64Encode failed";
+  }
   return key_base64;
 }
 
diff --git a/remoting/host/pin_hash.cc b/remoting/host/pin_hash.cc
index c9b1ca3c..fe17f38 100644
--- a/remoting/host/pin_hash.cc
+++ b/remoting/host/pin_hash.cc
@@ -16,7 +16,9 @@ std::string MakeHostPinHash(const std::string& host_id,
   std::string hash = protocol::AuthenticationMethod::ApplyHashFunction(
       protocol::AuthenticationMethod::HMAC_SHA256, host_id, pin);
   std::string hash_base64;
-  base::Base64Encode(hash, &hash_base64);
+  if (!base::Base64Encode(hash, &hash_base64)) {
+    LOG(FATAL) << "Base64Encode failed";
+  }
   return "hmac:" + hash_base64;
 }
 
diff --git a/remoting/host/token_validator_factory_impl.cc b/remoting/host/token_validator_factory_impl.cc
index d93df62..3dd9245 100644
--- a/remoting/host/token_validator_factory_impl.cc
+++ b/remoting/host/token_validator_factory_impl.cc
@@ -107,7 +107,8 @@ class TokenValidatorImpl
     std::string nonce_bytes;
     crypto::RandBytes(WriteInto(&nonce_bytes, kNonceLength + 1), kNonceLength);
     std::string nonce;
-    base::Base64Encode(nonce_bytes, &nonce);
+    bool success = base::Base64Encode(nonce_bytes, &nonce);
+    DCHECK(success);
     return "client:" + remote_jid + " host:" + local_jid + " nonce:" + nonce;
   }
 
diff --git a/remoting/protocol/auth_util.cc b/remoting/protocol/auth_util.cc
index 17263bf..4559636 100644
--- a/remoting/protocol/auth_util.cc
+++ b/remoting/protocol/auth_util.cc
@@ -26,7 +26,9 @@ std::string GenerateSupportAuthToken(const std::string& jid,
                                      const std::string& access_code) {
   std::string sha256 = crypto::SHA256HashString(jid + " " + access_code);
   std::string sha256_base64;
-  base::Base64Encode(sha256, &sha256_base64);
+  if (!base::Base64Encode(sha256, &sha256_base64)) {
+    LOG(FATAL) << "Failed to encode auth token";
+  }
   return sha256_base64;
 }
 
diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc
index 25b0efe..8311476 100644
--- a/remoting/protocol/authenticator_test_base.cc
+++ b/remoting/protocol/authenticator_test_base.cc
@@ -53,7 +53,7 @@ void AuthenticatorTestBase::SetUp() {
   std::string key_string;
   ASSERT_TRUE(base::ReadFileToString(key_path, &key_string));
   std::string key_base64;
-  base::Base64Encode(key_string, &key_base64);
+  ASSERT_TRUE(base::Base64Encode(key_string, &key_base64));
   key_pair_ = RsaKeyPair::FromString(key_base64);
   ASSERT_TRUE(key_pair_.get());
   host_public_key_ = key_pair_->GetPublicKey();
diff --git a/remoting/protocol/pairing_registry.cc b/remoting/protocol/pairing_registry.cc
index f1ce333..c159ce6 100644
--- a/remoting/protocol/pairing_registry.cc
+++ b/remoting/protocol/pairing_registry.cc
@@ -49,8 +49,10 @@ PairingRegistry::Pairing PairingRegistry::Pairing::Create(
   std::string shared_secret;
   char buffer[kKeySize];
   crypto::RandBytes(buffer, arraysize(buffer));
-  base::Base64Encode(base::StringPiece(buffer, arraysize(buffer)),
-                     &shared_secret);
+  if (!base::Base64Encode(base::StringPiece(buffer, arraysize(buffer)),
+                          &shared_secret)) {
+    LOG(FATAL) << "Base64Encode failed.";
+  }
   return Pairing(created_time, client_name, client_id, shared_secret);
 }
 
diff --git a/remoting/protocol/v2_authenticator.cc b/remoting/protocol/v2_authenticator.cc
index ee5c9d1..80f7af3 100644
--- a/remoting/protocol/v2_authenticator.cc
+++ b/remoting/protocol/v2_authenticator.cc
@@ -156,7 +156,10 @@ scoped_ptr<buzz::XmlElement> V2Authenticator::GetNextMessage() {
   while (!pending_messages_.empty()) {
     const std::string& spake_message = pending_messages_.front();
     std::string base64_message;
-    base::Base64Encode(spake_message, &base64_message);
+    if (!base::Base64Encode(spake_message, &base64_message)) {
+      LOG(DFATAL) << "Cannot perform base64 encode on certificate";
+      continue;
+    }
 
     buzz::XmlElement* eke_tag = new buzz::XmlElement(kEkeTag);
     eke_tag->SetBodyText(base64_message);
@@ -168,7 +171,9 @@ scoped_ptr<buzz::XmlElement> V2Authenticator::GetNextMessage() {
   if (!local_cert_.empty() && !certificate_sent_) {
     buzz::XmlElement* certificate_tag = new buzz::XmlElement(kCertificateTag);
     std::string base64_cert;
-    base::Base64Encode(local_cert_, &base64_cert);
+    if (!base::Base64Encode(local_cert_, &base64_cert)) {
+      LOG(DFATAL) << "Cannot perform base64 encode on certificate";
+    }
     certificate_tag->SetBodyText(base64_cert);
     message->AddElement(certificate_tag);
     certificate_sent_ = true;