aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-11-26 20:25:38 +0200
committerRiccardo Spagni <ric@spagni.net>2018-11-26 20:25:39 +0200
commitcc1ea0b651c4e1b2f41f5106467309894ed30dfa (patch)
treecd3b742c94ee36d1f9a41a47d97d614733496fa3 /src/wallet
parentMerge pull request #4781 (diff)
parentwallet2: remove redundant chacha key generation in store_keys (diff)
downloadmonero-cc1ea0b651c4e1b2f41f5106467309894ed30dfa.tar.xz
Merge pull request #4816
1a4d1603 wallet2: remove redundant chacha key generation in store_keys (stoffu)
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet2.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 129b96733..31be95a61 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -3145,7 +3145,6 @@ bool wallet2::store_keys(const std::string& keys_file_name, const epee::wipeable
account_data = buffer.GetString();
// Encrypt the entire JSON object.
- crypto::generate_chacha_key(password.data(), password.size(), key, m_kdf_rounds);
std::string cipher;
cipher.resize(account_data.size());
keys_file_data.iv = crypto::rand<crypto::chacha_iv>();