his is wrong

3 files changed, 109 insertions, 15 deletions

diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 62dbf8964f3..69ea656a3e7 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.69 2003/04/17 10:44:48 jmc Exp $
+#	$OpenBSD: Makefile,v 1.70 2003/04/17 13:41:30 mickey Exp $
 #	$NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
 
-MAN=	altq.9 arc4random.9 audio.9 autoconf.9 boot.9 bus_dma.9 bus_space.9 \
+MAN=	altq.9 audio.9 autoconf.9 boot.9 bus_dma.9 bus_space.9 \
 	copy.9 crypto.9 ctxsw.9 disk.9 disklabel.9 \
 	dohooks.9 dopowerhooks.9 doshutdownhooks.9 dostartuphooks.9 \
 	extattr.9 file.9 \
@@ -12,7 +12,7 @@ MAN=	altq.9 arc4random.9 audio.9 autoconf.9 boot.9 bus_dma.9 bus_space.9 \
 	kern.9 kthread.9 lock.9 malloc.9 mbuf.9 mbuf_tags.9 md5.9 microtime.9 \
 	panic.9 pfind.9 physio.9 pmap.9 \
 	pool.9 powerhook_establish.9 ppsratecheck.9 printf.9 psignal.9 \
-	radio.9 rasops.9 ratecheck.9 resettodr.9 \
+	radio.9 random.9 rasops.9 ratecheck.9 resettodr.9 \
 	shutdownhook_establish.9 sleep.9 spl.9 startuphook_establish.9 \
 	style.9 \
 	time.9 timeout.9 tvtohz.9 uiomove.9 uvm.9 \
@@ -126,14 +126,15 @@ MLINKS+=mbuf.9 m_copym2.9 mbuf.9 m_copym.9 mbuf.9 m_free.9 mbuf.9 MFREE.9 \
 	mbuf.9 MEXTALLOC.9 mbuf.9 MCLGET.9 mbuf.9 MEXTADD.9 mbuf.9 M_ALIGN.9 \
 	mbuf.9 MH_ALIGN.9 mbuf.9 M_READONLY.9 mbuf.9 M_LEADINGSPACE.9 \
 	mbuf.9 M_TRAILINGSPACE.9 mbuf.9 MCHTYPE.9
-MLINKS+=arc4random.9 add_true_randomness.9 \
-	arc4random.9 add_timer_randomness.9 \
-	arc4random.9 add_mouse_randomness.9 \
-	arc4random.9 add_tty_randomness.9 \
-	arc4random.9 add_net_randomness.9 \
-	arc4random.9 add_disk_randomness.9 \
-	arc4random.9 add_audio_randomness.9 \
-	arc4random.9 get_random_bytes.9
+MLINKS+=random.9 add_true_randomness.9 \
+	random.9 add_timer_randomness.9 \
+	random.9 add_mouse_randomness.9 \
+	random.9 add_tty_randomness.9 \
+	random.9 add_net_randomness.9 \
+	random.9 add_disk_randomness.9 \
+	random.9 add_audio_randomness.9 \
+	random.9 get_random_bytes.9 \
+	random.9 arc4random.9
 MLINKS+=pfind.9 pgfind.9
 MLINKS+=pmap.9 pmap_init.9 pmap.9 pmap_enter.9 pmap.9 pmap_remove.9 \
 	pmap.9 pmap_unwire.9 pmap.9 pmap_protect.9 pmap.9 pmap_page_protect.9 \
@@ -196,7 +197,7 @@ MLINKS+=kern.9 imax.9 kern.9 imin.9 kern.9 lmax.9 kern.9 lmin.9 \
 	kern.9 strlen.9 kern.9 strcat.9 kern.9 strcpy.9 \
 	kern.9 strncpy.9 kern.9 strlcpy.9 kern.9 strlcat.9 \
 	kern.9 strcmp.9 kern.9 strncmp.9 kern.9 strncasecmp.9 \
-	kern.9 random.9 kern.9 srandom.9 kern.9 getsn.9
+	kern.9 srandom.9 kern.9 getsn.9
 
 # VOP functions
 MLINKS+=VOP_LOOKUP.9 VOP_CREATE.9 \
diff --git a/share/man/man9/arc4random.9 b/share/man/man9/arc4random.9
index b75542e9c47..e07c70196d4 100644
--- a/share/man/man9/arc4random.9
+++ b/share/man/man9/arc4random.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: arc4random.9,v 1.1 2003/04/17 10:44:48 jmc Exp $
+.\"	$OpenBSD: arc4random.9,v 1.2 2003/04/17 13:41:30 mickey Exp $
 .\"
 .\" Copyright (c) 1996,2000 Michael Shalayeff
 .\" All rights reserved.
@@ -29,10 +29,10 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd March 26, 1996
-.Dt ARC4RANDOM 9
+.Dt RANDOM 9
 .Os
 .Sh NAME
-.Nm arc4random
+.Nm random
 .Nd device kernel interface
 .Sh SYNOPSIS
 .Fd #include <dev/rndvar.h>
diff --git a/share/man/man9/random.9 b/share/man/man9/random.9
new file mode 100644
index 00000000000..17e2a54363f
--- /dev/null
+++ b/share/man/man9/random.9
@@ -0,0 +1,93 @@
+.\"	$OpenBSD: random.9,v 1.14 2003/04/17 13:41:30 mickey Exp $
+.\"
+.\" Copyright (c) 1996,2000 Michael Shalayeff
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"      This product includes software developed by Michael Shalayeff
+.\" 4. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd March 26, 1996
+.Dt RND 9
+.Os
+.Sh NAME
+.Nm random
+.Nd device kernel interface
+.Sh SYNOPSIS
+.Fd #include <dev/rndvar.h>
+.Ft void
+.Fn add_true_randomness "int"
+.Ft void
+.Fn add_timer_randomness "int"
+.Ft void
+.Fn add_mouse_randomness "int"
+.Ft void
+.Fn add_tty_randomness "int"
+.Ft void
+.Fn add_net_randomness "int"
+.Ft void
+.Fn add_disk_randomness "int"
+.Ft void
+.Fn add_audio_randomness "int"
+.Ft void
+.Fn get_random_bytes "void *buf" "size_t nbytes"
+.Ft u_int32_t
+.Fn arc4random "void"
+.br
+.Sh DESCRIPTION
+.Nm add_mouse_randomness ,
+.Nm add_tty_randomness ,
+.Nm add_net_randomness ,
+.Nm add_disk_randomness ,
+.Nm add_audio_randomness
+routines are used to
+supply data for the random data source device for further processing.
+The processing involves calculating inter-event time delta and measuring
+entropy contained in the resulting delta-T, supplied in argument data
+is just mixed into the pool and does not increase entropy counter.
+.br
+.Nm add_true_randomness
+does not involve usual timing calculations
+and causes supplied data argument added to the entropy pool
+increasing the entropy counter by 32 bits.
+.br
+.Nm add_timer_randomness
+will not cause entropy counter to rise, it
+is used to change the state of the pool periodically mostly
+by meaning of timing random driver's operations.
+.Pp
+.Nm get_random_bytes
+may be used to retrieve strong random data, just
+as it would by
+.Xr srandom 4
+device.
+.br
+.Nm arc4random
+will give random 32 bit numbers hashed with
+the ARC4 algorithm, which appears to be faster and less abusive
+to the entropy pool.
+.Sh SEE ALSO
+.Xr arc4random 3 ,
+.Xr pchb 4 ,
+.Xr random 4