diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-04 19:03:41 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-04 19:03:41 +0200 |
| commit | c7ace5fa3d412410312e21c55c28068dcd625fef (patch) | |
| tree | fba40dea29a948b8a4904b4de189d4adc605ec6e /src/crypto/chacha.h | |
| parent | 421ab3119ce8ccbf73ad12d736d3daa897fa0347 (diff) | |
| parent | e745c1e38da8e54032660894bb2db0e9a49cccf2 (diff) | |
| download | monzero-core-c7ace5fa3d412410312e21c55c28068dcd625fef.tar.gz monzero-core-c7ace5fa3d412410312e21c55c28068dcd625fef.tar.xz monzero-core-c7ace5fa3d412410312e21c55c28068dcd625fef.zip | |
Merge pull request #3303
e745c1e3 Code modifications to integrate Ledger HW device into monero-wallet-cli. (cslashm)
Diffstat (limited to 'src/crypto/chacha.h')
| -rw-r--r-- | src/crypto/chacha.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crypto/chacha.h b/src/crypto/chacha.h index f74d0c352..b45c3d7c7 100644 --- a/src/crypto/chacha.h +++ b/src/crypto/chacha.h @@ -69,10 +69,10 @@ namespace crypto { chacha20(data, length, key.data(), reinterpret_cast<const uint8_t*>(&iv), cipher); } - inline void generate_chacha_key(const void *data, size_t size, chacha_key& key) { + inline void generate_chacha_key(const void *data, size_t size, chacha_key& key, bool prehashed=false) { static_assert(sizeof(chacha_key) <= sizeof(hash), "Size of hash must be at least that of chacha_key"); tools::scrubbed_arr<char, HASH_SIZE> pwd_hash; - crypto::cn_slow_hash(data, size, pwd_hash.data()); + crypto::cn_slow_hash_pre(data, size, pwd_hash.data(), prehashed); memcpy(&key, pwd_hash.data(), sizeof(key)); } |