diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-11-26 20:25:38 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-11-26 20:25:39 +0200 |
| commit | cc1ea0b651c4e1b2f41f5106467309894ed30dfa (patch) | |
| tree | cd3b742c94ee36d1f9a41a47d97d614733496fa3 /src | |
| parent | 84dd674cd049884c5841c4142e717ae4cb8879f2 (diff) | |
| parent | 1a4d160311df8b3aaf0e33fe0c3b77f1862c395e (diff) | |
| download | monzero-core-cc1ea0b651c4e1b2f41f5106467309894ed30dfa.tar.gz monzero-core-cc1ea0b651c4e1b2f41f5106467309894ed30dfa.tar.xz monzero-core-cc1ea0b651c4e1b2f41f5106467309894ed30dfa.zip | |
Merge pull request #4816
1a4d1603 wallet2: remove redundant chacha key generation in store_keys (stoffu)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet2.cpp | 1 |
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>(); |