diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 01:13:38 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 01:13:38 +0000 |
| commit | dc58763688f198a48493bfb472d0d0f45f2b34be (patch) | |
| tree | 2eb473939395a5b0aeac4171702069ec3eabebe3 /sync/tools | |
| parent | 8d3d7ea57ac19413cdbac93c60d9fdf9803f78e0 (diff) | |
| download | chromium_src-dc58763688f198a48493bfb472d0d0f45f2b34be.zip chromium_src-dc58763688f198a48493bfb472d0d0f45f2b34be.tar.gz chromium_src-dc58763688f198a48493bfb472d0d0f45f2b34be.tar.bz2 | |
[Sync] Persist keystore key across restarts
Adds the preference for the bootstrap token and the bootstrapping functionality
in the cryptographer so that we persist the keystore key across restarts. With
this, we should only ever do one GetKey per client, and only on the first time
that client signs in/restarts on a version with GetKey support (although it's
not persisted across signouts/profile nukes)
BUG=129665
TEST=unit_tests
Review URL: https://chromiumcodereview.appspot.com/10540149
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
| -rw-r--r-- | sync/tools/sync_client.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index 357b694..8e47287 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -345,6 +345,7 @@ int SyncClientMain(int argc, char* argv[]) { ExtensionsActivityMonitor* extensions_activity_monitor = NULL; LoggingChangeDelegate change_delegate; const char kRestoredKeyForBootstrapping[] = ""; + const char kRestoredKeystoreKeyForBootstrapping[] = ""; NullEncryptor null_encryptor; LoggingUnrecoverableErrorHandler unrecoverable_error_handler; sync_manager->Init(database_dir.path(), @@ -362,6 +363,7 @@ int SyncClientMain(int argc, char* argv[]) { scoped_ptr<SyncNotifier>( sync_notifier_factory.CreateSyncNotifier()), kRestoredKeyForBootstrapping, + kRestoredKeystoreKeyForBootstrapping, true, // enable keystore encryption scoped_ptr<InternalComponentsFactory>( new InternalComponentsFactoryImpl()), |