diff options
| author | monero-project <sempre.amaro@gmail.com> | 2014-06-12 19:41:37 -0400 |
|---|---|---|
| committer | monero-project <sempre.amaro@gmail.com> | 2014-06-12 19:41:37 -0400 |
| commit | 5489112b11fb44cfe03ce99b63dc92b3e68f8be5 (patch) | |
| tree | 73da392fe51b1421aa17a97b4d8ff650904ef3ff /src/cryptonote_core/account.cpp | |
| parent | c3203c86c671d41ed4a07231c8a5054124d2e7d2 (diff) | |
| parent | c49cb0461091495c023fb9aa56ca8298a556f0a5 (diff) | |
| download | monzero-core-5489112b11fb44cfe03ce99b63dc92b3e68f8be5.tar.gz monzero-core-5489112b11fb44cfe03ce99b63dc92b3e68f8be5.tar.xz monzero-core-5489112b11fb44cfe03ce99b63dc92b3e68f8be5.zip | |
Merge pull request #35 from tewinget/master
Add electrum-seed wallet backup/recovery 2
Diffstat (limited to 'src/cryptonote_core/account.cpp')
| -rw-r--r-- | src/cryptonote_core/account.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/account.cpp b/src/cryptonote_core/account.cpp index 7da1c6745..3bedd7404 100644 --- a/src/cryptonote_core/account.cpp +++ b/src/cryptonote_core/account.cpp @@ -12,7 +12,7 @@ #include "crypto/crypto.h" extern "C" { -#include "crypto/blake256.h" +#include "crypto/keccak.h" } #include "cryptonote_core/cryptonote_basic_impl.h" #include "cryptonote_core/cryptonote_format_utils.h" @@ -39,7 +39,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; - blake256_hash((uint8_t *)&second, (uint8_t *)&first, sizeof(crypto::secret_key)); + keccak((uint8_t *)&first, 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); m_creation_timestamp = time(NULL); |