=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/Attic/pwd_gensalt.c,v retrieving revision 1.7 retrieving revision 1.8 diff -c -r1.7 -r1.8 *** src/usr.bin/passwd/Attic/pwd_gensalt.c 1997/04/10 20:04:54 1.7 --- src/usr.bin/passwd/Attic/pwd_gensalt.c 1998/07/04 18:27:04 1.8 *************** *** 1,4 **** ! /* $OpenBSD: pwd_gensalt.c,v 1.7 1997/04/10 20:04:54 provos Exp $ */ /* * Copyright 1997 Niels Provos * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: pwd_gensalt.c,v 1.8 1998/07/04 18:27:04 provos Exp $ */ /* * Copyright 1997 Niels Provos * All rights reserved. *************** *** 90,99 **** to64(&salt[0], arc4random(), 2); salt[2] = '\0'; } else if (!strcmp(now, "newsalt")) { if (max < 10) return 0; salt[0] = _PASSWORD_EFMT1; ! to64(&salt[1], (int32_t) (29 * 25), 4); to64(&salt[5], arc4random(), 4); salt[9] = '\0'; } else if (!strcmp(now, "md5")) { --- 90,102 ---- to64(&salt[0], arc4random(), 2); salt[2] = '\0'; } else if (!strcmp(now, "newsalt")) { + u_int32_t rounds = atol(next); + if (rounds < 725) + rounds = 725; if (max < 10) return 0; salt[0] = _PASSWORD_EFMT1; ! to64(&salt[1], (u_int32_t) rounds, 4); to64(&salt[5], arc4random(), 4); salt[9] = '\0'; } else if (!strcmp(now, "md5")) {