| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "sync/util/nigori.h" | 5 #include "sync/util/nigori.h" |
| 6 | 6 |
| 7 #include <sstream> | 7 #include <sstream> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/rand_util.h" | 12 #include "base/rand_util.h" |
| 13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
| 14 #include "base/sys_byteorder.h" | 14 #include "base/sys_byteorder.h" |
| 15 #include "crypto/encryptor.h" | 15 #include "crypto/encryptor.h" |
| 16 #include "crypto/hmac.h" | 16 #include "crypto/hmac.h" |
| 17 #include "crypto/symmetric_key.h" |
| 17 | 18 |
| 18 using base::Base64Encode; | 19 using base::Base64Encode; |
| 19 using base::Base64Decode; | 20 using base::Base64Decode; |
| 20 using base::RandInt; | 21 using base::RandInt; |
| 21 using crypto::Encryptor; | 22 using crypto::Encryptor; |
| 22 using crypto::HMAC; | 23 using crypto::HMAC; |
| 23 using crypto::SymmetricKey; | 24 using crypto::SymmetricKey; |
| 24 | 25 |
| 25 namespace browser_sync { | 26 namespace browser_sync { |
| 26 | 27 |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 DCHECK(user_key); | 248 DCHECK(user_key); |
| 248 DCHECK(encryption_key); | 249 DCHECK(encryption_key); |
| 249 DCHECK(mac_key); | 250 DCHECK(mac_key); |
| 250 | 251 |
| 251 return user_key_->GetRawKey(user_key) && | 252 return user_key_->GetRawKey(user_key) && |
| 252 encryption_key_->GetRawKey(encryption_key) && | 253 encryption_key_->GetRawKey(encryption_key) && |
| 253 mac_key_->GetRawKey(mac_key); | 254 mac_key_->GetRawKey(mac_key); |
| 254 } | 255 } |
| 255 | 256 |
| 256 } // namespace browser_sync | 257 } // namespace browser_sync |
| OLD | NEW |