chrome/browser/sync/encryption/nigori.cc - Issue 8468023: Move encryption related files from util folder to encryption folder.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/sync/encryption/nigori.cc

Issue 8468023: Move encryption related files from util folder to encryption folder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: For review. Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/sync/util/nigori.h"	5 #include "chrome/browser/sync/encryption/nigori.h"

6	6

7 #if defined(OS_WIN)	7 #if defined(OS_WIN)

8 #include <winsock2.h> // for htonl	8 #include <winsock2.h> // for htonl

9 #else	9 #else

10 #include <arpa/inet.h>	10 #include <arpa/inet.h>

11 #endif	11 #endif

12	12

13 #include <sstream>	13 #include <sstream>

14 #include <vector>	14 #include <vector>

15	15

(...skipping 236 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
252 DCHECK(user_key);	252 DCHECK(user_key);

253 DCHECK(encryption_key);	253 DCHECK(encryption_key);

254 DCHECK(mac_key);	254 DCHECK(mac_key);

255	255

256 return user_key_->GetRawKey(user_key) &&	256 return user_key_->GetRawKey(user_key) &&

257 encryption_key_->GetRawKey(encryption_key) &&	257 encryption_key_->GetRawKey(encryption_key) &&

258 mac_key_->GetRawKey(mac_key);	258 mac_key_->GetRawKey(mac_key);

259 }	259 }

260	260

261 } // namespace browser_sync	261 } // namespace browser_sync

OLD	NEW