diff options
| author | MoroccanMalinois <MoroccanMalinois@protonmail.com> | 2017-01-05 01:11:05 +0000 |
|---|---|---|
| committer | MoroccanMalinois <MoroccanMalinois@protonmail.com> | 2017-01-05 01:11:05 +0000 |
| commit | 80abc3bc4a73f3ba6ffd40b1a03de0cc4d01e3c9 (patch) | |
| tree | 5b9f6c810e59d36607590a6e736858a7d7d3bf7f /src/crypto/slow-hash.c | |
| parent | Merge pull request #1487 (diff) | |
| download | monero-80abc3bc4a73f3ba6ffd40b1a03de0cc4d01e3c9.tar.xz | |
Build wallet with Android NDK
Diffstat (limited to '')
| -rw-r--r-- | src/crypto/slow-hash.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c index 66d9ca5d9..43b9619f3 100644 --- a/src/crypto/slow-hash.c +++ b/src/crypto/slow-hash.c @@ -1052,7 +1052,6 @@ STATIC INLINE void xor_blocks(uint8_t* a, const uint8_t* b) void cn_slow_hash(const void *data, size_t length, char *hash) { - uint8_t long_state[MEMORY]; uint8_t text[INIT_SIZE_BYTE]; uint8_t a[AES_BLOCK_SIZE]; uint8_t b[AES_BLOCK_SIZE]; @@ -1070,6 +1069,13 @@ void cn_slow_hash(const void *data, size_t length, char *hash) hash_extra_blake, hash_extra_groestl, hash_extra_jh, hash_extra_skein }; +#ifndef FORCE_USE_HEAP + uint8_t long_state[MEMORY]; +#else + uint8_t *long_state = NULL; + long_state = (uint8_t *)malloc(MEMORY); +#endif + hash_process(&state.hs, data, length); memcpy(text, state.init, INIT_SIZE_BYTE); @@ -1129,6 +1135,9 @@ void cn_slow_hash(const void *data, size_t length, char *hash) memcpy(state.init, text, INIT_SIZE_BYTE); hash_permutation(&state.hs); extra_hashes[state.hs.b[0] & 3](&state, 200, hash); +#ifdef FORCE_USE_HEAP + free(long_state); +#endif } #endif /* !aarch64 || !crypto */ |