diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 20:12:40 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 20:12:40 +0000 |
| commit | dd8ba224cd407d5962f42d05aff0ba96c526fdbf (patch) | |
| tree | 3bdfd833d84e9d98b3c15e75b216c7fd666d8da1 | |
| parent | fb56922aa855c95759452ca2bfffd340da333dcf (diff) | |
| download | chromium_src-dd8ba224cd407d5962f42d05aff0ba96c526fdbf.zip chromium_src-dd8ba224cd407d5962f42d05aff0ba96c526fdbf.tar.gz chromium_src-dd8ba224cd407d5962f42d05aff0ba96c526fdbf.tar.bz2 | |
Ignore empty passphrases in SyncSetupFlow.OnUserConfigured.
BUG=104189
TEST=see bug
Review URL: http://codereview.chromium.org/8989063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115912 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index d5c0dfa..5fe3dc6 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -428,7 +428,8 @@ void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) { service_->EnableEncryptEverything(); bool set_new_decryption_passphrase = false; - if (configuration.set_gaia_passphrase) { + if (configuration.set_gaia_passphrase && + !configuration.gaia_passphrase.empty()) { // Caller passed a gaia passphrase. This is illegal if we are currently // using a secondary passphrase. DCHECK(!service_->IsUsingSecondaryPassphrase()); @@ -457,7 +458,8 @@ void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) { // Set the secondary passphrase, either as a decryption passphrase, or // as an attempt to encrypt the user's data using this new passphrase. - if (configuration.set_secondary_passphrase) { + if (configuration.set_secondary_passphrase && + !configuration.secondary_passphrase.empty()) { service_->SetPassphrase(configuration.secondary_passphrase, true); if (service_->IsUsingSecondaryPassphrase()) { user_tried_setting_passphrase_ = true; |