Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(542)

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

Issue 8949026: Move net/base/sys_byteorder.h to base/sys_byteorder.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Denitting, rebase Created 8 years, 12 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/util/nigori.h"
6 6
7 #if defined(OS_WIN)
8 #include <winsock2.h> // for htonl
9 #else
10 #include <arpa/inet.h>
11 #endif
12
13 #include <sstream> 7 #include <sstream>
14 #include <vector> 8 #include <vector>
15 9
16 #include "base/base64.h" 10 #include "base/base64.h"
17 #include "base/logging.h" 11 #include "base/logging.h"
18 #include "base/rand_util.h" 12 #include "base/rand_util.h"
19 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/sys_byteorder.h"
20 #include "crypto/encryptor.h" 15 #include "crypto/encryptor.h"
21 #include "crypto/hmac.h" 16 #include "crypto/hmac.h"
22 17
23 using base::Base64Encode; 18 using base::Base64Encode;
24 using base::Base64Decode; 19 using base::Base64Decode;
25 using base::RandInt; 20 using base::RandInt;
26 using crypto::Encryptor; 21 using crypto::Encryptor;
27 using crypto::HMAC; 22 using crypto::HMAC;
28 using crypto::SymmetricKey; 23 using crypto::SymmetricKey;
29 24
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 DCHECK(user_key); 247 DCHECK(user_key);
253 DCHECK(encryption_key); 248 DCHECK(encryption_key);
254 DCHECK(mac_key); 249 DCHECK(mac_key);
255 250
256 return user_key_->GetRawKey(user_key) && 251 return user_key_->GetRawKey(user_key) &&
257 encryption_key_->GetRawKey(encryption_key) && 252 encryption_key_->GetRawKey(encryption_key) &&
258 mac_key_->GetRawKey(mac_key); 253 mac_key_->GetRawKey(mac_key);
259 } 254 }
260 255
261 } // namespace browser_sync 256 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/protocol_parser.cc ('k') | content/browser/renderer_host/p2p/socket_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698