Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

chromeos/login/auth/cryptohome_authenticator.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 "chromeos/login/auth/cryptohome_authenticator.h"
 
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/homedir_methods.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
 #include "chromeos/dbus/cryptohome_client.h"
@@ skipping 151 matching lines @@
 }
 
 // Callback invoked when cryptohome's GetKeyDataEx() method has finished.
 // * If GetKeyDataEx() returned metadata indicating the hashing algorithm and
 //   salt that were used to generate the key for this user's cryptohome,
 //   transforms the key in |attempt->user_context| with the same parameters.
 // * Otherwise, starts the retrieval of the system salt so that the key in
 //   |attempt->user_context| can be transformed with Chrome's default hashing
 //   algorithm and the system salt.
 // The resulting key is then passed to cryptohome's MountEx().
-void OnGetKeyDataEx(AuthAttemptState* attempt,
-                    scoped_refptr<CryptohomeAuthenticator> resolver,
-                    bool ephemeral,
-                    bool create_if_nonexistent,
-                    bool success,
-                    cryptohome::MountError return_code,
-                    ScopedVector<cryptohome::RetrievedKeyData> key_data) {
+void OnGetKeyDataEx(
+    AuthAttemptState* attempt,
+    scoped_refptr<CryptohomeAuthenticator> resolver,
+    bool ephemeral,
+    bool create_if_nonexistent,
+    bool success,
+    cryptohome::MountError return_code,
+    const std::vector<cryptohome::KeyDefinition>& key_definitions) {
   if (success) {
-    if (key_data.size() == 1) {
-      cryptohome::RetrievedKeyData* key_data_entry = key_data.front();
-      DCHECK_EQ(kCryptohomeGAIAKeyLabel, key_data_entry->label);
+    if (key_definitions.size() == 1) {
+      const cryptohome::KeyDefinition& key_definition = key_definitions.front();
+      DCHECK_EQ(kCryptohomeGAIAKeyLabel, key_definition.label);
 
-      // Extract the key type and salt from |key_data|, if present.
+      // Extract the key type and salt from |key_definition|, if present.
       scoped_ptr<int64> type;
       scoped_ptr<std::string> salt;
-      for (ScopedVector<cryptohome::RetrievedKeyData::ProviderData>::
-               const_iterator it = key_data_entry->provider_data.begin();
-           it != key_data_entry->provider_data.end(); ++it) {
-        if ((*it)->name == kKeyProviderDataTypeName) {
-          if ((*it)->number)
-            type.reset(new int64(*(*it)->number));
+      for (std::vector<cryptohome::KeyDefinition::ProviderData>::
+               const_iterator it = key_definition.provider_data.begin();
+           it != key_definition.provider_data.end(); ++it) {
+        if (it->name == kKeyProviderDataTypeName) {
+          if (it->number)
+            type.reset(new int64(*it->number));
           else
             NOTREACHED();
-        } else if ((*it)->name == kKeyProviderDataSaltName) {
-          if ((*it)->bytes)
-            salt.reset(new std::string(*(*it)->bytes));
+        } else if (it->name == kKeyProviderDataSaltName) {
+          if (it->bytes)
+            salt.reset(new std::string(*it->bytes));
           else
             NOTREACHED();
         }
       }
 
       if (type) {
         if (*type < 0 || *type >= Key::KEY_TYPE_COUNT) {
           LOG(ERROR) << "Invalid key type: " << *type;
           RecordKeyErrorAndResolve(attempt, resolver);
           return;
         }
 
         if (!salt) {
           LOG(ERROR) << "Missing salt.";
           RecordKeyErrorAndResolve(attempt, resolver);
           return;
         }
 
         attempt->user_context.GetKey()->Transform(
             static_cast<Key::KeyType>(*type),
             *salt);
         DoMount(attempt, resolver, ephemeral, create_if_nonexistent);
         return;
       }
     } else {
-      LOG(ERROR) << "GetKeyDataEx() returned " << key_data.size()
+      LOG(ERROR) << "GetKeyDataEx() returned " << key_definitions.size()
                  << " entries.";
     }
   }
 
   SystemSaltGetter::Get()->GetSystemSalt(base::Bind(&OnGetSystemSalt,
                                                     attempt,
                                                     resolver,
                                                     ephemeral,
                                                     create_if_nonexistent));
 }
@@ skipping 678 matching lines @@
   Resolve();
 }
 
 void CryptohomeAuthenticator::SetOwnerState(bool owner_check_finished,
                                             bool check_result) {
   owner_is_verified_ = owner_check_finished;
   user_can_login_ = check_result;
 }
 
 }  // namespace chromeos