diff options
| -rw-r--r-- | chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc | 4 | ||||
| -rw-r--r-- | chromeos/cryptohome/homedir_methods.cc | 5 |
2 files changed, 7 insertions, 2 deletions
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 18c5180..6860f71 100644 --- a/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc +++ b/chrome/browser/chromeos/login/managed/supervised_user_login_flow.cc @@ -153,14 +153,14 @@ void SupervisedUserLoginFlow::OnPasswordChangeDataLoaded( base::Bind(&SupervisedUserLoginFlow::OnNewKeyAdded, weak_factory_.GetWeakPtr(), Passed(&data_copy))); - } else if (SupervisedUserAuthentication::SCHEMA_PLAIN == current_schema) { + } else if (SupervisedUserAuthentication::SCHEMA_SALT_HASHED == + current_schema) { VLOG(1) << "Updating the key"; if (auth->HasIncompleteKey(user_id())) { // We need to use Migrate instead of Authorized Update privilege. key.privileges = kCryptohomeManagedUserIncompleteKeyPrivileges; } - // Just update the key. DCHECK_EQ(context_.key_label, kCryptohomeManagedUserKeyLabel); authenticator_->UpdateKeyAuthorized( diff --git a/chromeos/cryptohome/homedir_methods.cc b/chromeos/cryptohome/homedir_methods.cc index d1a1cf4..cd12218 100644 --- a/chromeos/cryptohome/homedir_methods.cc +++ b/chromeos/cryptohome/homedir_methods.cc @@ -77,8 +77,11 @@ MountError MapError(CryptohomeErrorCode code) { return MOUNT_ERROR_USER_DOES_NOT_EXIST; case CRYPTOHOME_ERROR_NOT_IMPLEMENTED: case CRYPTOHOME_ERROR_MOUNT_FATAL: + case CRYPTOHOME_ERROR_KEY_QUOTA_EXCEEDED: + case CRYPTOHOME_ERROR_BACKING_STORE_FAILURE: return MOUNT_ERROR_FATAL; case CRYPTOHOME_ERROR_AUTHORIZATION_KEY_NOT_FOUND: + case CRYPTOHOME_ERROR_KEY_NOT_FOUND: case CRYPTOHOME_ERROR_AUTHORIZATION_KEY_FAILED: return MOUNT_ERROR_KEY_FAILURE; case CRYPTOHOME_ERROR_TPM_COMM_ERROR: @@ -90,6 +93,8 @@ MountError MapError(CryptohomeErrorCode code) { case CRYPTOHOME_ERROR_TPM_NEEDS_REBOOT: return MOUNT_ERROR_TPM_NEEDS_REBOOT; case CRYPTOHOME_ERROR_AUTHORIZATION_KEY_DENIED: + case CRYPTOHOME_ERROR_KEY_LABEL_EXISTS: + case CRYPTOHOME_ERROR_UPDATE_SIGNATURE_INVALID: return MOUNT_ERROR_KEY_FAILURE; default: NOTREACHED(); |