diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-12-02 07:34:27 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-12-02 07:34:56 +0200 |
| commit | ef2a2b42c9e710d1455fd2983e82bfe930c7101f (patch) | |
| tree | f0efce8bb8045061b32895f04bf0fed79a249873 | |
| parent | Merge pull request #187 (diff) | |
| parent | remove unused display variable (diff) | |
| download | monero-ef2a2b42c9e710d1455fd2983e82bfe930c7101f.tar.xz | |
Merge pull request #186
3300ae5 remove unused display variable (warptangent)
0e0e557 return true on success (warptangent)
2e11eb1 deterministic wallet use of twelve words fixed (warptangent)
21a3c46 ensure that keccak is called on view spend key, not a possibly pre-sc_reduce32 version of it - for deriving view secret key (warptangent)
| -rw-r--r-- | src/cryptonote_core/account.cpp | 2 | ||||
| -rw-r--r-- | src/mnemonics/electrum-words.cpp | 4 | ||||
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp index 36043238d..9f6c91026 100644 --- a/src/cryptonote_core/account.cpp +++ b/src/cryptonote_core/account.cpp @@ -65,7 +65,7 @@ DISABLE_VS_WARNINGS(4244 4345) // rng for generating second set of keys is hash of first rng. means only one set of electrum-style words needed for recovery crypto::secret_key second; - keccak((uint8_t *)&first, sizeof(crypto::secret_key), (uint8_t *)&second, sizeof(crypto::secret_key)); + keccak((uint8_t *)&m_keys.m_spend_secret_key, sizeof(crypto::secret_key), (uint8_t *)&second, sizeof(crypto::secret_key)); generate_keys(m_keys.m_account_address.m_view_public_key, m_keys.m_view_secret_key, second, two_random ? false : true); diff --git a/src/mnemonics/electrum-words.cpp b/src/mnemonics/electrum-words.cpp index ffa82b21e..7258b8a15 100644 --- a/src/mnemonics/electrum-words.cpp +++ b/src/mnemonics/electrum-words.cpp @@ -255,7 +255,7 @@ namespace crypto std::string wlist_copy = words; if (seed.size() == seed_length/2) { - memcpy(dst.data, dst.data + 16, 16); // if electrum 12-word seed, duplicate + memcpy(dst.data+16, dst.data, 16); // if electrum 12-word seed, duplicate wlist_copy += ' '; wlist_copy += words; } @@ -328,7 +328,7 @@ namespace crypto words.pop_back(); words += (' ' + words_store[create_checksum_index(words_store, language->get_unique_prefix_length())]); - return false; + return true; } /*! diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index be3c82001..e1e2a198b 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -551,9 +551,6 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string crypto::ElectrumWords::bytes_to_words(recovery_val, electrum_words, mnemonic_language); - std::string print_electrum = ""; - - success_msg_writer() << "**********************************************************************\n" << "Your wallet has been generated.\n" << |