kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

more pointer-based derp

Browse source
This commit is contained in:
Thomas Winget 2014-06-06 16:31:04 -04:00
parent 72c3f36ca4
commit 8bc032ed09
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/crypto/electrum-words.cpp
View file

@ -5,6 +5,7 @@
*/ */
#include <string> #include <string>
#include <cassert>
#include <map> #include <map>
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
@ -55,14 +56,22 @@ namespace crypto
val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n); val = w1 + n * ((w2 - w1) % n) + n * n * ((w3 - w2) % n);
memcpy(&dst.data + i * 4, &val, 4); // copy 4 bytes to position memcpy(dst.data + i * 4, &val, 4); // copy 4 bytes to position
} }
std::string wlist_copy = words;
if (wlist.size() == 12) if (wlist.size() == 12)
{ {
memcpy(&dst.data, &dst.data + 16, 16); // if electrum 12-word seed, duplicate memcpy(dst.data, dst.data + 16, 16); // if electrum 12-word seed, duplicate
wlist_copy += ' ';
wlist_copy += words;
} }
std::string back_to_words;
bytes_to_words(dst, back_to_words);
assert(wlist_copy == back_to_words); // sanity check
return true; return true;
} }

3
src/crypto/electrum-words.h
View file

@ -5,6 +5,7 @@
*/ */
#include <string> #include <string>
#include <cstdint>
#include <map> #include <map>
#include "crypto/crypto.h" // for declaration of crypto::secret_key #include "crypto/crypto.h" // for declaration of crypto::secret_key
@ -18,7 +19,7 @@ namespace crypto
bool words_to_bytes(const std::string& words, crypto::secret_key& dst); bool words_to_bytes(const std::string& words, crypto::secret_key& dst);
bool bytes_to_words(const crypto::secret_key& src, std::string& words); bool bytes_to_words(const crypto::secret_key& src, std::string& words);
const std::map<std::string, int> wordsMap = { const std::map<std::string,uint32_t> wordsMap = {
{"like", 0}, {"like", 0},
{"just", 1}, {"just", 1},
{"love", 2}, {"love", 2},

15
src/simplewallet/simplewallet.cpp
View file

@ -255,10 +255,15 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
return false; return false;
} }
size_t c = 0; if(m_recover)
if(!m_generate_new.empty()) ++c; {
if(!m_wallet_file.empty()) ++c; if (m_generate_new.empty())
if (1 != c) {
fail_msg_writer() << "You must specify a wallet file name to recover to using either --generate-new-wallet=\"name\"";
return false;
}
}
else if(!m_generate_new.empty() ^ !m_wallet_file.empty())
{ {
if(!ask_wallet_create_if_needed()) if(!ask_wallet_create_if_needed())
return false; return false;
@ -286,7 +291,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
} }
if (!m_generate_new.empty()) if (!m_generate_new.empty() || m_recover)
{ {
// check for recover flag. if present, require electrum word list (only recovery option for now). // check for recover flag. if present, require electrum word list (only recovery option for now).
if (m_recover) if (m_recover)