diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-12-29 18:19:43 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-12-29 18:19:43 +0000 |
| commit | dc7276c5b491848a11f90f0d53fac9f3577b8ac3 (patch) | |
| tree | f97228ce80e732abfd86fef8fe96b08b13377de4 /sys/dev | |
| parent | 4b025ae0c9ab26c48a400e768c687e5ae15589c5 (diff) | |
kill RND_ARND_OLD, and decrease RND_NODEV to account for it; ok djm
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/rnd.c | 3 | ||||
| -rw-r--r-- | sys/dev/rndvar.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c index d231c6c2e33..1df8da7cfc4 100644 --- a/sys/dev/rnd.c +++ b/sys/dev/rnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rnd.c,v 1.108 2010/12/29 18:16:59 deraadt Exp $ */ +/* $OpenBSD: rnd.c,v 1.109 2010/12/29 18:19:42 deraadt Exp $ */ /* * rnd.c -- A strong random number generator @@ -932,7 +932,6 @@ randomread(dev_t dev, struct uio *uio, int ioflag) break; case RND_SRND: case RND_URND: - case RND_ARND_OLD: case RND_ARND: arc4random_buf(buf, n); break; diff --git a/sys/dev/rndvar.h b/sys/dev/rndvar.h index addb0b60071..017e1a26812 100644 --- a/sys/dev/rndvar.h +++ b/sys/dev/rndvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rndvar.h,v 1.23 2010/12/29 18:16:59 deraadt Exp $ */ +/* $OpenBSD: rndvar.h,v 1.24 2010/12/29 18:19:42 deraadt Exp $ */ /* * Copyright (c) 1996,2000 Michael Shalayeff. @@ -36,9 +36,8 @@ #define RND_RND 0 /* real randomness like nuclear chips */ #define RND_SRND 1 /* strong random source */ #define RND_URND 2 /* less strong random source */ -#define RND_ARND 3 /* aRC4 based random number generator */ -#define RND_ARND_OLD 4 /* old: delete when we reach OpenBSD 4.6 */ -#define RND_NODEV 5 /* First invalid minor device number */ +#define RND_ARND 3 /* aRC4 based random number generator */ +#define RND_NODEV 4 /* First invalid minor device number */ #define RND_SRC_TRUE 0 #define RND_SRC_TIMER 1 |