[Sync] Add intelligent re-encryption support.

chrome/browser/sync/util/cryptographer.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "base/base64.h"
 #include "chrome/browser/sync/util/cryptographer.h"
 #include "chrome/browser/password_manager/encryptor.h"
 
@@ skipping 39 matching lines @@
 
 bool Cryptographer::CanDecrypt(const sync_pb::EncryptedData& data) const {
   return nigoris_.end() != nigoris_.find(data.key_name());
 }
 
 bool Cryptographer::CanDecryptUsingDefaultKey(
     const sync_pb::EncryptedData& data) const {
   return default_nigori_ && (data.key_name() == default_nigori_->first);
 }
 
+bool Cryptographer::EncryptIfDifferent(
+    const ::google::protobuf::MessageLite& message,
+    sync_pb::EncryptedData* encrypted) const {
+  DCHECK(encrypted);
+  if (!default_nigori_) {
+    LOG(ERROR) << "Cryptographer not ready, failed to encrypt.";
+    return false;
+  }
+
+  std::string serialized;
+  if (!message.SerializeToString(&serialized)) {
+    LOG(ERROR) << "Message is invalid/missing a required field.";
+    return false;
+  }
+
+  if (CanDecryptUsingDefaultKey(*encrypted)) {
+    std::string original_serialized = DecryptToString(*encrypted);

[akalin, 2011/12/09 23:52:42]

const ref

[Nicolas Zea, 2011/12/12 20:12:26]

Done.

+    if (original_serialized == serialized) {
+      DVLOG(2) << "Re-encryption unnecessary, encrypted data already matches.";
+      return true;
+    }
+  }
+
+  return EncryptImpl(serialized, default_nigori_, encrypted);
+}
+
 bool Cryptographer::Encrypt(const ::google::protobuf::MessageLite& message,
                             sync_pb::EncryptedData* encrypted) const {
-  if (!encrypted || !default_nigori_) {
+  DCHECK(encrypted);
+  if (!default_nigori_) {
     LOG(ERROR) << "Cryptographer not ready, failed to encrypt.";
     return false;
   }
 
   std::string serialized;
   if (!message.SerializeToString(&serialized)) {
     LOG(ERROR) << "Message is invalid/missing a required field.";
     return false;
   }
 
+  return EncryptImpl(serialized, default_nigori_, encrypted);
+}
+
+bool Cryptographer::EncryptImpl(const std::string& serialized,
+                                const NigoriMap::value_type* nigori,
+                                sync_pb::EncryptedData* encrypted) const {
   encrypted->set_key_name(default_nigori_->first);
-  if (!default_nigori_->second->Encrypt(serialized,
-                                        encrypted->mutable_blob())) {
+  if (!nigori->second->Encrypt(serialized,
+                               encrypted->mutable_blob())) {
     LOG(ERROR) << "Failed to encrypt data.";
     return false;
   }
   return true;
 }
 
 bool Cryptographer::Decrypt(const sync_pb::EncryptedData& encrypted,
                             ::google::protobuf::MessageLite* message) const {
   DCHECK(message);
   std::string plaintext = DecryptToString(encrypted);
@@ skipping 26 matching lines @@
        ++it) {
     const Nigori& nigori = *it->second;
     sync_pb::NigoriKey* key = bag.add_key();
     key->set_name(it->first);
     nigori.ExportKeys(key->mutable_user_key(),
                       key->mutable_encryption_key(),
                       key->mutable_mac_key());
   }
 
   // Encrypt the bag with the default Nigori.
-  return Encrypt(bag, encrypted);
+  return EncryptIfDifferent(bag, encrypted);
 }
 
 bool Cryptographer::AddKey(const KeyParams& params) {
   DCHECK(NULL == pending_keys_.get());
 
   // Create the new Nigori and make it the default encryptor.
   scoped_ptr<Nigori> nigori(new Nigori);
   if (!nigori->InitByDerivation(params.hostname,
                                 params.username,
                                 params.password)) {
@@ skipping 281 matching lines @@
         continue;
       }
       nigoris_[key.name()] = make_linked_ptr(new_nigori.release());
     }
   }
   DCHECK(nigoris_.end() != nigoris_.find(default_key_name));
   default_nigori_ = &*nigoris_.find(default_key_name);
 }
 
 }  // namespace browser_sync