summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/sync/util/nigori.cc4
-rw-r--r--chrome/browser/sync/util/nigori.h11
-rw-r--r--chrome/browser/sync/util/nigori_unittest.cc8
3 files changed, 0 insertions, 23 deletions
diff --git a/chrome/browser/sync/util/nigori.cc b/chrome/browser/sync/util/nigori.cc
index 33d3915..77cca2b 100644
--- a/chrome/browser/sync/util/nigori.cc
+++ b/chrome/browser/sync/util/nigori.cc
@@ -70,10 +70,6 @@ Nigori::~Nigori() {
bool Nigori::InitByDerivation(const std::string& hostname,
const std::string& username,
const std::string& password) {
- hostname_ = hostname;
- username_ = username;
- password_ = password;
-
NigoriStream salt_password;
salt_password << username << hostname;
diff --git a/chrome/browser/sync/util/nigori.h b/chrome/browser/sync/util/nigori.h
index 3a4cb04..38d6fde 100644
--- a/chrome/browser/sync/util/nigori.h
+++ b/chrome/browser/sync/util/nigori.h
@@ -61,13 +61,6 @@ class Nigori {
std::string* encryption_key,
std::string* mac_key) const;
- // The next three getters return the parameters used to initialize the keys.
- // Given the hostname, username and password, another Nigori object capable of
- // encrypting and decrypting the same data as this one could be initialized.
- const std::string& hostname() const { return hostname_; }
- const std::string& username() const { return username_; }
- const std::string& password() const { return password_; }
-
static const char kSaltSalt[]; // The salt used to derive the user salt.
static const size_t kSaltKeySizeInBits = 128;
static const size_t kDerivedKeySizeInBits = 128;
@@ -80,10 +73,6 @@ class Nigori {
static const size_t kSigningIterations = 1004;
private:
- std::string hostname_;
- std::string username_;
- std::string password_;
-
scoped_ptr<base::SymmetricKey> user_key_;
scoped_ptr<base::SymmetricKey> encryption_key_;
scoped_ptr<base::SymmetricKey> mac_key_;
diff --git a/chrome/browser/sync/util/nigori_unittest.cc b/chrome/browser/sync/util/nigori_unittest.cc
index 5626957..bed045b 100644
--- a/chrome/browser/sync/util/nigori_unittest.cc
+++ b/chrome/browser/sync/util/nigori_unittest.cc
@@ -13,14 +13,6 @@
namespace browser_sync {
namespace {
-TEST(NigoriTest, Parameters) {
- Nigori nigori;
- EXPECT_TRUE(nigori.InitByDerivation("example.com", "username", "password"));
- EXPECT_STREQ("example.com", nigori.hostname().c_str());
- EXPECT_STREQ("username", nigori.username().c_str());
- EXPECT_STREQ("password", nigori.password().c_str());
-}
-
TEST(NigoriTest, Permute) {
Nigori nigori;
EXPECT_TRUE(nigori.InitByDerivation("example.com", "username", "password"));