Add a Key class

chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller_new.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/login/auth/key.h"
 #include "chrome/browser/chromeos/login/auth/mount_manager.h"
 #include "chrome/browser/chromeos/login/auth/user_context.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"
 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ skipping 166 matching lines @@
   stage_ = KEYS_GENERATED;
 
   VLOG(1) << " Phase 2 : Create cryptohome";
 
   timeout_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromSeconds(kUserCreationTimeoutSeconds),
       this,
       &ManagedUserCreationControllerNew::CreationTimedOut);
   authenticator_ = new ExtendedAuthenticator(this);
-  authenticator_->HashPasswordWithSalt(
-      creation_context_->master_key,
-      base::Bind(&ManagedUserCreationControllerNew::OnPasswordHashingSuccess,
+  UserContext user_context;
+  user_context.SetKey(Key(creation_context_->master_key));
+  authenticator_->TransformKeyIfNeeded(
+      user_context,
+      base::Bind(&ManagedUserCreationControllerNew::OnKeyTransformedIfNeeded,
                  weak_factory_.GetWeakPtr()));
 }
 
-void ManagedUserCreationControllerNew::OnPasswordHashingSuccess(
-    const std::string& password_hash) {
+void ManagedUserCreationControllerNew::OnKeyTransformedIfNeeded(
+    const UserContext& user_context) {
   VLOG(1) << " Phase 2.1 : Got hashed master key";
-  creation_context_->salted_master_key = password_hash;
+  creation_context_->salted_master_key = user_context.GetKey()->GetSecret();
 
   // Create home dir with two keys.
   std::vector<cryptohome::KeyDefinition> keys;
 
   // Main key is the master key. Just as keys for plain GAIA users, it is salted
   // with system salt. It has all usual privileges.
   cryptohome::KeyDefinition master_key(creation_context_->salted_master_key,
                                        kCryptohomeMasterKeyLabel,
                                        cryptohome::PRIV_DEFAULT);
 
@@ skipping 38 matching lines @@
   // Plain text password, hashed and salted with individual salt.
   // It can be used for mounting homedir, and can be replaced only when signed.
   cryptohome::KeyDefinition password_key(creation_context_->salted_password,
                                          kCryptohomeManagedUserKeyLabel,
                                          kCryptohomeManagedUserKeyPrivileges);
   base::Base64Decode(creation_context_->encryption_key,
                      &password_key.encryption_key);
   base::Base64Decode(creation_context_->signature_key,
                      &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.
+  key.SetLabel(kCryptohomeMasterKeyLabel);
   UserContext context(creation_context_->local_user_id);
-  context.SetPassword(creation_context_->salted_master_key);
-  context.SetDoesNeedPasswordHashing(false);
-  context.SetKeyLabel(kCryptohomeMasterKeyLabel);
+  context.SetKey(key);
   context.SetIsUsingOAuth(false);
 
   authenticator_->AddKey(
       context,
       password_key,
       true,
       base::Bind(&ManagedUserCreationControllerNew::OnAddKeySuccess,
                  weak_factory_.GetWeakPtr()));
 }
 
@@ skipping 102 matching lines @@
   creation_context_->registration_utility.reset();
   chrome::AttemptUserExit();
 }
 
 std::string ManagedUserCreationControllerNew::GetManagedUserId() {
   DCHECK(creation_context_);
   return creation_context_->local_user_id;
 }
 
 }  // namespace chromeos