zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tweaks after review

This commit is contained in:
Jack Grigg 2016-06-14 09:41:03 +12:00
parent f3aee6b109
commit 09e9a329b7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/crypto/equihash.cpp
View File

@ -24,12 +24,12 @@
template<unsigned int N, unsigned int K> template<unsigned int N, unsigned int K>
int Equihash<N,K>::InitialiseState(eh_HashState& base_state) int Equihash<N,K>::InitialiseState(eh_HashState& base_state)
{ {
uint32_t n = htole32(N); uint32_t le_N = htole32(N);
uint32_t k = htole32(K); uint32_t le_K = htole32(K);
unsigned char personalization[crypto_generichash_blake2b_PERSONALBYTES] = {}; unsigned char personalization[crypto_generichash_blake2b_PERSONALBYTES] = {};
memcpy(personalization, "ZcashPoW", 8); memcpy(personalization, "ZcashPoW", 8);
memcpy(personalization+8, &n, 4); memcpy(personalization+8, &le_N, 4);
memcpy(personalization+12, &k, 4); memcpy(personalization+12, &le_K, 4);
return crypto_generichash_blake2b_init_salt_personal(&base_state, return crypto_generichash_blake2b_init_salt_personal(&base_state,
NULL, 0, // No key. NULL, 0, // No key.
N/8, N/8,
@ -37,7 +37,8 @@ int Equihash<N,K>::InitialiseState(eh_HashState& base_state)
personalization); personalization);
} }
// Big-endian so that array comparison is equivalent to integer comparison // Big-endian so that lexicographic array comparison is equivalent to integer
// comparison
void EhIndexToArray(const eh_index i, unsigned char* array) void EhIndexToArray(const eh_index i, unsigned char* array)
{ {
assert(sizeof(eh_index) == 4); assert(sizeof(eh_index) == 4);
@ -45,7 +46,8 @@ void EhIndexToArray(const eh_index i, unsigned char* array)
memcpy(array, &bei, sizeof(eh_index)); memcpy(array, &bei, sizeof(eh_index));
} }
// Big-endian so that array comparison is equivalent to integer comparison // Big-endian so that lexicographic array comparison is equivalent to integer
// comparison
eh_index ArrayToEhIndex(const unsigned char* array) eh_index ArrayToEhIndex(const unsigned char* array)
{ {
assert(sizeof(eh_index) == 4); assert(sizeof(eh_index) == 4);