Revert 239921 "Revert 239759 "The comment in base64.h implies th..."

trunk/src/sync/util/nigori.cc

Index: trunk/src/sync/util/nigori.cc
===================================================================
--- trunk/src/sync/util/nigori.cc	(revision 239943)
+++ trunk/src/sync/util/nigori.cc	(working copy)
@@ -150,7 +150,8 @@
   output.assign(ciphertext);
   output.append(hash.begin(), hash.end());
 
-  return Base64Encode(output, permuted);
+  Base64Encode(output, permuted);
+  return true;
 }
 
 // Enc[Kenc,Kmac](value)
@@ -186,7 +187,8 @@
   output.append(ciphertext);
   output.append(hash.begin(), hash.end());
 
-  return Base64Encode(output, encrypted);
+  Base64Encode(output, encrypted);
+  return true;
 }
 
 bool Nigori::Decrypt(const std::string& encrypted, std::string* value) const {