emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge pull request #400 from floppym/sha-rounds

Browse Source 
libmisc: fix default value in SHA_get_salt_rounds()
This commit is contained in:
Serge Hallyn 2021-08-14 19:29:54 -05:00 committed by GitHub
commit 009e09fd58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libmisc/salt.c
View File

@ -223,20 +223,21 @@ static /*@observer@*/const unsigned long SHA_get_salt_rounds (/*@null@*/int *pre
if ((-1 == min_rounds) && (-1 == max_rounds)) { if ((-1 == min_rounds) && (-1 == max_rounds)) {
rounds = SHA_ROUNDS_DEFAULT; rounds = SHA_ROUNDS_DEFAULT;
} }
else {
if (-1 == min_rounds) {
min_rounds = max_rounds;
}
if (-1 == min_rounds) { if (-1 == max_rounds) {
min_rounds = max_rounds; max_rounds = min_rounds;
}
if (min_rounds > max_rounds) {
max_rounds = min_rounds;
}
rounds = (unsigned long) shadow_random (min_rounds, max_rounds);
} }
if (-1 == max_rounds) {
max_rounds = min_rounds;
}
if (min_rounds > max_rounds) {
max_rounds = min_rounds;
}
rounds = (unsigned long) shadow_random (min_rounds, max_rounds);
} else if (0 == *prefered_rounds) { } else if (0 == *prefered_rounds) {
rounds = SHA_ROUNDS_DEFAULT; rounds = SHA_ROUNDS_DEFAULT;
} else { } else {