diff options
| author | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 23:00:03 +0000 |
|---|---|---|
| committer | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 23:00:03 +0000 |
| commit | 376703e057fb55805c0d05c68a4b4d496e713ba7 (patch) | |
| tree | bfc4043a291641063c43fa781cf69882aa7f6f05 /chrome/browser/sync/util | |
| parent | 6d66bc2f295c5de6f6d28c1dd7e8d827459db1f4 (diff) | |
| download | chromium_src-376703e057fb55805c0d05c68a4b4d496e713ba7.zip chromium_src-376703e057fb55805c0d05c68a4b4d496e713ba7.tar.gz chromium_src-376703e057fb55805c0d05c68a4b4d496e713ba7.tar.bz2 | |
TBR: willchan
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50541 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/util')
| -rw-r--r-- | chrome/browser/sync/util/cryptographer.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/sync/util/cryptographer.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/sync/util/cryptographer.cc b/chrome/browser/sync/util/cryptographer.cc index f323d17..0fbaa3a 100644 --- a/chrome/browser/sync/util/cryptographer.cc +++ b/chrome/browser/sync/util/cryptographer.cc @@ -6,7 +6,7 @@ namespace browser_sync { -const char kNigoriTag[] = "google_chrome_nigori"; +const char kNigoriTag[] = "nigori"; // We name a particular Nigori instance (ie. a triplet consisting of a hostname, // a username, and a password) by calling Permute on this string. Since the @@ -14,7 +14,7 @@ const char kNigoriTag[] = "google_chrome_nigori"; // assign the same name to a particular triplet. const char kNigoriKeyName[] = "nigori-key"; -Cryptographer::Cryptographer() : default_nigori_(NULL) { +Cryptographer::Cryptographer() { } bool Cryptographer::CanDecrypt(const sync_pb::EncryptedData& data) const { diff --git a/chrome/browser/sync/util/cryptographer.h b/chrome/browser/sync/util/cryptographer.h index 0ffa84f..2d967fe 100644 --- a/chrome/browser/sync/util/cryptographer.h +++ b/chrome/browser/sync/util/cryptographer.h @@ -15,8 +15,6 @@ namespace browser_sync { -extern const char kNigoriTag[]; - // The parameters used to initialize a Nigori instance. struct KeyParams { std::string hostname; |