chrome/browser/sync/util/nigori.cc - Issue 7148022: Reland 89038, but with a mocked out keychain (mac unit tests were timing out)

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/sync/util/nigori.cc

Issue 7148022: Reland 89038, but with a mocked out keychain (mac unit tests were timing out) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 9 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/sync/util/nigori.cc

diff --git a/chrome/browser/sync/util/nigori.cc b/chrome/browser/sync/util/nigori.cc

index 0c4418b6ebb813432345158a1b9eebe257a4431e..f8cffca18c34d6dc124b335f132a9d1ea32aa370 100644

--- a/chrome/browser/sync/util/nigori.cc

+++ b/chrome/browser/sync/util/nigori.cc

@@ -168,7 +168,8 @@ std::string GenerateRandomString(size_t size) {

// Enc[Kenc,Kmac](value)

bool Nigori::Encrypt(const std::string& value, std::string* encrypted) const {

- DCHECK_LT(0U, value.size());

+ if (0U >= value.size())

+ return false;

std::string iv = GenerateRandomString(kIvSize);

« no previous file with comments | « chrome/browser/sync/util/cryptographer_unittest.cc ('k') | no next file » | no next file with comments »