chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc - Issue 526353002: Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

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/supervised/supervised_user_creation_controller_new.cc

Issue 526353002: Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d_2_367847_add_get_key_data_ex_to_mount_flow

Patch Set: Rebased. 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

« no previous file with comments | « chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc ('k') | chrome/browser/supervised_user/chromeos/manager_password_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc

index 3b86f22906b6cf065d70d95817f9d646ab8f8acf..59c84d0a8c78353757b79fb5faf79473126101f0 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc

@@ -270,10 +270,16 @@ void SupervisedUserCreationControllerNew::OnMountSuccess(

creation_context_->salted_password,

kCryptohomeSupervisedUserKeyLabel,

kCryptohomeSupervisedUserKeyPrivileges);

- base::Base64Decode(creation_context_->encryption_key,

- &password_key.encryption_key);

- base::Base64Decode(creation_context_->signature_key,

- &password_key.signature_key);

+ std::string encryption_key;

+ base::Base64Decode(creation_context_->encryption_key, &encryption_key);

+ password_key.AddSymmetricKey(true /* encrypt */,

dzhioev (left Google) 2014/09/03 17:42:46 Nit: Is situation when (encrypt == sign) possible?

bartfab (slow) 2014/09/04 10:14:18 Depending on the HMAC used, it may or may not be s

+ false /* sign */,

+ encryption_key);

+ std::string signature_key;

+ base::Base64Decode(creation_context_->signature_key, &signature_key);

+ password_key.AddSymmetricKey(false /* encrypt */,

+ true /* sign */,

+ signature_key);

Key key(Key::KEY_TYPE_SALTED_PBKDF2_AES256_1234,

std::string(), // The salt is stored elsewhere.