| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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) | 7 #if defined(OS_WIN) |
| 8 #include <winsock2.h> // for htonl | 8 #include <winsock2.h> // for htonl |
| 9 #else |
| 10 #include <arpa/inet.h> |
| 9 #endif | 11 #endif |
| 10 | 12 |
| 11 #include <sstream> | 13 #include <sstream> |
| 12 #include <vector> | 14 #include <vector> |
| 13 | 15 |
| 14 #include "base/base64.h" | 16 #include "base/base64.h" |
| 15 #include "base/crypto/encryptor.h" | 17 #include "base/crypto/encryptor.h" |
| 16 #include "base/hmac.h" | 18 #include "base/hmac.h" |
| 17 #include "base/logging.h" | 19 #include "base/logging.h" |
| 18 #include "base/rand_util.h" | 20 #include "base/rand_util.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 DCHECK(user_key); | 250 DCHECK(user_key); |
| 249 DCHECK(encryption_key); | 251 DCHECK(encryption_key); |
| 250 DCHECK(mac_key); | 252 DCHECK(mac_key); |
| 251 | 253 |
| 252 return user_key_->GetRawKey(user_key) && | 254 return user_key_->GetRawKey(user_key) && |
| 253 encryption_key_->GetRawKey(encryption_key) && | 255 encryption_key_->GetRawKey(encryption_key) && |
| 254 mac_key_->GetRawKey(mac_key); | 256 mac_key_->GetRawKey(mac_key); |
| 255 } | 257 } |
| 256 | 258 |
| 257 } // namespace browser_sync | 259 } // namespace browser_sync |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 3855004:
Make USE_OPENSSL and USE_NSS mutually exclusive (Closed)
