niansa-misc/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-06 20:48:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

anti-DoS rounds count limits for blowfish and des crypt

Browse source 
all of the limits could use review, but err on the side of avoiding
excessive rounds for now.
This commit is contained in:
Rich Felker 2012-08-29 12:56:12 -04:00
parent 507b6091fa
commit 13157b025e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/misc/crypt_blowfish.c
View file

@ -625,7 +625,7 @@ static char *BF_crypt(const char *key, const char *setting,
}
count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
if (count < min || BF_decode(data.binary.salt, &setting[7], 16)) {
if (count < min || count > 2048 || BF_decode(data.binary.salt, &setting[7], 16)) {
return NULL;
}
BF_swap(data.binary.salt, 4);

2
src/misc/crypt_des.c
View file

@ -911,7 +911,7 @@ static char *_crypt_extended_r_uut(const char *_key, const char *_setting, char
return NULL;
count |= value << (i - 1) * 6;
}
if (!count)
if (!count || count > 262143)
return NULL;
for (i = 5, salt = 0; i < 9; i++) {