| 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/cryptographer.h" | 5 #include "sync/util/cryptographer.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <algorithm> | 9 #include <algorithm> |
| 8 | 10 |
| 9 #include "base/base64.h" | 11 #include "base/base64.h" |
| 10 #include "base/basictypes.h" | |
| 11 #include "base/logging.h" | 12 #include "base/logging.h" |
| 12 #include "sync/protocol/nigori_specifics.pb.h" | 13 #include "sync/protocol/nigori_specifics.pb.h" |
| 13 #include "sync/util/encryptor.h" | 14 #include "sync/util/encryptor.h" |
| 14 | 15 |
| 15 namespace syncer { | 16 namespace syncer { |
| 16 | 17 |
| 17 const char kNigoriTag[] = "google_chrome_nigori"; | 18 const char kNigoriTag[] = "google_chrome_nigori"; |
| 18 | 19 |
| 19 // We name a particular Nigori instance (ie. a triplet consisting of a hostname, | 20 // We name a particular Nigori instance (ie. a triplet consisting of a hostname, |
| 20 // a username, and a password) by calling Permute on this string. Since the | 21 // a username, and a password) by calling Permute on this string. Since the |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 NOTREACHED(); | 376 NOTREACHED(); |
| 376 return false; | 377 return false; |
| 377 } | 378 } |
| 378 | 379 |
| 379 if (!AddKeyImpl(nigori.Pass(), true)) | 380 if (!AddKeyImpl(nigori.Pass(), true)) |
| 380 return false; | 381 return false; |
| 381 return true; | 382 return true; |
| 382 } | 383 } |
| 383 | 384 |
| 384 } // namespace syncer | 385 } // namespace syncer |
| OLD | NEW |