components/sync/base/cryptographer.cc - Issue 2934893003: Deleted redundant SymmetricKey::GetRawKey().

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: components/sync/base/cryptographer.cc

Issue 2934893003: Deleted redundant SymmetricKey::GetRawKey(). (Closed)

Patch Set: Rebased to fix conflict with ToT. Created 3 years, 6 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:

Index: components/sync/base/cryptographer.cc

diff --git a/components/sync/base/cryptographer.cc b/components/sync/base/cryptographer.cc

index c585965969ffff2d3edc56e83663ba37b468e002..30790ea71b5b6c263d85a5b3940139636df61792 100644

--- a/components/sync/base/cryptographer.cc

+++ b/components/sync/base/cryptographer.cc

@@ -348,10 +348,8 @@ std::string Cryptographer::GetDefaultNigoriKeyData() const {

if (iter == nigoris_.end())

return std::string();

sync_pb::NigoriKey key;

- if (!iter->second->ExportKeys(key.mutable_user_key(),

- key.mutable_encryption_key(),

- key.mutable_mac_key()))

- return std::string();

+ iter->second->ExportKeys(key.mutable_user_key(), key.mutable_encryption_key(),

+ key.mutable_mac_key());

return key.SerializeAsString();

}

« no previous file with comments | « chromeos/login/auth/key.cc ('k') | components/sync/base/nigori.h » ('j') | no next file with comments »