Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src First step of random number subsystem rework described in
details: https://anonhg.NetBSD.org/src/rev/87e339cf0beb
branches: trunk
changeset: 771415:87e339cf0beb
user: tls <tls%NetBSD.org@localhost>
date: Sat Nov 19 22:51:18 2011 +0000
description:
First step of random number subsystem rework described in
<20111022023242.BA26F14A158%mail.netbsd.org@localhost>. This change includes
the following:
An initial cleanup and minor reorganization of the entropy pool
code in sys/dev/rnd.c and sys/dev/rndpool.c. Several bugs are
fixed. Some effort is made to accumulate entropy more quickly at
boot time.
A generic interface, "rndsink", is added, for stream generators to
request that they be re-keyed with good quality entropy from the pool
as soon as it is available.
The arc4random()/arc4randbytes() implementation in libkern is
adjusted to use the rndsink interface for rekeying, which helps
address the problem of low-quality keys at boot time.
An implementation of the FIPS 140-2 statistical tests for random
number generator quality is provided (libkern/rngtest.c). This
is based on Greg Rose's implementation from Qualcomm.
A new random stream generator, nist_ctr_drbg, is provided. It is
based on an implementation of the NIST SP800-90 CTR_DRBG by
Henric Jungheim. This generator users AES in a modified counter
mode to generate a backtracking-resistant random stream.
An abstraction layer, "cprng", is provided for in-kernel consumers
of randomness. The arc4random/arc4randbytes API is deprecated for
in-kernel use. It is replaced by "cprng_strong". The current
cprng_fast implementation wraps the existing arc4random
implementation. The current cprng_strong implementation wraps the
new CTR_DRBG implementation. Both interfaces are rekeyed from
the entropy pool automatically at intervals justifiable from best
current cryptographic practice.
In some quick tests, cprng_fast() is about the same speed as
the old arc4randbytes(), and cprng_strong() is about 20% faster
than rnd_extract_data(). Performance is expected to improve.
The AES code in src/crypto/rijndael is no longer an optional
kernel component, as it is required by cprng_strong, which is
not an optional kernel component.
The entropy pool output is subjected to the rngtest tests at
startup time; if it fails, the system will reboot. There is
approximately a 3/10000 chance of a false positive from these
tests. Entropy pool _input_ from hardware random numbers is
subjected to the rngtest tests at attach time, as well as the
FIPS continuous-output test, to detect bad or stuck hardware
RNGs; if any are detected, they are detached, but the system
continues to run.
A problem with rndctl(8) is fixed -- datastructures with
pointers in arrays are no longer passed to userspace (this
was not a security problem, but rather a major issue for
compat32). A new kernel will require a new rndctl.
The sysctl kern.arandom() and kern.urandom() nodes are hooked
up to the new generators, but the /dev/*random pseudodevices
are not, yet.
Manual pages for the new kernel interfaces are forthcoming.
diffstat:
UPDATING | 12 +-
sys/altq/altq_blue.c | 7 +-
sys/altq/altq_cdnr.c | 7 +-
sys/altq/altq_red.c | 7 +-
sys/altq/altq_rmclass.c | 7 +-
sys/arch/acorn26/ioc/arckbd.c | 6 +-
sys/arch/amd64/conf/INSTALL | 5 +-
sys/arch/arm/at91/at91dbguvar.h | 4 +-
sys/arch/arm/at91/at91usartvar.h | 4 +-
sys/arch/arm/ep93xx/epcomvar.h | 4 +-
sys/arch/arm/s3c2xx0/sscom_var.h | 4 +-
sys/arch/arm/sa11x0/sa1111_kbc.c | 6 +-
sys/arch/arm/xscale/ixp425_if_npe.c | 6 +-
sys/arch/emips/ebus/ace_ebus.c | 8 +-
sys/arch/emips/ebus/flash_ebus.c | 8 +-
sys/arch/emips/ebus/if_le_ebus.c | 6 +-
sys/arch/evbarm/dev/plcomvar.h | 4 +-
sys/arch/hp300/dev/rdvar.h | 4 +-
sys/arch/hp700/gsc/harmonyvar.h | 4 +-
sys/arch/i386/pci/glxsb.c | 10 +-
sys/arch/macppc/dev/if_gm.c | 6 +-
sys/arch/mips/alchemy/dev/if_aumac.c | 6 +-
sys/arch/mips/atheros/dev/aevar.h | 4 +-
sys/arch/mips/sibyte/dev/sbscnvar.h | 4 +-
sys/arch/next68k/dev/mb8795var.h | 4 +-
sys/arch/sgimips/hpc/sqvar.h | 4 +-
sys/arch/sgimips/mace/if_mec.c | 6 +-
sys/arch/sun2/dev/if_ec.c | 6 +-
sys/arch/x68k/dev/fd.c | 6 +-
sys/arch/x86/include/via_padlock.h | 4 +-
sys/arch/x86/pci/fwhrng.c | 6 +-
sys/arch/x86/x86/via_padlock.c | 7 +-
sys/arch/xen/include/xbdvar.h | 4 +-
sys/arch/xen/xen/if_xennet_xenbus.c | 6 +-
sys/arch/xen/xen/xbd_xenbus.c | 6 +-
sys/conf/files | 11 +-
sys/crypto/nist_ctr_drbg/files.nist_ctr_drbg | 3 +
sys/crypto/nist_ctr_drbg/nist_ctr_aes_rijndael.h | 82 ++
sys/crypto/nist_ctr_drbg/nist_ctr_drbg.c | 664 ++++++++++++++++++++++
sys/crypto/nist_ctr_drbg/nist_ctr_drbg.h | 106 +++
sys/crypto/nist_ctr_drbg/nist_ctr_drbg_aes128.h | 80 ++
sys/crypto/nist_ctr_drbg/nist_ctr_drbg_aes256.h | 80 ++
sys/crypto/nist_ctr_drbg/nist_ctr_drbg_config.h | 72 ++
sys/crypto/rijndael/files.rijndael | 10 +-
sys/dev/ata/wdvar.h | 4 +-
sys/dev/gpib/rd.c | 6 +-
sys/dev/ic/comvar.h | 4 +-
sys/dev/ic/cs89x0var.h | 4 +-
sys/dev/ic/dp8390var.h | 4 +-
sys/dev/ic/elink3var.h | 4 +-
sys/dev/ic/elinkxlvar.h | 4 +-
sys/dev/ic/gemvar.h | 4 +-
sys/dev/ic/hmevar.h | 4 +-
sys/dev/ic/i82557var.h | 4 +-
sys/dev/ic/lan9118var.h | 4 +-
sys/dev/ic/lancevar.h | 4 +-
sys/dev/ic/lemacvar.h | 4 +-
sys/dev/ic/mb86950var.h | 4 +-
sys/dev/ic/mb86960var.h | 4 +-
sys/dev/ic/mtd803var.h | 4 +-
sys/dev/ic/pckbc.c | 6 +-
sys/dev/ic/rtl81x9var.h | 4 +-
sys/dev/ic/seeq8005var.h | 4 +-
sys/dev/ic/smc91cxxvar.h | 4 +-
sys/dev/ic/tulipvar.h | 4 +-
sys/dev/isa/fdvar.h | 4 +-
sys/dev/isa/if_eg.c | 6 +-
sys/dev/isa/if_el.c | 6 +-
sys/dev/isa/if_iy.c | 6 +-
sys/dev/ldvar.h | 4 +-
sys/dev/marvell/if_gfevar.h | 4 +-
sys/dev/marvell/if_mvgbe.c | 6 +-
sys/dev/mca/edvar.h | 4 +-
sys/dev/pci/amdpmvar.h | 4 +-
sys/dev/pci/hifn7751.c | 15 +-
sys/dev/pci/hifn7751var.h | 4 +-
sys/dev/pci/if_bce.c | 6 +-
sys/dev/pci/if_bgevar.h | 4 +-
sys/dev/pci/if_casvar.h | 4 +-
sys/dev/pci/if_devar.h | 4 +-
sys/dev/pci/if_dge.c | 6 +-
sys/dev/pci/if_iwi.c | 8 +-
sys/dev/pci/if_jme.c | 6 +-
sys/dev/pci/if_mskvar.h | 4 +-
sys/dev/pci/if_pcn.c | 6 +-
sys/dev/pci/if_sip.c | 6 +-
sys/dev/pci/if_skvar.h | 4 +-
sys/dev/pci/if_tlvar.h | 4 +-
sys/dev/pci/if_vr.c | 6 +-
sys/dev/pci/if_vtevar.h | 4 +-
sys/dev/pci/if_wm.c | 6 +-
sys/dev/pci/ixgbe/ixgbe.c | 4 +-
sys/dev/pci/ubsec.c | 9 +-
sys/dev/pcmcia/if_xivar.h | 4 +-
sys/dev/rnd.c | 692 ++++++++++++++++------
sys/dev/scsipi/cdvar.h | 4 +-
sys/dev/scsipi/sdvar.h | 4 +-
sys/dev/scsipi/stvar.h | 4 +-
sys/dev/usb/if_auereg.h | 4 +-
sys/dev/usb/if_axereg.h | 4 +-
sys/dev/usb/if_cdcereg.h | 4 +-
sys/dev/usb/if_cuereg.h | 4 +-
sys/dev/usb/if_kuereg.h | 4 +-
sys/dev/usb/if_udavreg.h | 4 +-
sys/dev/usb/if_upl.c | 6 +-
sys/dev/usb/if_urlreg.h | 4 +-
sys/dev/usb/ucom.c | 6 +-
sys/dev/usb/uhidev.h | 4 +-
sys/dist/pf/net/pf.c | 27 +-
sys/dist/pf/netinet/tcp_rndiss.c | 11 +-
sys/fs/tmpfs/tmpfs_subr.c | 6 +-
sys/kern/exec_elf.c | 7 +-
sys/kern/init_main.c | 20 +-
sys/kern/init_sysctl.c | 21 +-
sys/kern/kern_exec.c | 7 +-
sys/kern/kern_pax.c | 9 +-
sys/kern/kern_ssp.c | 7 +-
sys/kern/kern_sysctl.c | 13 +-
sys/kern/kern_uuid.c | 9 +-
sys/kern/subr_cprng.c | 305 ++++++++++
sys/lib/libkern/Makefile.libkern | 3 +-
sys/lib/libkern/arc4random.c | 235 +++++--
sys/lib/libkern/rngtest.c | 281 +++++++++
sys/net/if_bridge.c | 7 +-
sys/net/if_spppsubr.c | 21 +-
sys/net/npf/npf_nat.c | 8 +-
sys/net80211/ieee80211_netbsd.c | 15 +-
sys/netinet/in.c | 8 +-
sys/netinet/ip_carp.c | 9 +-
sys/netinet/ip_id.c | 7 +-
sys/netinet/rfc6056.c | 20 +-
sys/netinet/tcp_input.c | 9 +-
sys/netinet/tcp_subr.c | 28 +-
sys/netinet6/files.ipsec | 6 +-
sys/netinet6/in6.c | 14 +-
sys/netinet6/in6_ifattach.c | 13 +-
sys/netinet6/ip6_id.c | 20 +-
sys/netinet6/ip6_input.c | 7 +-
sys/netinet6/mld6.c | 9 +-
sys/netinet6/mld6_var.h | 4 +-
sys/netinet6/nd6.c | 5 +-
sys/netinet6/nd6.h | 4 +-
sys/netinet6/nd6_rtr.c | 5 +-
sys/netkey/key.c | 24 +-
sys/nfs/nfs_subs.c | 7 +-
sys/opencrypto/files.opencrypto | 4 +-
sys/rump/librump/rumpkern/Makefile.rumpkern | 4 +-
sys/rump/librump/rumpkern/cprng_stub.c | 93 +++
sys/rump/librump/rumpkern/rump.c | 7 +-
sys/rump/librump/rumpvfs/rumpblk.c | 7 +-
sys/rump/net/lib/libshmif/if_shmem.c | 7 +-
sys/rump/net/lib/libvirtif/if_virt.c | 11 +-
sys/sys/cprng.h | 108 +++
sys/sys/queue.h | 6 +-
sys/sys/rnd.h | 71 +-
sys/sys/rngtest.h | 49 +
sys/sys/sysctl.h | 8 +-
sys/ufs/ffs/ffs_appleufs.c | 9 +-
158 files changed, 3114 insertions(+), 785 deletions(-)
diffs (truncated from 7643 to 300 lines):
diff -r 95b8f5745ae5 -r 87e339cf0beb UPDATING
--- a/UPDATING Sat Nov 19 20:44:58 2011 +0000
+++ b/UPDATING Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: UPDATING,v 1.229 2011/09/30 22:17:50 jym Exp $
+$NetBSD: UPDATING,v 1.230 2011/11/19 22:51:18 tls Exp $
This file (UPDATING) is intended to be a brief reference to recent
changes that might cause problems in the build process, and a guide for
@@ -15,6 +15,14 @@
Recent changes:
^^^^^^^^^^^^^^^
+
+20111119:
+ A problem with the datastructures used by the rndctl(8)
+ utility (pointers in datastructures in an array, making 32->64
+ bit compatibility very painful) has been fixed in a
+ non-backwards-compatible way. If you replace your kernel,
+ replace your rndctl executable too.
+
20111001:
the prop_*_send_syscall() functions from proplib(3) have been
changed and their new version is not backward compatible with the old
@@ -463,7 +471,7 @@
What to do if things don't work:
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-When things don't work there is usually a few things that commonly
+When things don't work there are usually a few things that commonly
should be done.
1) make includes
This should be done automatically by make build.
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/altq/altq_blue.c
--- a/sys/altq/altq_blue.c Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/altq/altq_blue.c Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.c,v 1.22 2007/03/04 05:59:00 christos Exp $ */
+/* $NetBSD: altq_blue.c,v 1.23 2011/11/19 22:51:18 tls Exp $ */
/* $KAME: altq_blue.c,v 1.15 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.22 2007/03/04 05:59:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.23 2011/11/19 22:51:18 tls Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -80,6 +80,7 @@
#include <sys/errno.h>
#include <sys/kernel.h>
#include <sys/kauth.h>
+#include <sys/cprng.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -504,7 +505,7 @@
static int
drop_early(blue_t *rp)
{
- if ((arc4random() % rp->blue_max_pmark) < rp->blue_pmark) {
+ if ((cprng_fast32() % rp->blue_max_pmark) < rp->blue_pmark) {
/* drop or mark */
return (1);
}
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/altq/altq_cdnr.c
--- a/sys/altq/altq_cdnr.c Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/altq/altq_cdnr.c Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cdnr.c,v 1.19 2007/03/04 05:59:01 christos Exp $ */
+/* $NetBSD: altq_cdnr.c,v 1.20 2011/11/19 22:51:18 tls Exp $ */
/* $KAME: altq_cdnr.c,v 1.15 2005/04/13 03:44:24 suz Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cdnr.c,v 1.19 2007/03/04 05:59:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cdnr.c,v 1.20 2011/11/19 22:51:18 tls Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -46,6 +46,7 @@
#include <sys/kernel.h>
#include <sys/queue.h>
#include <sys/kauth.h>
+#include <sys/cprng.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -801,7 +802,7 @@
* marker
*/
if (avg_rate > tsw->cmtd_rate) {
- u_int32_t randval = arc4random() % avg_rate;
+ u_int32_t randval = cprng_fast32() % avg_rate;
if (avg_rate > tsw->peak_rate) {
if (randval < avg_rate - tsw->peak_rate) {
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/altq/altq_red.c
--- a/sys/altq/altq_red.c Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/altq/altq_red.c Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_red.c,v 1.28 2008/06/18 09:06:27 yamt Exp $ */
+/* $NetBSD: altq_red.c,v 1.29 2011/11/19 22:51:18 tls Exp $ */
/* $KAME: altq_red.c,v 1.20 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.28 2008/06/18 09:06:27 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.29 2011/11/19 22:51:18 tls Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -87,6 +87,7 @@
#include <sys/time.h>
#endif
#endif /* ALTQ3_COMPAT */
+#include <sys/cprng.h>
#include <net/if.h>
@@ -505,7 +506,7 @@
* drop probability = (avg - TH_MIN) / d
*/
- if ((arc4random() % d) < fp_len) {
+ if ((cprng_fast32() % d) < fp_len) {
/* drop or mark */
return (1);
}
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/altq/altq_rmclass.c
--- a/sys/altq/altq_rmclass.c Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/altq/altq_rmclass.c Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rmclass.c,v 1.21 2008/07/15 16:18:08 christos Exp $ */
+/* $NetBSD: altq_rmclass.c,v 1.22 2011/11/19 22:51:18 tls Exp $ */
/* $KAME: altq_rmclass.c,v 1.19 2005/04/13 03:44:25 suz Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.21 2008/07/15 16:18:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rmclass.c,v 1.22 2011/11/19 22:51:18 tls Exp $");
/* #ident "@(#)rm_class.c 1.48 97/12/05 SMI" */
@@ -59,6 +59,7 @@
#ifdef ALTQ3_COMPAT
#include <sys/kernel.h>
#endif
+#include <sys/cprng.h>
#include <net/if.h>
#ifdef ALTQ3_COMPAT
@@ -1777,7 +1778,7 @@
} else {
struct mbuf *prev = NULL;
- n = arc4random() % qlen(q) + 1;
+ n = cprng_fast32() % qlen(q) + 1;
for (i = 0; i < n; i++) {
prev = m;
m = m->m_nextpkt;
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/arch/acorn26/ioc/arckbd.c
--- a/sys/arch/acorn26/ioc/arckbd.c Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/arch/acorn26/ioc/arckbd.c Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arckbd.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $ */
+/* $NetBSD: arckbd.c,v 1.21 2011/11/19 22:51:18 tls Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arckbd.c,v 1.21 2011/11/19 22:51:18 tls Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -139,7 +139,7 @@
struct irq_handler *sc_rirq;
struct evcnt sc_rev;
#if NRND > 0
- rndsource_element_t sc_rnd_source;
+ krndsource_t sc_rnd_source;
#endif
};
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/arch/amd64/conf/INSTALL
--- a/sys/arch/amd64/conf/INSTALL Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/arch/amd64/conf/INSTALL Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.87 2011/08/08 16:13:42 jakllsch Exp $
+# $NetBSD: INSTALL,v 1.88 2011/11/19 22:51:19 tls Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,8 @@
include "arch/amd64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.87 $"
+options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
+#ident "INSTALL-$Revision: 1.88 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/arch/arm/at91/at91dbguvar.h
--- a/sys/arch/arm/at91/at91dbguvar.h Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/arch/arm/at91/at91dbguvar.h Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91dbguvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91dbguvar.h,v 1.4 2011/11/19 22:51:19 tls Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
@@ -82,7 +82,7 @@
int enabled;
#if NRND > 0 && defined(RND_COM)
- rndsource_element_t rnd_source;
+ krndsource_t rnd_source;
#endif
};
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/arch/arm/at91/at91usartvar.h
--- a/sys/arch/arm/at91/at91usartvar.h Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/arch/arm/at91/at91usartvar.h Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91usartvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91usartvar.h,v 1.4 2011/11/19 22:51:19 tls Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -86,7 +86,7 @@
int enabled;
#if NRND > 0 && defined(RND_COM)
- rndsource_element_t rnd_source;
+ krndsource_t rnd_source;
#endif
};
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/arch/arm/ep93xx/epcomvar.h
--- a/sys/arch/arm/ep93xx/epcomvar.h Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/arch/arm/ep93xx/epcomvar.h Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: epcomvar.h,v 1.4 2009/10/23 00:39:30 snj Exp $ */
+/* $NetBSD: epcomvar.h,v 1.5 2011/11/19 22:51:19 tls Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
*
@@ -83,7 +83,7 @@
int enabled;
#if NRND > 0 && defined(RND_COM)
- rndsource_element_t rnd_source;
+ krndsource_t rnd_source;
#endif
};
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/arch/arm/s3c2xx0/sscom_var.h
--- a/sys/arch/arm/s3c2xx0/sscom_var.h Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/arch/arm/s3c2xx0/sscom_var.h Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sscom_var.h,v 1.8 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: sscom_var.h,v 1.9 2011/11/19 22:51:19 tls Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -172,7 +172,7 @@
#endif
#if NRND > 0 && defined(RND_COM)
- rndsource_element_t rnd_source;
+ krndsource_t rnd_source;
#endif
#if (defined(MULTIPROCESSOR) || defined(LOCKDEBUG)) && defined(SSCOM_MPLOCK)
struct simplelock sc_lock;
diff -r 95b8f5745ae5 -r 87e339cf0beb sys/arch/arm/sa11x0/sa1111_kbc.c
--- a/sys/arch/arm/sa11x0/sa1111_kbc.c Sat Nov 19 20:44:58 2011 +0000
+++ b/sys/arch/arm/sa11x0/sa1111_kbc.c Sat Nov 19 22:51:18 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sa1111_kbc.c,v 1.12 2010/03/13 11:13:31 bsh Exp $ */
+/* $NetBSD: sa1111_kbc.c,v 1.13 2011/11/19 22:51:19 tls Exp $ */
/*
* Copyright (c) 2004 Ben Harris.
Home |
Main Index |
Thread Index |
Old Index