Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: chromeos/login/auth/cryptohome_authenticator.cc

Issue 554043003: cros: Create cryptohome keys for Easy sign-in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for #6 Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/login/auth/cryptohome_authenticator.cc
diff --git a/chromeos/login/auth/cryptohome_authenticator.cc b/chromeos/login/auth/cryptohome_authenticator.cc
index d00cf29f1aa14af10c3b2326b4ba179dd755a084..d98b308cdbe31e845cb0ed9190e5a8abb9a2312b 100644
--- a/chromeos/login/auth/cryptohome_authenticator.cc
+++ b/chromeos/login/auth/cryptohome_authenticator.cc
@@ -190,17 +190,17 @@ void OnGetKeyDataEx(AuthAttemptState* attempt,
// Extract the key type and salt from |key_data|, if present.
scoped_ptr<int64> type;
scoped_ptr<std::string> salt;
- for (ScopedVector<cryptohome::RetrievedKeyData::ProviderData>::
+ for (std::vector<cryptohome::ProviderDataEntry>::
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));
+ if (it->name == kKeyProviderDataTypeName) {
+ if (it->has_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->has_bytes)
+ salt.reset(new std::string(it->bytes));
else
NOTREACHED();
}
« chromeos/cryptohome/homedir_methods.cc ('K') | « chromeos/cryptohome/homedir_methods_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698