Module Name: src Committed By: mlelstv Date: Sat Mar 9 13:48:50 UTC 2024
Modified Files: src/lib/libcrypt: crypt-argon2.c Log Message: Don't use uninitialized variable. Fixes PR 57895. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libcrypt/crypt-argon2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libcrypt/crypt-argon2.c diff -u src/lib/libcrypt/crypt-argon2.c:1.19 src/lib/libcrypt/crypt-argon2.c:1.20 --- src/lib/libcrypt/crypt-argon2.c:1.19 Sun May 29 12:15:00 2022 +++ src/lib/libcrypt/crypt-argon2.c Sat Mar 9 13:48:50 2024 @@ -207,7 +207,7 @@ estimate_argon2_params(argon2_type atype if (clock_gettime(CLOCK_MONOTONIC, &tp1) == -1) goto error; - for (; delta.tv_sec < 1 && time < ARGON2_MAX_TIME; ++time) { + for (; time < ARGON2_MAX_TIME; ++time) { if (argon2_hash(time, memory, threads, tmp_pwd, sizeof(tmp_pwd), tmp_salt, sizeof(tmp_salt), @@ -221,6 +221,8 @@ estimate_argon2_params(argon2_type atype if (timespeccmp(&tp1, &tp2, >)) break; /* broken system... */ timespecsub(&tp2, &tp1, &delta); + if (delta.tv_sec >= 1) + break; } } else { time = *etime;