d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove srandomdev fallback code

Browse Source
This commit is contained in:
Andrey A. Chernov 1997-06-14 00:27:03 +00:00
parent 545cda7db5
commit 687ee69a2a
6 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/jot/jot.c
View File

@ -96,10 +96,9 @@ main(argc, argv)
getargs(argc, argv); getargs(argc, argv);
if (randomize) { if (randomize) {
*x = (ender - begin) * (ender > begin ? 1 : -1); *x = (ender - begin) * (ender > begin ? 1 : -1);
if (s == -1.0) { if (s == -1.0)
if (srandomdev() < 0) srandomdev();
srandom(time(NULL) ^ getpid()); else
} else
srandom((unsigned long) s); srandom((unsigned long) s);
for (*i = 1; *i <= reps || infinity; (*i)++) { for (*i = 1; *i <= reps || infinity; (*i)++) {
*y = (double) random() / LONG_MAX; *y = (double) random() / LONG_MAX;

5
usr.bin/passwd/local_passwd.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: local_passwd.c,v 1.16 1997/03/24 16:10:26 ache Exp $ * $Id: local_passwd.c,v 1.17 1997/05/10 19:02:38 davidn Exp $
*/ */
#ifndef lint #ifndef lint
@ -155,8 +155,7 @@ getnewpasswd(pw, nis)
/* grab a random printable character that isn't a colon */ /* grab a random printable character that isn't a colon */
if (!randinit) { if (!randinit) {
randinit = 1; randinit = 1;
if (srandomdev() < 0) srandomdev();
srandom((unsigned long)(time(NULL) ^ getpid()));
} }
#ifdef NEWSALT #ifdef NEWSALT
salt[0] = _PASSWORD_EFMT1; salt[0] = _PASSWORD_EFMT1;

5
usr.sbin/ppp/chap.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
* *
* $Id: chap.c,v 1.17 1997/05/26 00:43:56 brian Exp $ * $Id: chap.c,v 1.18 1997/06/09 03:27:15 brian Exp $
* *
* TODO: * TODO:
*/ */
@ -80,8 +80,7 @@ int chapid;
if (!randinit) { if (!randinit) {
randinit = 1; randinit = 1;
if (srandomdev() < 0) srandomdev();
srandom((unsigned long)(time(NULL) ^ getpid()));
} }
cp = challenge_data; cp = challenge_data;

8
usr.sbin/ppp/command.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
* *
* $Id: command.c,v 1.55 1997/06/11 03:57:46 brian Exp $ * $Id: command.c,v 1.57 1997/06/13 03:59:34 brian Exp $
* *
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -785,8 +785,7 @@ char **argv;
VarRedialTimeout = -1; VarRedialTimeout = -1;
if (!randinit) { if (!randinit) {
randinit = 1; randinit = 1;
if (srandomdev() < 0) srandomdev();
srandom((unsigned long)(time(NULL) ^ getpid()));
} }
} else { } else {
timeout = atoi(argv[0]); timeout = atoi(argv[0]);
@ -805,8 +804,7 @@ char **argv;
VarRedialNextTimeout = -1; VarRedialNextTimeout = -1;
if (!randinit) { if (!randinit) {
randinit = 1; randinit = 1;
if (srandomdev() < 0) srandomdev();
srandom((unsigned long)(time(NULL) ^ getpid()));
} }
} }
else { else {

5
usr.sbin/ppp/lcp.c
View File

@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
* *
* $Id: lcp.c,v 1.22 1997/06/01 03:43:22 brian Exp $ * $Id: lcp.c,v 1.23 1997/06/09 03:27:24 brian Exp $
* *
* TODO: * TODO:
* o Validate magic number received from peer. * o Validate magic number received from peer.
@ -183,8 +183,7 @@ GenerateMagic()
{ {
if (!randinit) { if (!randinit) {
randinit = 1; randinit = 1;
if (srandomdev() < 0) srandomdev();
srandom((unsigned long)(time(NULL) ^ getpid()));
} }
return (random()); return (random());

12
usr.sbin/pw/pw_user.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: pw_user.c,v 1.19 1997/03/24 15:09:41 ache Exp $ * $Id: pw_user.c,v 1.20 1997/05/24 10:41:49 davidn Exp $
*/ */
#include <unistd.h> #include <unistd.h>
@ -840,9 +840,10 @@ pw_pwcrypt(char *password)
if (!randinit) { if (!randinit) {
randinit = 1; randinit = 1;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
if (srandomdev() < 0) srandomdev();
#else
srandom((unsigned long) (time(NULL) ^ getpid()));
#endif #endif
srandom((unsigned long) (time(NULL) ^ getpid()));
} }
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
salt[i] = chars[random() % 63]; salt[i] = chars[random() % 63];
@ -912,9 +913,10 @@ pw_password(struct userconf * cnf, struct cargs * args, char const * user)
if (!randinit) { if (!randinit) {
randinit = 1; randinit = 1;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
if (srandomdev() < 0) srandomdev();
#else
srandom((unsigned long) (time(NULL) ^ getpid()));
#endif #endif
srandom((unsigned long) (time(NULL) ^ getpid()));
} }
l = (random() % 8 + 8); /* 8 - 16 chars */ l = (random() % 8 + 8); /* 8 - 16 chars */
pw_getrand(rndbuf, l); pw_getrand(rndbuf, l);