chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc - Issue 221813006: Various supervised user password fixes - 2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

Issue 221813006: Various supervised user password fixes - 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix comments Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/managed/supervised_user_authentication.cc ('k') | chrome/browser/chromeos/login/supervised_user_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

diff --git a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

index d28681f09e7d3af4a102f3f161c7c2983a62eaa1..18c518028c17d4373d780b8dd974bf53f2fe8208 100644

--- a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

+++ b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc

@@ -111,7 +111,7 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded(

int revision = 0;

int schema = 0;

bool success = password_data->GetStringWithoutPathExpansion(

- kPasswordSignatureKey, &base64_signature);

+ kPasswordSignature, &base64_signature);

success &= password_data->GetIntegerWithoutPathExpansion(kPasswordRevision,

&revision);

success &=

@@ -181,7 +181,7 @@ void SupervisedUserLoginFlow::OnNewKeyAdded(

SupervisedUserAuthentication* auth =

UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();

auth->StorePasswordData(user_id(), *password_data.get());

- auth->MarkKeyIncomplete(user_id());

+ auth->MarkKeyIncomplete(user_id(), true /* incomplete */);

authenticator_->RemoveKey(

context_,

kLegacyCryptohomeManagedUserKeyLabel,

@@ -230,7 +230,7 @@ void SupervisedUserLoginFlow::OnPasswordUpdated(

bool was_incomplete = auth->HasIncompleteKey(user_id());

auth->StorePasswordData(user_id(), *password_data.get());

if (was_incomplete)

- auth->MarkKeyIncomplete(user_id());

+ auth->MarkKeyIncomplete(user_id(), true /* incomplete */);

UMA_HISTOGRAM_ENUMERATION(

"ManagedUsers.ChromeOS.PasswordChange",