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

trunk/src/sync/util/nigori.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/util/nigori.h"
 
 #include <sstream>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 132 matching lines @@
     return false;
 
   std::vector<unsigned char> hash(kHashSize);
   if (!hmac.Sign(ciphertext, &hash[0], hash.size()))
     return false;
 
   std::string output;
   output.assign(ciphertext);
   output.append(hash.begin(), hash.end());
 
-  return Base64Encode(output, permuted);
+  Base64Encode(output, permuted);
+  return true;
 }
 
 // Enc[Kenc,Kmac](value)
 bool Nigori::Encrypt(const std::string& value, std::string* encrypted) const {
   if (0U >= value.size())
     return false;
 
   std::string iv;
   crypto::RandBytes(WriteInto(&iv, kIvSize + 1), kIvSize);
 
@@ skipping 15 matching lines @@
 
   std::vector<unsigned char> hash(kHashSize);
   if (!hmac.Sign(ciphertext, &hash[0], hash.size()))
     return false;
 
   std::string output;
   output.assign(iv);
   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 {
   std::string input;
   if (!Base64Decode(encrypted, &input))
     return false;
 
   if (input.size() < kIvSize * 2 + kHashSize)
     return false;
 
@@ skipping 39 matching lines @@
   DCHECK(user_key);
   DCHECK(encryption_key);
   DCHECK(mac_key);
 
   return user_key_->GetRawKey(user_key) &&
       encryption_key_->GetRawKey(encryption_key) &&
       mac_key_->GetRawKey(mac_key);
 }
 
 }  // namespace syncer