diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-03-15 18:21:43 +0100 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-03-15 18:21:43 +0100 |
commit | e5b5d041f5adad5e9ab7ae11816a5497d78fbcc8 (patch) | |
tree | 5659225ca7b3c1011e2c65e535b1afd72cb2087e /src | |
parent | Merge pull request #1867 (diff) | |
parent | Specify "524,288" iterations instead of "500,000" (diff) | |
download | monero-e5b5d041f5adad5e9ab7ae11816a5497d78fbcc8.tar.xz |
Merge pull request #1868
585c9176 Specify "524,288" iterations instead of "500,000" (darentuzi)
Diffstat (limited to 'src')
-rw-r--r-- | src/crypto/slow-hash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c index 385808c0e..dca58195b 100644 --- a/src/crypto/slow-hash.c +++ b/src/crypto/slow-hash.c @@ -494,7 +494,7 @@ void slow_hash_free_state(void) * buffer of pseudorandom data by hashing the supplied data. It then uses this * random data to fill a large 2MB buffer with pseudorandom data by iteratively * encrypting it using 10 rounds of AES per entry. After this initialization, - * it executes 500,000 rounds of mixing through the random 2MB buffer using + * it executes 524,288 rounds of mixing through the random 2MB buffer using * AES (typically provided in hardware on modern CPUs) and a 64 bit multiply. * Finally, it re-mixes this large buffer back into * the 200 byte "text" buffer, and then hashes this buffer using one of four @@ -578,8 +578,8 @@ void cn_slow_hash(const void *data, size_t length, char *hash) U64(b)[0] = U64(&state.k[16])[0] ^ U64(&state.k[48])[0]; U64(b)[1] = U64(&state.k[16])[1] ^ U64(&state.k[48])[1]; - /* CryptoNight Step 3: Bounce randomly 1 million times through the mixing buffer, - * using 500,000 iterations of the following mixing function. Each execution + /* CryptoNight Step 3: Bounce randomly 1,048,576 times (1<<20) through the mixing buffer, + * using 524,288 iterations of the following mixing function. Each execution * performs two reads and writes from the mixing buffer. */ @@ -895,8 +895,8 @@ void cn_slow_hash(const void *data, size_t length, char *hash) U64(b)[0] = U64(&state.k[16])[0] ^ U64(&state.k[48])[0]; U64(b)[1] = U64(&state.k[16])[1] ^ U64(&state.k[48])[1]; - /* CryptoNight Step 3: Bounce randomly 1 million times through the mixing buffer, - * using 500,000 iterations of the following mixing function. Each execution + /* CryptoNight Step 3: Bounce randomly 1,048,576 times (1<<20) through the mixing buffer, + * using 524,288 iterations of the following mixing function. Each execution * performs two reads and writes from the mixing buffer. */ |