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 /src/mnemonics/electrum-words.cpp | |
| 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)
Diffstat (limited to 'src/mnemonics/electrum-words.cpp')
| -rw-r--r-- | src/mnemonics/electrum-words.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } /*! |