mirror of
https://github.com/monero-project/monero.git
synced 2025-08-23 14:27:28 -04:00
Merge pull request #6338
80d5320
Hash domain separation (SarangNoether)
This commit is contained in:
commit
081d49c59f
9 changed files with 34 additions and 34 deletions
|
@ -102,10 +102,6 @@ using namespace cryptonote;
|
|||
// used to target a given block weight (additional outputs may be added on top to build fee)
|
||||
#define TX_WEIGHT_TARGET(bytes) (bytes*2/3)
|
||||
|
||||
// arbitrary, used to generate different hashes from the same input
|
||||
#define CHACHA8_KEY_TAIL 0x8c
|
||||
#define CACHE_KEY_TAIL 0x8d
|
||||
|
||||
#define UNSIGNED_TX_PREFIX "Monero unsigned tx set\004"
|
||||
#define SIGNED_TX_PREFIX "Monero signed tx set\004"
|
||||
#define MULTISIG_UNSIGNED_TX_PREFIX "Monero multisig unsigned tx set\001"
|
||||
|
@ -3931,7 +3927,7 @@ void wallet2::setup_keys(const epee::wipeable_string &password)
|
|||
static_assert(HASH_SIZE == sizeof(crypto::chacha_key), "Mismatched sizes of hash and chacha key");
|
||||
epee::mlocked<tools::scrubbed_arr<char, HASH_SIZE+1>> cache_key_data;
|
||||
memcpy(cache_key_data.data(), &key, HASH_SIZE);
|
||||
cache_key_data[HASH_SIZE] = CACHE_KEY_TAIL;
|
||||
cache_key_data[HASH_SIZE] = config::HASH_KEY_WALLET_CACHE;
|
||||
cn_fast_hash(cache_key_data.data(), HASH_SIZE+1, (crypto::hash&)m_cache_key);
|
||||
get_ringdb_key();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue