Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only get the rounds if we have them.

This commit is contained in:
christos 2005-01-11 23:02:30 +00:00
parent 7724b89cd5
commit b181dae89f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libcrypt/pw_gensalt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pw_gensalt.c,v 1.1 2005/01/11 22:41:07 christos Exp $ */
/* $NetBSD: pw_gensalt.c,v 1.2 2005/01/11 23:02:30 christos Exp $ */
/*
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: pw_gensalt.c,v 1.1 2005/01/11 22:41:07 christos Exp $");
__RCSID("$NetBSD: pw_gensalt.c,v 1.2 2005/01/11 23:02:30 christos Exp $");
#endif /* not lint */
#include <sys/syslimits.h>
@ -140,7 +140,7 @@ int
pw_gensalt(char *salt, size_t saltlen, const struct passwd *pwd, char type)
{
char option[LINE_MAX], *next, *now, *cipher, *ep, grpkey[LINE_MAX];
unsigned long rounds;
unsigned long rounds = 0;
struct group *grp;
const struct pw_salt *sp;
@ -168,16 +168,18 @@ pw_gensalt(char *salt, size_t saltlen, const struct passwd *pwd, char type)
next = option;
now = strsep(&next, ",");
rounds = strtoul(next, &ep, 0);
if (next) {
rounds = strtoul(next, &ep, 0);
if (next == ep || *ep) {
errno = EINVAL;
return -1;
if (next == ep || *ep) {
errno = EINVAL;
return -1;
}
if (errno == ERANGE && rounds == ULONG_MAX)
return -1;
}
if (errno == ERANGE && rounds == ULONG_MAX)
return -1;
for (sp = salts; sp->name; sp++)
if (strcmp(sp->name, now) == 0)
return (*sp->gensalt)(salt, saltlen, (size_t)rounds);