From 40070b342a936bef5f1a0faf71d56f53f2f76772 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 8 Nov 2017 12:55:58 +0100 Subject: [PATCH] Initialize the argon2 position structure a bit earlier --- src/libsodium/crypto_pwhash/argon2/argon2-core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-core.c b/src/libsodium/crypto_pwhash/argon2/argon2-core.c index 174a3876..2c8a8ebf 100644 --- a/src/libsodium/crypto_pwhash/argon2/argon2-core.c +++ b/src/libsodium/crypto_pwhash/argon2/argon2-core.c @@ -290,21 +290,19 @@ index_alpha(const argon2_instance_t *instance, void fill_memory_blocks(argon2_instance_t *instance, uint32_t pass) { + argon2_position_t position; + uint32_t l; uint32_t s; if (instance == NULL || instance->lanes == 0) { return; /* LCOV_EXCL_LINE */ } + position.pass = pass; for (s = 0; s < ARGON2_SYNC_POINTS; ++s) { - uint32_t l; - + position.slice = (uint8_t) s; for (l = 0; l < instance->lanes; ++l) { - argon2_position_t position; - - position.pass = pass; position.lane = l; - position.slice = (uint8_t) s; position.index = 0; fill_segment(instance, position); }