Chromium Code Reviews| Index: chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc |
| diff --git a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc |
| index 34a3fe04fb9a6be3e0fd61449604885045cba807..2724a6979219d30845844389bbe7c496dcace2c3 100644 |
| --- a/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc |
| +++ b/chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc |
| @@ -272,8 +272,8 @@ void ManagedUserCreationControllerNew::OnMountSuccess( |
| &password_key.signature_key); |
| Key key(Key::KEY_TYPE_SALTED_PBKDF2_AES256_1234, |
| - creation_context_->salted_master_key, |
| - std::string()); // The salt is stored elsewhere. |
| + std::string(), // No need for salt, key's already hashed. |
|
bartfab (slow)
2014/06/02 16:35:20
Actually, the original comment was correct: The Ke
Denis Kuznetsov (DE-MUC)
2014/06/02 16:39:28
Done.
|
| + creation_context_->salted_master_key); |
| key.SetLabel(kCryptohomeMasterKeyLabel); |
| UserContext context(creation_context_->local_user_id); |
| context.SetKey(key); |