diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-11-18 02:37:32 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-11-18 02:37:32 +0000 |
| commit | 9bd6b7ef7200376e760a05281171c9f8e23f80ab (patch) | |
| tree | 27251bbc9c3dbbc43744ce06dbbae62846a166d2 | |
| parent | f4c8f66da2946c9a6e025a16d60740b159b20bab (diff) | |
move arc4random prototype to systm.h. more appropriate for most code
to include that than rdnvar.h. ok deraadt dlg
71 files changed, 77 insertions, 188 deletions
diff --git a/sys/ddb/db_hangman.c b/sys/ddb/db_hangman.c index 136ad98d80c..55e49236dc0 100644 --- a/sys/ddb/db_hangman.c +++ b/sys/ddb/db_hangman.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_hangman.c,v 1.30 2014/07/08 13:02:57 deraadt Exp $ */ +/* $OpenBSD: db_hangman.c,v 1.31 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 1996 Theo de Raadt, Michael Shalayeff @@ -36,7 +36,6 @@ #include <ddb/db_output.h> #include <dev/cons.h> -#include <dev/rndvar.h> #define ABC_ISCLR(c) sabc->abc[(c)-'a']==0 #define ABC_ISWRONG(c) sabc->abc[(c)-'a']=='_' diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index 2cf14762ea1..aa33896893b 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.157 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: if_wi.c,v 1.158 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -92,8 +92,6 @@ #include <machine/bus.h> -#include <dev/rndvar.h> - #include <dev/ic/if_wireg.h> #include <dev/ic/if_wi_ieee.h> #include <dev/ic/if_wivar.h> diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c index e56fdfb245e..9d7b06429a1 100644 --- a/sys/dev/ic/if_wi_hostap.c +++ b/sys/dev/ic/if_wi_hostap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_hostap.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: if_wi_hostap.c,v 1.47 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2002 @@ -67,8 +67,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_ioctl.h> -#include <dev/rndvar.h> - #include <dev/ic/if_wireg.h> #include <dev/ic/if_wi_ieee.h> #include <dev/ic/if_wivar.h> diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 7779e768bb0..52fa1167557 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.75 2014/09/06 05:41:35 jsg Exp $ */ +/* $OpenBSD: rt2860.c,v 1.76 2014/11/18 02:37:30 tedu Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -60,8 +60,6 @@ #include <dev/pci/pcidevs.h> -#include <dev/rndvar.h> - #ifdef RAL_DEBUG #define DPRINTF(x) do { if (rt2860_debug > 0) printf x; } while (0) #define DPRINTFN(n, x) do { if (rt2860_debug >= (n)) printf x; } while (0) diff --git a/sys/dev/ic/sili.c b/sys/dev/ic/sili.c index ada875c50bb..84fdd83a2f1 100644 --- a/sys/dev/ic/sili.c +++ b/sys/dev/ic/sili.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sili.c,v 1.54 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: sili.c,v 1.55 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -55,10 +55,6 @@ int sili_error_pmp_ports = 0; /* bitmask containing ports to fail*/ int sili_error_test_inv_p = 500; /* 1/P(error) */ int sili_error_restart_type = SILI_PREG_PCS_PORTINIT; /* or _DEVRESET */ -#ifdef SILI_ERROR_TEST -#include <dev/rndvar.h> -#endif - struct cfdriver sili_cd = { NULL, "sili", DV_DULL }; diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index f9bfec43a6a..b3083a86ce1 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_age.c,v 1.23 2014/08/19 16:13:25 miod Exp $ */ +/* $OpenBSD: if_age.c,v 1.24 2014/11/18 02:37:30 tedu Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -62,8 +62,6 @@ #include <net/bpf.h> #endif -#include <dev/rndvar.h> - #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index 453baf44225..4667d5040d2 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_alc.c,v 1.27 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: if_alc.c,v 1.28 2014/11/18 02:37:30 tedu Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -61,8 +61,6 @@ #include <net/bpf.h> #endif -#include <dev/rndvar.h> - #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index b75655ed387..02b4a044a15 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ale.c,v 1.31 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: if_ale.c,v 1.32 2014/11/18 02:37:30 tedu Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -65,8 +65,6 @@ #include <net/bpf.h> #endif -#include <dev/rndvar.h> - #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index c6baddbbeec..5e506e42b4e 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.118 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.119 2014/11/18 02:37:30 tedu Exp $ */ /*- * Copyright (c) 2004-2008 @@ -56,7 +56,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> -#include <dev/rndvar.h> #include <crypto/arc4.h> #include <dev/pci/if_iwireg.h> diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c index 3fc50284a46..7c5b9943738 100644 --- a/sys/dev/pci/if_vte.c +++ b/sys/dev/pci/if_vte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vte.c,v 1.9 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: if_vte.c,v 1.10 2014/11/18 02:37:30 tedu Exp $ */ /*- * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -61,8 +61,6 @@ #include <net/bpf.h> #endif -#include <dev/rndvar.h> - #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/pci/ixgbe.h b/sys/dev/pci/ixgbe.h index 07ca29729b8..4583869f7e6 100644 --- a/sys/dev/pci/ixgbe.h +++ b/sys/dev/pci/ixgbe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ixgbe.h,v 1.16 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: ixgbe.h,v 1.17 2014/11/18 02:37:30 tedu Exp $ */ /****************************************************************************** @@ -76,8 +76,6 @@ typedef int boolean_t; #define TRUE 1 #define FALSE 0 -#include <dev/rndvar.h> - #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/rndvar.h b/sys/dev/rndvar.h index 17cc93c7bf4..5907e26b10e 100644 --- a/sys/dev/rndvar.h +++ b/sys/dev/rndvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rndvar.h,v 1.33 2014/01/19 23:52:54 deraadt Exp $ */ +/* $OpenBSD: rndvar.h,v 1.34 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 1996,2000 Michael Shalayeff. @@ -72,9 +72,6 @@ extern struct rndstats rndstats; void random_start(void); void enqueue_randomness(int, int); -void arc4random_buf(void *, size_t); -u_int32_t arc4random(void); -u_int32_t arc4random_uniform(u_int32_t); #endif /* _KERNEL */ diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 233c9defb7e..7065bd9fa83 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.343 2014/10/30 19:07:54 tedu Exp $ */ +/* $OpenBSD: softraid.c,v 1.344 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -49,7 +49,6 @@ #include <scsi/scsi_disk.h> #include <dev/softraidvar.h> -#include <dev/rndvar.h> #ifdef HIBERNATE #include <lib/libsa/aes_xts.h> diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index 28960f95494..6588c011023 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.114 2014/10/30 17:26:23 tedu Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.115 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -54,7 +54,6 @@ #include <scsi/scsi_disk.h> #include <dev/softraidvar.h> -#include <dev/rndvar.h> /* * The per-I/O data that we need to preallocate. We cannot afford to allow I/O diff --git a/sys/dev/softraid_raid0.c b/sys/dev/softraid_raid0.c index 532fb492549..510fa443b50 100644 --- a/sys/dev/softraid_raid0.c +++ b/sys/dev/softraid_raid0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid0.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: softraid_raid0.c,v 1.47 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us> * @@ -40,7 +40,6 @@ #include <scsi/scsi_disk.h> #include <dev/softraidvar.h> -#include <dev/rndvar.h> /* RAID 0 functions. */ int sr_raid0_create(struct sr_discipline *, struct bioc_createraid *, diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c index c22871c3ee5..7317ac0d371 100644 --- a/sys/dev/softraid_raid1.c +++ b/sys/dev/softraid_raid1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid1.c,v 1.58 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: softraid_raid1.c,v 1.59 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * @@ -42,7 +42,6 @@ #include <scsi/scsi_disk.h> #include <dev/softraidvar.h> -#include <dev/rndvar.h> /* RAID 1 functions. */ int sr_raid1_create(struct sr_discipline *, struct bioc_createraid *, diff --git a/sys/dev/softraid_raid5.c b/sys/dev/softraid_raid5.c index ce1d19f2f48..60f9a064f2d 100644 --- a/sys/dev/softraid_raid5.c +++ b/sys/dev/softraid_raid5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid5.c,v 1.16 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: softraid_raid5.c,v 1.17 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> @@ -44,7 +44,6 @@ #include <scsi/scsi_disk.h> #include <dev/softraidvar.h> -#include <dev/rndvar.h> /* RAID 5 functions. */ int sr_raid5_create(struct sr_discipline *, struct bioc_createraid *, diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 50f889326ea..d46fa003ba0 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.169 2014/10/05 08:40:29 mpi Exp $ */ +/* $OpenBSD: ehci.c,v 1.170 2014/11/18 02:37:30 tedu Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -61,8 +61,6 @@ #include <dev/usb/ehcireg.h> #include <dev/usb/ehcivar.h> -#include <dev/rndvar.h> - struct cfdriver ehci_cd = { NULL, "ehci", DV_DULL }; diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 5af46a20549..636da5f8090 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.62 2014/11/01 14:44:08 mpi Exp $ */ +/* $OpenBSD: if_uath.c,v 1.63 2014/11/18 02:37:30 tedu Exp $ */ /*- * Copyright (c) 2006 @@ -57,7 +57,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> -#include <dev/rndvar.h> #include <crypto/arc4.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index 80bba4ec546..bf6a2e36936 100644 --- a/sys/dev/usb/if_wi_usb.c +++ b/sys/dev/usb/if_wi_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_usb.c,v 1.63 2014/07/13 15:52:49 mpi Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.64 2014/11/18 02:37:30 tedu Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -65,8 +65,6 @@ #include <machine/bus.h> -#include <dev/rndvar.h> - #include <dev/ic/if_wireg.h> #include <dev/ic/if_wi_ieee.h> #include <dev/ic/if_wivar.h> diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c index ced274d8fa6..a50c94c4e8f 100644 --- a/sys/kern/exec_subr.c +++ b/sys/kern/exec_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_subr.c,v 1.41 2014/11/16 23:54:56 guenther Exp $ */ +/* $OpenBSD: exec_subr.c,v 1.42 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $ */ /* @@ -41,8 +41,6 @@ #include <sys/mman.h> #include <sys/resourcevar.h> -#include <dev/rndvar.h> - #ifdef DEBUG /* * new_vmcmd(): diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 910f9b9b004..cd7bda2bc69 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.148 2014/11/16 12:31:00 deraadt Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.149 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -65,8 +65,6 @@ # include <machine/tcb.h> #endif -#include <dev/rndvar.h> - #include "systrace.h" #if NSYSTRACE > 0 diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 0f3246037b3..ea20aad122b 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.176 2014/11/03 21:28:35 tedu Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.177 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -54,7 +54,6 @@ #include <sys/ktrace.h> #include <sys/sched.h> #include <sys/sysctl.h> -#include <dev/rndvar.h> #include <sys/pool.h> #include <sys/mman.h> #include <sys/ptrace.h> diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index a7d48d5c3b0..286843b0ad2 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.124 2014/11/16 12:31:00 deraadt Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.125 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -40,8 +40,6 @@ #include <sys/time.h> #include <sys/rwlock.h> -#include <dev/rndvar.h> - #include <uvm/uvm_extern.h> static diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index de9799cafce..e608614748f 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.167 2014/11/15 06:55:32 dlg Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.168 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */ /*- @@ -42,7 +42,6 @@ #include <sys/sysctl.h> #include <uvm/uvm_extern.h> -#include <dev/rndvar.h> /* * Pool resource management utility. diff --git a/sys/miscfs/fuse/fusebuf.c b/sys/miscfs/fuse/fusebuf.c index 7194b094b4d..48624ad1777 100644 --- a/sys/miscfs/fuse/fusebuf.c +++ b/sys/miscfs/fuse/fusebuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fusebuf.c,v 1.8 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: fusebuf.c,v 1.9 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -25,8 +25,6 @@ #include <sys/vnode.h> #include <sys/fusebuf.h> -#include <dev/rndvar.h> - #include "fusefs_node.h" #include "fusefs.h" diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index fa40d367c19..5717a811b18 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.227 2014/09/08 06:24:13 jsg Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.228 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -51,9 +51,6 @@ #include <net/if_llc.h> #include <net/netisr.h> -/* for arc4random() */ -#include <dev/rndvar.h> - #ifdef INET #include <netinet/in.h> #include <netinet/ip.h> diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c index 953bdb2b85a..17ceef8cb3b 100644 --- a/sys/net/if_pflow.c +++ b/sys/net/if_pflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.c,v 1.46 2014/08/13 09:46:23 blambert Exp $ */ +/* $OpenBSD: if_pflow.c,v 1.47 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2011 Florian Obser <florian@narrans.de> @@ -29,7 +29,6 @@ #include <sys/ioctl.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <dev/rndvar.h> #include <net/if.h> #include <net/if_types.h> diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c index 507da6d4f91..280b76e7b71 100644 --- a/sys/net/if_pppoe.c +++ b/sys/net/if_pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppoe.c,v 1.41 2014/08/13 12:03:40 mpi Exp $ */ +/* $OpenBSD: if_pppoe.c,v 1.42 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */ /* @@ -51,9 +51,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -/* for arc4random() */ -#include <dev/rndvar.h> - #if NBPFILTER > 0 #include <net/bpf.h> #endif diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index ed40ac9fcf2..21a55a7a1f0 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.126 2014/10/08 20:28:27 sthen Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.127 2014/11/18 02:37:31 tedu Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -53,9 +53,6 @@ #include <net/if_types.h> #include <net/route.h> -/* for arc4random() */ -#include <dev/rndvar.h> - #include <sys/stdarg.h> #ifdef INET diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index b9f19b3b0bf..90e7fe92ee1 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.90 2014/07/22 11:06:09 mpi Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.91 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -30,8 +30,6 @@ #include <sys/timeout.h> #include <sys/hash.h> -#include <dev/rndvar.h> - #include <net/if.h> #include <net/if_arp.h> #include <net/if_dl.h> diff --git a/sys/net/pf.c b/sys/net/pf.c index 6851e9778a1..6d68a4755ae 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.894 2014/11/16 17:40:17 tedu Exp $ */ +/* $OpenBSD: pf.c,v 1.895 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -76,7 +76,6 @@ #include <netinet/if_ether.h> #include <netinet/ip_divert.h> -#include <dev/rndvar.h> #include <net/pfvar.h> #include <net/if_pflog.h> #include <net/if_pflow.h> diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index eaf17584c6d..270578bfc7d 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.276 2014/08/12 15:29:33 mikeb Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.277 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -64,7 +64,6 @@ #include <netinet/ip_var.h> #include <netinet/ip_icmp.h> -#include <dev/rndvar.h> #include <crypto/md5.h> #include <net/pfvar.h> diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c index 6fcb48510c0..392fa85c843 100644 --- a/sys/net/pf_lb.c +++ b/sys/net/pf_lb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_lb.c,v 1.35 2014/11/10 18:49:42 bluhm Exp $ */ +/* $OpenBSD: pf_lb.c,v 1.36 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -73,7 +73,6 @@ #include <netinet/if_ether.h> #include <netinet/in_pcb.h> -#include <dev/rndvar.h> #include <net/pfvar.h> #include <net/if_pflog.h> #include <net/if_pflow.h> diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c index 409c0964dfb..55429ae8c1b 100644 --- a/sys/net/pf_norm.c +++ b/sys/net/pf_norm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.169 2014/10/10 16:20:03 sthen Exp $ */ +/* $OpenBSD: pf_norm.c,v 1.170 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -40,7 +40,6 @@ #include <sys/pool.h> #include <sys/syslog.h> -#include <dev/rndvar.h> #include <net/if.h> #include <net/if_types.h> #include <net/bpf.h> diff --git a/sys/net/radix_mpath.c b/sys/net/radix_mpath.c index 2bda40c2043..50c7af2bd77 100644 --- a/sys/net/radix_mpath.c +++ b/sys/net/radix_mpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radix_mpath.c,v 1.25 2014/11/01 21:40:38 mpi Exp $ */ +/* $OpenBSD: radix_mpath.c,v 1.26 2014/11/18 02:37:31 tedu Exp $ */ /* $KAME: radix_mpath.c,v 1.13 2002/10/28 21:05:59 itojun Exp $ */ /* @@ -43,7 +43,6 @@ #include <net/radix.h> #include <net/radix_mpath.h> #include <net/route.h> -#include <dev/rndvar.h> #include <netinet/in.h> #include <netinet/ip_var.h> diff --git a/sys/net/trunklacp.c b/sys/net/trunklacp.c index c85f4b10a9b..424cc54c10f 100644 --- a/sys/net/trunklacp.c +++ b/sys/net/trunklacp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trunklacp.c,v 1.15 2014/07/12 18:44:22 tedu Exp $ */ +/* $OpenBSD: trunklacp.c,v 1.16 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */ /* $FreeBSD:ieee8023ad_lacp.c,v 1.15 2008/03/16 19:25:30 thompsa Exp $ */ @@ -40,7 +40,6 @@ #include <sys/rwlock.h> #include <sys/queue.h> #include <sys/timeout.h> -#include <dev/rndvar.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 0f59b34521a..3ea269c68a4 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_crypto.c,v 1.63 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ieee80211_crypto.c,v 1.64 2014/11/18 02:37:31 tedu Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -40,7 +40,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_priv.h> -#include <dev/rndvar.h> #include <crypto/arc4.h> #include <crypto/md5.h> #include <crypto/sha1.h> diff --git a/sys/net80211/ieee80211_crypto_wep.c b/sys/net80211/ieee80211_crypto_wep.c index 8ba9e93c319..4b3752db24c 100644 --- a/sys/net80211/ieee80211_crypto_wep.c +++ b/sys/net80211/ieee80211_crypto_wep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_crypto_wep.c,v 1.10 2014/07/12 18:44:22 tedu Exp $ */ +/* $OpenBSD: ieee80211_crypto_wep.c,v 1.11 2014/11/18 02:37:31 tedu Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -42,7 +42,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_crypto.h> -#include <dev/rndvar.h> #include <crypto/arc4.h> /* WEP software crypto context */ diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index c864b1c2e76..8cebd85f895 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_node.c,v 1.84 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ieee80211_node.c,v 1.85 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */ /*- @@ -66,8 +66,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_priv.h> -#include <dev/rndvar.h> - struct ieee80211_node *ieee80211_node_alloc(struct ieee80211com *); void ieee80211_node_free(struct ieee80211com *, struct ieee80211_node *); void ieee80211_node_copy(struct ieee80211com *, struct ieee80211_node *, diff --git a/sys/net80211/ieee80211_pae_input.c b/sys/net80211/ieee80211_pae_input.c index dc70f580ba0..417bd447986 100644 --- a/sys/net80211/ieee80211_pae_input.c +++ b/sys/net80211/ieee80211_pae_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_pae_input.c,v 1.21 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ieee80211_pae_input.c,v 1.22 2014/11/18 02:37:31 tedu Exp $ */ /*- * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr> @@ -43,8 +43,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_priv.h> -#include <dev/rndvar.h> - void ieee80211_recv_4way_msg1(struct ieee80211com *, struct ieee80211_eapol_key *, struct ieee80211_node *); #ifndef IEEE80211_STA_ONLY diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index ada4584a455..4c8c7f7f48f 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_proto.c,v 1.48 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ieee80211_proto.c,v 1.49 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */ /*- @@ -64,8 +64,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_priv.h> -#include <dev/rndvar.h> - const char * const ieee80211_mgt_subtype_name[] = { "assoc_req", "assoc_resp", "reassoc_req", "reassoc_resp", "probe_req", "probe_resp", "reserved#6", "reserved#7", diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index e2207594217..81c56d62f5c 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: igmp.c,v 1.45 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: igmp.c,v 1.46 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $ */ /* @@ -91,7 +91,6 @@ #include <netinet/ip_var.h> #include <netinet/igmp.h> #include <netinet/igmp_var.h> -#include <dev/rndvar.h> #include <sys/stdarg.h> diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 85f92a95005..dd1ec7010a7 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.162 2014/11/15 10:55:47 dlg Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.163 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -89,7 +89,6 @@ #include <netinet/in_pcb.h> #include <netinet/in_var.h> #include <netinet/ip_var.h> -#include <dev/rndvar.h> #include <sys/mount.h> #include <nfs/nfsproto.h> diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index d3ef05cae66..a030692c083 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.237 2014/11/03 11:43:47 gerhard Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.238 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -53,9 +53,6 @@ #include <net/if_types.h> #include <net/netisr.h> -/* for arc4random() */ -#include <dev/rndvar.h> - #include <crypto/sha1.h> #ifdef INET diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index 996759aeecd..a59a3889eac 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.126 2014/07/22 11:06:10 mpi Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.127 2014/11/18 02:37:31 tedu Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -45,8 +45,6 @@ #include <net/if.h> #include <net/bpf.h> -#include <dev/rndvar.h> - #ifdef INET #include <netinet/in.h> #include <netinet/ip.h> diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c index fa281c73dd6..faea78c6589 100644 --- a/sys/netinet/ip_id.c +++ b/sys/netinet/ip_id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_id.c,v 1.23 2011/03/31 10:36:42 jasper Exp $ */ +/* $OpenBSD: ip_id.c,v 1.24 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2008 Theo de Raadt, Ryan McBride @@ -26,7 +26,7 @@ * be reused for at least 32768 calls. */ #include <sys/param.h> -#include <dev/rndvar.h> +#include <sys/systm.h> static u_int16_t ip_shuffle[65536]; static int isindex = 0; diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c index 117bc60829a..ce1ad3b5aeb 100644 --- a/sys/netinet/ip_ipcomp.c +++ b/sys/netinet/ip_ipcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipcomp.c,v 1.36 2014/07/22 11:06:10 mpi Exp $ */ +/* $OpenBSD: ip_ipcomp.c,v 1.37 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org) @@ -37,8 +37,6 @@ #include <net/if.h> #include <net/bpf.h> -#include <dev/rndvar.h> - #ifdef INET #include <netinet/in.h> #include <netinet/ip.h> diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index 79130c74540..8c8daf67531 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.199 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.200 2014/11/18 02:37:31 tedu Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -73,7 +73,6 @@ #include <netinet/ip_ipsp.h> #include <net/pfkeyv2.h> #include <crypto/xform.h> -#include <dev/rndvar.h> #ifdef DDB #include <ddb/db_output.h> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 9b1b458c243..cea9fc617b4 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.282 2014/11/04 15:24:40 mpi Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.283 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -80,8 +80,6 @@ #include <sys/kernel.h> #include <sys/pool.h> -#include <dev/rndvar.h> - #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 628aac461a0..22136f20965 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.137 2014/11/16 17:40:17 tedu Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.138 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -92,7 +92,6 @@ #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> #include <netinet/tcpip.h> -#include <dev/rndvar.h> #ifdef INET6 #include <netinet6/ip6protosw.h> diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index e559ad72be9..0b827ff2610 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_usrreq.c,v 1.120 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: tcp_usrreq.c,v 1.121 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $ */ /* @@ -80,8 +80,6 @@ #include <sys/kernel.h> #include <sys/pool.h> -#include <dev/rndvar.h> - #include <net/if.h> #include <net/route.h> diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index f23534f9b94..f8194682993 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frag6.c,v 1.56 2014/10/14 09:52:26 mpi Exp $ */ +/* $OpenBSD: frag6.c,v 1.57 2014/11/18 02:37:31 tedu Exp $ */ /* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */ /* @@ -52,8 +52,6 @@ #include <netinet/icmp6.h> #include <netinet/ip.h> /* for ECN definitions */ -#include <dev/rndvar.h> - /* * Define it to get a correct behavior on per-interface statistics. * You will need to perform an extra routing table lookup, per fragment, diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index 9faae1dc100..f3f09cf791a 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.74 2014/11/01 21:40:39 mpi Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.75 2014/11/18 02:37:31 tedu Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -58,8 +58,6 @@ #include <netinet6/ip6_mroute.h> #endif -#include <dev/rndvar.h> - unsigned long in6_maxmtu = 0; int ip6_auto_linklocal = 1; /* enable by default */ diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6fee3d159ce..d8dfd1084e8 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_pcb.c,v 1.65 2014/08/21 11:54:00 mpi Exp $ */ +/* $OpenBSD: in6_pcb.c,v 1.66 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -125,8 +125,6 @@ * External globals */ -#include <dev/rndvar.h> - /* * Globals */ diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c index 8c7de21d727..8c8f569215c 100644 --- a/sys/netinet6/ip6_id.c +++ b/sys/netinet6/ip6_id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_id.c,v 1.8 2010/02/08 12:16:02 jsing Exp $ */ +/* $OpenBSD: ip6_id.c,v 1.9 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: ip6_id.c,v 1.7 2003/09/13 21:32:59 itojun Exp $ */ /* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */ @@ -85,14 +85,13 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/socket.h> +#include <sys/systm.h> #include <net/if.h> #include <netinet/in.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <dev/rndvar.h> - struct randomtab { const int ru_bits; /* resulting bits */ const long ru_out; /* Time after wich will be reseeded */ diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index 5b93ef99c93..1e0cc208b34 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mld6.c,v 1.38 2014/04/14 09:06:42 mpi Exp $ */ +/* $OpenBSD: mld6.c,v 1.39 2014/11/18 02:37:31 tedu Exp $ */ /* $KAME: mld6.c,v 1.26 2001/02/16 14:50:35 itojun Exp $ */ /* @@ -71,7 +71,6 @@ #include <sys/socket.h> #include <sys/protosw.h> #include <sys/syslog.h> -#include <dev/rndvar.h> #include <net/if.h> #include <net/if_var.h> diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index d7a6e8c6dc2..088ff5ef64d 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.124 2014/11/01 21:40:39 mpi Exp $ */ +/* $OpenBSD: nd6.c,v 1.125 2014/11/18 02:37:31 tedu Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -45,7 +45,6 @@ #include <sys/syslog.h> #include <sys/queue.h> #include <sys/task.h> -#include <dev/rndvar.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index ab23d49e3cc..617ae667cd0 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.83 2014/11/10 10:46:10 mpi Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.84 2014/11/18 02:37:31 tedu Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -56,8 +56,6 @@ #include <netinet6/nd6.h> #include <netinet/icmp6.h> -#include <dev/rndvar.h> - #include "carp.h" #if NCARP > 0 #include <netinet/ip_carp.h> diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 331885d82b0..c809f2ce311 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.89 2014/11/01 21:40:39 mpi Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.90 2014/11/18 02:37:31 tedu Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/ioctl.h> #include <sys/syslog.h> #include <sys/queue.h> -#include <dev/rndvar.h> #include <net/if.h> #include <net/if_types.h> @@ -58,8 +57,6 @@ #include <netinet6/nd6.h> #include <netinet/icmp6.h> -#include <dev/rndvar.h> - #define SDL(s) ((struct sockaddr_dl *)s) int rtpref(struct nd_defrouter *); diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c index e33615e843e..13ea9f371c4 100644 --- a/sys/nfs/krpc_subr.c +++ b/sys/nfs/krpc_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: krpc_subr.c,v 1.23 2014/11/14 23:01:44 tedu Exp $ */ +/* $OpenBSD: krpc_subr.c,v 1.24 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ /* @@ -60,7 +60,6 @@ #include <nfs/rpcv2.h> #include <nfs/krpc.h> #include <nfs/xdr_subs.h> -#include <dev/rndvar.h> #include <crypto/idgen.h> /* diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 3e772c50c35..58aabeebb75 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.118 2014/11/14 23:01:44 tedu Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.119 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -67,7 +67,6 @@ #include <netinet/in.h> -#include <dev/rndvar.h> #include <crypto/idgen.h> int nfs_attrtimeo(struct nfsnode *np); diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 2ed13479146..9461bbd79be 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.155 2014/11/15 02:42:38 doug Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.156 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -76,8 +76,6 @@ #include <net/if.h> #include <netinet/in.h> -#include <dev/rndvar.h> - void nfs_cache_enter(struct vnode *, struct vnode *, struct componentname *); /* Global vfs data structures for nfs. */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 08c37248f0d..2285c077cbc 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.102 2014/10/09 04:04:27 tedu Exp $ */ +/* $OpenBSD: systm.h,v 1.103 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -215,6 +215,10 @@ int copyin(const void *, void *, size_t) __attribute__ ((__bounded__(__buffer__,2,3))); int copyout(const void *, void *, size_t); +void arc4random_buf(void *, size_t); +u_int32_t arc4random(void); +u_int32_t arc4random_uniform(u_int32_t); + struct timeval; struct timespec; int hzto(const struct timeval *); diff --git a/sys/tmpfs/tmpfs_subr.c b/sys/tmpfs/tmpfs_subr.c index 89026cda0b5..3e92d11dff0 100644 --- a/sys/tmpfs/tmpfs_subr.c +++ b/sys/tmpfs/tmpfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmpfs_subr.c,v 1.7 2014/11/16 12:31:00 deraadt Exp $ */ +/* $OpenBSD: tmpfs_subr.c,v 1.8 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $ */ /* @@ -93,8 +93,6 @@ __KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $") #include <uvm/uvm_aobj.h> -#include <dev/rndvar.h> - #include <tmpfs/tmpfs.h> #include <tmpfs/tmpfs_vnops.h> diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index fede646ed4d..d49147f7925 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_alloc.c,v 1.102 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ffs_alloc.c,v 1.103 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */ /* @@ -51,8 +51,6 @@ #include <sys/stdint.h> #include <sys/time.h> -#include <dev/rndvar.h> - #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> #include <ufs/ufs/ufsmount.h> diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 15e3a6a9230..87e3bce62e4 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.143 2014/07/14 08:11:34 beck Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.144 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -53,8 +53,6 @@ #include <sys/disk.h> #include <sys/specdev.h> -#include <dev/rndvar.h> - #include <ufs/ufs/quota.h> #include <ufs/ufs/ufsmount.h> #include <ufs/ufs/inode.h> diff --git a/sys/uvm/uvm_addr.c b/sys/uvm/uvm_addr.c index 7af4006fa00..b9367cbcfff 100644 --- a/sys/uvm/uvm_addr.c +++ b/sys/uvm/uvm_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_addr.c,v 1.9 2014/11/13 00:47:44 tedu Exp $ */ +/* $OpenBSD: uvm_addr.c,v 1.10 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -22,7 +22,6 @@ #include <uvm/uvm.h> #include <uvm/uvm_addr.h> #include <sys/pool.h> -#include <dev/rndvar.h> /* Max gap between hint allocations. */ #define UADDR_HINT_MAXGAP (4 * PAGE_SIZE) diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index ea6a385caba..87c7df9e35d 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.178 2014/11/16 12:31:00 deraadt Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.179 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -92,8 +92,6 @@ #include <sys/pool.h> #include <sys/kernel.h> -#include <dev/rndvar.h> - #ifdef SYSVSHM #include <sys/shm.h> #endif diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c index 28054928bc0..44afd37f053 100644 --- a/sys/uvm/uvm_swap.c +++ b/sys/uvm/uvm_swap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap.c,v 1.130 2014/11/17 00:15:38 tedu Exp $ */ +/* $OpenBSD: uvm_swap.c,v 1.131 2014/11/18 02:37:31 tedu Exp $ */ /* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */ /* @@ -61,7 +61,6 @@ #include <uvm/uvm.h> #ifdef UVM_SWAP_ENCRYPT -#include <dev/rndvar.h> #include <sys/syslog.h> #endif diff --git a/sys/uvm/uvm_swap_encrypt.c b/sys/uvm/uvm_swap_encrypt.c index 57547cf3f2d..3e6232090ee 100644 --- a/sys/uvm/uvm_swap_encrypt.c +++ b/sys/uvm/uvm_swap_encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap_encrypt.c,v 1.18 2014/09/14 14:17:27 jsg Exp $ */ +/* $OpenBSD: uvm_swap_encrypt.c,v 1.19 2014/11/18 02:37:31 tedu Exp $ */ /* * Copyright 1999 Niels Provos <provos@citi.umich.edu> @@ -37,7 +37,6 @@ #include <sys/sysctl.h> #include <sys/time.h> #include <sys/conf.h> -#include <dev/rndvar.h> #include <crypto/rijndael.h> #include <uvm/uvm.h> |