aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authormonero-project <sempre.amaro@gmail.com>2014-06-12 19:41:37 -0400
committermonero-project <sempre.amaro@gmail.com>2014-06-12 19:41:37 -0400
commit5489112b11fb44cfe03ce99b63dc92b3e68f8be5 (patch)
tree73da392fe51b1421aa17a97b4d8ff650904ef3ff /src/cryptonote_core
parentMerge pull request #34 from tewinget/master (diff)
parentchanged wallet mnemonic to use cout so it doesn't print to log (diff)
downloadmonero-5489112b11fb44cfe03ce99b63dc92b3e68f8be5.tar.xz
Merge pull request #35 from tewinget/master
Add electrum-seed wallet backup/recovery 2
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/account.cpp4
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);