chrome/browser/chromeos/login/managed/managed_user_authenticator.cc - Issue 14179007: Move cryptohome_library to src/chromeos

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/managed/managed_user_authenticator.cc

Issue 14179007: Move cryptohome_library to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 8 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

« no previous file with comments | « chrome/browser/chromeos/login/managed/managed_user_authenticator.h ('k') | chrome/browser/chromeos/login/parallel_authenticator.h » ('j') | chromeos/cryptohome/cryptohome_library.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/managed/managed_user_authenticator.cc

diff --git a/chrome/browser/chromeos/login/managed/managed_user_authenticator.cc b/chrome/browser/chromeos/login/managed/managed_user_authenticator.cc

index b989beb677ff0b60be2104e8cd18f1abc8a32793..1220f9b410fa20ab9f40f659cef9284c646f3520 100644

--- a/chrome/browser/chromeos/login/managed/managed_user_authenticator.cc

+++ b/chrome/browser/chromeos/login/managed/managed_user_authenticator.cc

@@ -8,9 +8,8 @@

#include "base/string_util.h"

#include "base/strings/string_number_conversions.h"

#include "chrome/browser/chromeos/boot_times_loader.h"

-#include "chrome/browser/chromeos/cros/cros_library.h"

-#include "chrome/browser/chromeos/cros/cryptohome_library.h"

#include "chromeos/cryptohome/async_method_caller.h"

+#include "chromeos/cryptohome/cryptohome_library.h"

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "content/public/browser/browser_thread.h"

@@ -87,8 +86,7 @@ void Mount(ManagedUserAuthenticator::AuthAttempt* attempt,

std::string HashPassword(const std::string& password) {

// Get salt, ascii encode, update sha with that, then update with ascii

// of password, then end.

- std::string ascii_salt =

- CrosLibrary::Get()->GetCryptohomeLibrary()->GetSystemSalt();

+ std::string ascii_salt = CryptohomeLibrary::Get()->GetSystemSalt();

char passhash_buf[kPasswordHashLength];

// Hash salt and password