Add a Key class

chrome/browser/managed_mode/chromeos/manager_password_service.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/managed_mode/chromeos/manager_password_service.h"
 
 #include "base/bind.h"
+#include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/login/auth/key.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/managed_mode/managed_user_constants.h"
 #include "chrome/browser/managed_mode/managed_user_sync_service.h"
 
 namespace chromeos {
@@ skipping 103 matching lines @@
     LOG(WARNING) << "Can not apply password change to " << user_id
                  << ": no signature / encryption keys.";
     UMA_HISTOGRAM_ENUMERATION(
         "ManagedUsers.ChromeOS.PasswordChange",
         SupervisedUserAuthentication::PASSWORD_CHANGE_FAILED_NO_SIGNATURE_KEY,
         SupervisedUserAuthentication::PASSWORD_CHANGE_RESULT_MAX_VALUE);
     return;
   }
 
   UserContext manager_key(user_id);
-  manager_key.SetPassword(master_key);
+  manager_key.SetKey(Key(master_key));
   manager_key.SetIsUsingOAuth(false);
 
   // As master key can have old label, leave label field empty - it will work
   // as wildcard.
 
   std::string new_key;
   int revision;
 
   bool has_data = password_data->GetStringWithoutPathExpansion(
       kEncryptedPassword, &new_key);
@@ skipping 54 matching lines @@
 
   if (auth->HasIncompleteKey(user_id))
     auth->MarkKeyIncomplete(user_id, false /* key is complete now */);
 
   // Check if we have legacy labels for keys.
   // TODO(antrim): Migrate it to GetLabels call once wad@ implement it.
   if (old_schema == SupervisedUserAuthentication::SCHEMA_PLAIN) {
     // 1) Add new manager key (using old key).
     // 2) Remove old supervised user key.
     // 3) Remove old manager key.
-    authenticator_->TransformContext(
+    authenticator_->TransformKeyIfNeeded(
         master_key_context,
-        base::Bind(&ManagerPasswordService::OnContextTransformed,
+        base::Bind(&ManagerPasswordService::OnKeyTransformedIfNeeded,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
-void ManagerPasswordService::OnContextTransformed(
+void ManagerPasswordService::OnKeyTransformedIfNeeded(
     const UserContext& master_key_context) {
-  DCHECK(!master_key_context.DoesNeedPasswordHashing());
-  cryptohome::KeyDefinition new_master_key(master_key_context.GetPassword(),
+  const Key* const key = master_key_context.GetKey();
+  DCHECK_NE(Key::KEY_TYPE_PASSWORD_PLAIN, key->GetKeyType());
+  cryptohome::KeyDefinition new_master_key(key->GetSecret(),
                                            kCryptohomeMasterKeyLabel,
                                            cryptohome::PRIV_DEFAULT);
   // Use new master key for further actions.
   UserContext new_master_key_context = master_key_context;
-  new_master_key_context.SetKeyLabel(kCryptohomeMasterKeyLabel);
+  new_master_key_context.GetKey()->SetLabel(kCryptohomeMasterKeyLabel);
   authenticator_->AddKey(
       master_key_context,
       new_master_key,
       true /* replace existing */,
       base::Bind(&ManagerPasswordService::OnNewManagerKeySuccess,
                  weak_ptr_factory_.GetWeakPtr(),
                  new_master_key_context));
 }
 
 void ManagerPasswordService::OnNewManagerKeySuccess(
@@ skipping 22 matching lines @@
 void ManagerPasswordService::OnOldManagerKeyDeleted(
     const UserContext& master_key_context) {
   VLOG(1) << "Removed old master key for " << master_key_context.GetUserID();
 }
 
 void ManagerPasswordService::Shutdown() {
   settings_service_subscription_.reset();
 }
 
 }  // namespace chromeos