Date: Fri, 2 Aug 2013 10:05:57 +0200 From: Fabien Thomas <fabien.thomas@netasq.com> To: David E. O'Brien <obrien@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r253779 - in head: . share/man/man4 sys/amd64/conf sys/arm/conf sys/conf sys/dev/random sys/i386/conf sys/ia64/conf sys/mips/conf sys/modules sys/modules/random sys/pc98/conf sys/powerp... Message-ID: <5E61D610-3322-4240-9978-CB277C7161F5@netasq.com> In-Reply-To: <201307292026.r6TKQRRb021717@svn.freebsd.org> References: <201307292026.r6TKQRRb021717@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_E0AA719C-1150-414D-968A-113B19AA18EA Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=iso-8859-1 Le 29 juil. 2013 =E0 22:26, David E. O'Brien a =E9crit : > Author: obrien > Date: Mon Jul 29 20:26:27 2013 > New Revision: 253779 > URL: http://svnweb.freebsd.org/changeset/base/253779 >=20 > Log: > Decouple yarrow from random(4) device. >=20 > * Make Yarrow an optional kernel component -- enabled by "YARROW_RNG" = option. > The files sha2.c, hash.c, randomdev_soft.c and yarrow.c comprise = yarrow. >=20 > * random(4) device doesn't really depend on rijndael-*. Yarrow, = however, does. >=20 > * Add random_adaptors.[ch] which is basically a store of = random_adaptor's. > random_adaptor is basically an adapter that plugs in to random(4). > random_adaptor can only be plugged in to random(4) very early in = bootup. > Unplugging random_adaptor from random(4) is not supported, and is = probably a > bad idea anyway, due to potential loss of entropy pools. > We currently have 3 random_adaptors: > + yarrow > + rdrand (ivy.c) > + nehemeiah >=20 > * Remove platform dependent logic from probe.c, and move it into > corresponding registration routines of each random_adaptor = provider. > probe.c doesn't do anything other than picking a specific = random_adaptor > from a list of registered ones. >=20 > * If the kernel doesn't have any random_adaptor adapters present then = the > creation of /dev/random is postponed until next random_adaptor is = kldload'ed. >=20 > * Fix randomdev_soft.c to refer to its own random_adaptor, instead of = a > system wide one. >=20 We need to have very good random by default. Even selecting HW random automatically is not very good. HW random is = difficult to trust. Why not having a good default software random seeded by automatically = detected HW random ? After that the user can choose to bypass the software random a feed = directly by the HW random source. > Submitted by: arthurmesh@gmail.com, obrien > Obtained from: Juniper Networks > Reviewed by: obrien >=20 > Modified: > head/UPDATING > head/share/man/man4/random.4 > head/sys/amd64/conf/GENERIC > head/sys/arm/conf/AC100 > head/sys/arm/conf/ARMADAXP > head/sys/arm/conf/ARNDALE > head/sys/arm/conf/ATMEL > head/sys/arm/conf/AVILA > head/sys/arm/conf/BEAGLEBONE > head/sys/arm/conf/BWCT > head/sys/arm/conf/CAMBRIA > head/sys/arm/conf/CNS11XXNAS > head/sys/arm/conf/CRB > head/sys/arm/conf/CUBIEBOARD > head/sys/arm/conf/DB-78XXX > head/sys/arm/conf/DB-88F5XXX > head/sys/arm/conf/DB-88F6XXX > head/sys/arm/conf/DOCKSTAR > head/sys/arm/conf/DREAMPLUG-1001 > head/sys/arm/conf/EA3250 > head/sys/arm/conf/EB9200 > head/sys/arm/conf/EFIKA_MX > head/sys/arm/conf/EP80219 > head/sys/arm/conf/ETHERNUT5 > head/sys/arm/conf/GUMSTIX > head/sys/arm/conf/HL200 > head/sys/arm/conf/HL201 > head/sys/arm/conf/IQ31244 > head/sys/arm/conf/KB920X > head/sys/arm/conf/LN2410SBC > head/sys/arm/conf/NSLU > head/sys/arm/conf/PANDABOARD > head/sys/arm/conf/QILA9G20 > head/sys/arm/conf/RPI-B > head/sys/arm/conf/SAM9260EK > head/sys/arm/conf/SAM9G20EK > head/sys/arm/conf/SAM9X25EK > head/sys/arm/conf/SHEEVAPLUG > head/sys/arm/conf/SN9G45 > head/sys/arm/conf/TS7800 > head/sys/arm/conf/VERSATILEPB > head/sys/arm/conf/ZEDBOARD > head/sys/conf/NOTES > head/sys/conf/files > head/sys/conf/options > head/sys/dev/random/ivy.c > head/sys/dev/random/nehemiah.c > head/sys/dev/random/probe.c > head/sys/dev/random/randomdev.c > head/sys/dev/random/randomdev.h > head/sys/dev/random/randomdev_soft.c > head/sys/dev/random/randomdev_soft.h > head/sys/dev/random/yarrow.c > head/sys/i386/conf/GENERIC > head/sys/i386/conf/XBOX > head/sys/i386/conf/XEN > head/sys/ia64/conf/GENERIC > head/sys/mips/conf/AR71XX_BASE > head/sys/mips/conf/AR724X_BASE > head/sys/mips/conf/AR91XX_BASE > head/sys/mips/conf/AR933X_BASE > head/sys/mips/conf/BERI_TEMPLATE > head/sys/mips/conf/DIR-825 > head/sys/mips/conf/GXEMUL > head/sys/mips/conf/OCTEON1 > head/sys/mips/conf/PB92 > head/sys/mips/conf/RT305X > head/sys/mips/conf/XLR64 > head/sys/mips/conf/XLRN32 > head/sys/mips/conf/std.SWARM > head/sys/mips/conf/std.XLP > head/sys/modules/Makefile > head/sys/modules/random/Makefile > head/sys/pc98/conf/GENERIC > head/sys/powerpc/conf/GENERIC > head/sys/powerpc/conf/GENERIC64 > head/sys/powerpc/conf/MPC85XX > head/sys/powerpc/conf/WII > head/sys/sparc64/conf/GENERIC > head/tools/tools/sysdoc/sysdoc.sh > head/tools/tools/sysdoc/tunables.mdoc >=20 > Modified: head/UPDATING > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/UPDATING Mon Jul 29 19:50:30 2013 (r253778) > +++ head/UPDATING Mon Jul 29 20:26:27 2013 (r253779) > @@ -31,6 +31,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 > disable the most expensive debugging functionality run > "ln -s 'abort:false,junk:false' /etc/malloc.conf".) >=20 > +20130729: > + random(4) and actual RNG implementations (aka, adaptors) have = been > + further decoupled. If you are running a custom kernel, you may > + need to explicitly enable at least one RNG adaptor in your = kernel > + config. For example, to use Yarrow, add "options YARROW_RNG" to > + your kernel config. For hardware backed RNGs, use either > + "RDRAND_RNG" or "PADLOCK_RNG" options. > + If you use random.ko via 'random_load=3D"YES"' in = /boot/loader.conf > + instead of "device random", you will need to change that to > + 'yarrow_rng_load=3D"YES"', 'rdrand_rng_load=3D"YES"', or > + 'padlock_rng_load=3D"YES"'. random.ko will be loaded = automatically > + as a dependency module. > + > 20130726: > Behavior of devfs rules path matching has been changed. > Pattern is now always matched against fully qualified devfs >=20 > Modified: head/share/man/man4/random.4 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/share/man/man4/random.4 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/share/man/man4/random.4 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -23,7 +23,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd September 7, 2012 > +.Dd July 29, 2013 > .Dt RANDOM 4 > .Os > .Sh NAME > @@ -43,6 +43,13 @@ The device will probe for > certain hardware entropy sources, > and use these in preference to the fallback, > which is a generator implemented in software. > +If the kernel environment MIB's > +.Va hw.nehemiah_rng_enable > +or > +.Va hw.ivy_rng_enable > +are set to > +.Dq Li 0 , > +the associated hardware entropy source will be ignored. > .Pp > If the device is using > the software generator, > @@ -74,6 +81,7 @@ device, use the command line: > .Pp > which results in something like: > .Bd -literal -offset indent > +kern.random.adaptors: yarrow > kern.random.sys.seeded: 1 > kern.random.sys.harvest.ethernet: 1 > kern.random.sys.harvest.point_to_point: 1 > @@ -89,7 +97,9 @@ kern.random.yarrow.slowoverthresh: 2 > (These would not be seen if a > hardware generator is present.) > .Pp > -All settings are read/write. > +Other than > +.Dl kern.random.adaptors > +all settings are read/write. > .Pp > The > .Va kern.random.sys.seeded >=20 > Modified: head/sys/amd64/conf/GENERIC > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/amd64/conf/GENERIC Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/amd64/conf/GENERIC Mon Jul 29 20:26:27 2013 = (r253779) > @@ -295,6 +295,7 @@ device loop # Network = loopback > device random # Entropy device > options PADLOCK_RNG # VIA Padlock RNG > options RDRAND_RNG # Intel Bull Mountain RNG > +options YARROW_RNG # Yarrow software RNG > device ether # Ethernet support > device vlan # 802.1Q VLAN support > device tun # Packet tunnel. >=20 > Modified: head/sys/arm/conf/AC100 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/AC100 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/AC100 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -61,6 +61,7 @@ options MUTEX_DEBUG >=20 > # Pseudo devices > device random > +options YARROW_RNG # Yarrow software RNG > device pty > device loop > device md >=20 > Modified: head/sys/arm/conf/ARMADAXP > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/ARMADAXP Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/ARMADAXP Mon Jul 29 20:26:27 2013 = (r253779) > @@ -61,6 +61,7 @@ options KDB_TRACE >=20 > # Pseudo devices > device random > +options YARROW_RNG # Yarrow software RNG > device pty > device loop > device md >=20 > Modified: head/sys/arm/conf/ARNDALE > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/ARNDALE Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/ARNDALE Mon Jul 29 20:26:27 2013 = (r253779) > @@ -88,6 +88,7 @@ options ROOTDEVNAME=3D\"ufs:/dev/da0\" >=20 > device loop > device random > +options YARROW_RNG # Yarrow software RNG > device pty > device md > device gpio >=20 > Modified: head/sys/arm/conf/ATMEL > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/ATMEL Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/ATMEL Mon Jul 29 20:26:27 2013 = (r253779) > @@ -134,6 +134,7 @@ device geom_map # GEOM partition = mappin > # Pseudo devices. > device loop # Network loopback > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG > device ether # Ethernet support > device vlan # 802.1Q VLAN support > device tun # Packet tunnel. >=20 > Modified: head/sys/arm/conf/AVILA > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/AVILA Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/AVILA Mon Jul 29 20:26:27 2013 = (r253779) > @@ -107,6 +107,7 @@ device if_bridge >=20 > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > # Wireless NIC cards > device wlan # 802.11 support >=20 > Modified: head/sys/arm/conf/BEAGLEBONE > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/BEAGLEBONE Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/BEAGLEBONE Mon Jul 29 20:26:27 2013 = (r253779) > @@ -90,6 +90,7 @@ device pty > device snp > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > # I2C support > device iicbus >=20 > Modified: head/sys/arm/conf/BWCT > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/BWCT Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/BWCT Mon Jul 29 20:26:27 2013 = (r253779) > @@ -68,6 +68,7 @@ options NO_FFS_SNAPSHOT > options NO_SWAPPING > device loop > device random > +options YARROW_RNG # Yarrow software RNG > device ether > device vlan > device uart >=20 > Modified: head/sys/arm/conf/CAMBRIA > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/CAMBRIA Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/CAMBRIA Mon Jul 29 20:26:27 2013 = (r253779) > @@ -110,6 +110,7 @@ device if_bridge >=20 > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > # Wireless NIC cards > device wlan # 802.11 support >=20 > Modified: head/sys/arm/conf/CNS11XXNAS > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/CNS11XXNAS Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/CNS11XXNAS Mon Jul 29 20:26:27 2013 = (r253779) > @@ -102,6 +102,7 @@ device loop >=20 > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > #options ARM_USE_SMALL_ALLOC >=20 >=20 > Modified: head/sys/arm/conf/CRB > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/CRB Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/CRB Mon Jul 29 20:26:27 2013 = (r253779) > @@ -105,6 +105,7 @@ options DDB #Enable the = kernel debugg > options XSCALE_CACHE_READ_WRITE_ALLOCATE > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > device iopwdog > options ARM_USE_SMALL_ALLOC >=20 > Modified: head/sys/arm/conf/CUBIEBOARD > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/CUBIEBOARD Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/CUBIEBOARD Mon Jul 29 20:26:27 2013 = (r253779) > @@ -92,6 +92,7 @@ device pty > device snp > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > # I2C support > #device iicbus > @@ -130,4 +131,3 @@ device miibus > options FDT > options FDT_DTB_STATIC > makeoptions FDT_DTS_FILE=3Dcubieboard.dts > - >=20 > Modified: head/sys/arm/conf/DB-78XXX > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/DB-78XXX Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/DB-78XXX Mon Jul 29 20:26:27 2013 = (r253779) > @@ -55,6 +55,7 @@ device pci > device loop > device md > device random > +options YARROW_RNG # Yarrow software RNG >=20 > # Serial ports > device uart >=20 > Modified: head/sys/arm/conf/DB-88F5XXX > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/DB-88F5XXX Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/DB-88F5XXX Mon Jul 29 20:26:27 2013 = (r253779) > @@ -54,6 +54,7 @@ device pci > device md > device loop > device random > +options YARROW_RNG # Yarrow software RNG >=20 > # Serial ports > device uart >=20 > Modified: head/sys/arm/conf/DB-88F6XXX > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/DB-88F6XXX Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/DB-88F6XXX Mon Jul 29 20:26:27 2013 = (r253779) > @@ -55,6 +55,7 @@ device pci > device loop > device md > device random > +options YARROW_RNG # Yarrow software RNG >=20 > # Serial ports > device uart >=20 > Modified: head/sys/arm/conf/DOCKSTAR > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/DOCKSTAR Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/DOCKSTAR Mon Jul 29 20:26:27 2013 = (r253779) > @@ -46,6 +46,7 @@ options KDB > # Pseudo devices > device md > device random > +options YARROW_RNG # Yarrow software RNG > device loop >=20 > # Serial ports >=20 > Modified: head/sys/arm/conf/DREAMPLUG-1001 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/DREAMPLUG-1001 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/DREAMPLUG-1001 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -62,6 +62,7 @@ device loop #Network = loopback > device md #Memory/malloc disk > device pty #BSD-style compatibility = pseudo ttys > device random #Entropy device > +options YARROW_RNG # Yarrow software RNG > device tun #Packet tunnel. > device ether #Required for all = ethernet devices > device vlan #802.1Q VLAN support >=20 > Modified: head/sys/arm/conf/EA3250 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/EA3250 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/EA3250 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -54,6 +54,7 @@ device loop > device md > device pty > device random > +options YARROW_RNG # Yarrow software RNG >=20 > # Serial ports > device uart >=20 > Modified: head/sys/arm/conf/EB9200 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/EB9200 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/EB9200 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -60,6 +60,7 @@ options SX_NOINLINE > options NO_FFS_SNAPSHOT > options NO_SWAPPING > device random > +options YARROW_RNG # Yarrow software RNG > device loop > device ether > device uart >=20 > Modified: head/sys/arm/conf/EFIKA_MX > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/EFIKA_MX Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/EFIKA_MX Mon Jul 29 20:26:27 2013 = (r253779) > @@ -96,6 +96,7 @@ device bpf # Berkeley = packet filter > # Pseudo devices. > device loop # Network loopback > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG > device ether # Ethernet support > #device vlan # 802.1Q VLAN support > #device tun # Packet tunnel. >=20 > Modified: head/sys/arm/conf/EP80219 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/EP80219 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/EP80219 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -101,6 +101,7 @@ options DDB #Enable the = kernel debugg > options XSCALE_CACHE_READ_WRITE_ALLOCATE > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > options ARM_USE_SMALL_ALLOC > # Floppy drives >=20 > Modified: head/sys/arm/conf/ETHERNUT5 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/ETHERNUT5 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/ETHERNUT5 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -126,6 +126,7 @@ device geom_map # GEOM partition = mappin > # Pseudo devices. > device loop # Network loopback > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG > device ether # Ethernet support > #device vlan # 802.1Q VLAN support > #device tun # Packet tunnel. >=20 > Modified: head/sys/arm/conf/GUMSTIX > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/GUMSTIX Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/GUMSTIX Mon Jul 29 20:26:27 2013 = (r253779) > @@ -88,3 +88,4 @@ options DDB #Enable the = kernel debugg >=20 > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > Modified: head/sys/arm/conf/HL200 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/HL200 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/HL200 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -65,6 +65,7 @@ options RWLOCK_NOINLINE > options NO_FFS_SNAPSHOT > options NO_SWAPPING > device random > +options YARROW_RNG # Yarrow software RNG > device loop > device ether > device uart >=20 > Modified: head/sys/arm/conf/HL201 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/HL201 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/HL201 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -67,6 +67,7 @@ options RWLOCK_NOINLINE > options NO_FFS_SNAPSHOT > options NO_SWAPPING > device random > +options YARROW_RNG # Yarrow software RNG > device loop > device ether > device uart > @@ -129,4 +130,3 @@ device pass # Passthrough = device (dire > #device wlan_tkip # 802.11 TKIP support > #device wlan_amrr # AMRR transmit rate control = algorithm > options ROOTDEVNAME=3D\"ufs:da0s1a\" > - >=20 > Modified: head/sys/arm/conf/IQ31244 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/IQ31244 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/IQ31244 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -106,6 +106,7 @@ options DDB #Enable the = kernel debugg > options XSCALE_CACHE_READ_WRITE_ALLOCATE > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > options ARM_USE_SMALL_ALLOC > # Floppy drives >=20 > Modified: head/sys/arm/conf/KB920X > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/KB920X Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/KB920X Mon Jul 29 20:26:27 2013 = (r253779) > @@ -66,6 +66,7 @@ options SX_NOINLINE > options NO_FFS_SNAPSHOT > options NO_SWAPPING > device random > +options YARROW_RNG # Yarrow software RNG > device loop > device ether > device uart >=20 > Modified: head/sys/arm/conf/LN2410SBC > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/LN2410SBC Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/LN2410SBC Mon Jul 29 20:26:27 2013 = (r253779) > @@ -62,6 +62,7 @@ options SX_NOINLINE > options NO_FFS_SNAPSHOT > options NO_SWAPPING > device random > +options YARROW_RNG # Yarrow software RNG >=20 > device loop > device ether > @@ -83,4 +84,3 @@ device ohci > device umass > device scbus # SCSI bus (required for da) > device da # Direct Access (disks) > - >=20 > Modified: head/sys/arm/conf/NSLU > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/NSLU Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/NSLU Mon Jul 29 20:26:27 2013 = (r253779) > @@ -105,6 +105,7 @@ device loop >=20 > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > #options ARM_USE_SMALL_ALLOC >=20 >=20 > Modified: head/sys/arm/conf/PANDABOARD > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/PANDABOARD Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/PANDABOARD Mon Jul 29 20:26:27 2013 = (r253779) > @@ -110,6 +110,7 @@ device md > #options MD_ROOT_SIZE=3D7560 >=20 > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > # USB support > device usb >=20 > Modified: head/sys/arm/conf/QILA9G20 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/QILA9G20 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/QILA9G20 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -77,6 +77,7 @@ options NO_SWAPPING > #options DIAGNOSTIC >=20 > device random > +options YARROW_RNG # Yarrow software RNG > device loop > device bpf > device ether >=20 > Modified: head/sys/arm/conf/RPI-B > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/RPI-B Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/RPI-B Mon Jul 29 20:26:27 2013 = (r253779) > @@ -86,6 +86,7 @@ options INVARIANT_SUPPORT #Extra sanity >=20 > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > # USB support > device usb >=20 > Modified: head/sys/arm/conf/SAM9260EK > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/SAM9260EK Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/SAM9260EK Mon Jul 29 20:26:27 2013 = (r253779) > @@ -134,6 +134,7 @@ device mmcsd # MMC/SD memory = card > # Pseudo devices. > device loop # Network loopback > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG > device ether # Ethernet support > #device vlan # 802.1Q VLAN support > #device tun # Packet tunnel. >=20 > Modified: head/sys/arm/conf/SAM9G20EK > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/SAM9G20EK Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/SAM9G20EK Mon Jul 29 20:26:27 2013 = (r253779) > @@ -76,6 +76,7 @@ options NO_SWAPPING > #options DIAGNOSTIC >=20 > device random > +options YARROW_RNG # Yarrow software RNG > device loop > device bpf > device ether >=20 > Modified: head/sys/arm/conf/SAM9X25EK > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/SAM9X25EK Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/SAM9X25EK Mon Jul 29 20:26:27 2013 = (r253779) > @@ -77,6 +77,7 @@ options NO_SWAPPING > #options DIAGNOSTIC >=20 > device random > +options YARROW_RNG # Yarrow software RNG > device pty > device loop > device bpf > @@ -150,4 +151,3 @@ device miibus > #device wlan_ccmp # 802.11 CCMP support > #device wlan_tkip # 802.11 TKIP support > #device wlan_amrr # AMRR transmit rate control = algorithm > - >=20 > Modified: head/sys/arm/conf/SHEEVAPLUG > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/SHEEVAPLUG Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/SHEEVAPLUG Mon Jul 29 20:26:27 2013 = (r253779) > @@ -45,6 +45,7 @@ options KDB >=20 > # Pseudo devices > device random > +options YARROW_RNG # Yarrow software RNG > device loop >=20 > # Serial ports >=20 > Modified: head/sys/arm/conf/SN9G45 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/SN9G45 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/SN9G45 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -76,6 +76,7 @@ options NO_SWAPPING > #options DIAGNOSTIC >=20 > device random > +options YARROW_RNG # Yarrow software RNG > device loop > device bpf > device ether >=20 > Modified: head/sys/arm/conf/TS7800 > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/TS7800 Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/TS7800 Mon Jul 29 20:26:27 2013 = (r253779) > @@ -48,6 +48,7 @@ device pci > device md > device loop > device random > +options YARROW_RNG # Yarrow software RNG >=20 > # Serial ports > device uart >=20 > Modified: head/sys/arm/conf/VERSATILEPB > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/VERSATILEPB Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/VERSATILEPB Mon Jul 29 20:26:27 2013 = (r253779) > @@ -94,6 +94,7 @@ options INVARIANT_SUPPORT #Extra sanity >=20 > device md > device random # Entropy device > +options YARROW_RNG # Yarrow software RNG >=20 > # Flattened Device Tree > options FDT >=20 > Modified: head/sys/arm/conf/ZEDBOARD > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/arm/conf/ZEDBOARD Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/arm/conf/ZEDBOARD Mon Jul 29 20:26:27 2013 = (r253779) > @@ -66,6 +66,7 @@ options KDB >=20 > device loop > device random > +options YARROW_RNG # Yarrow software RNG > device ether > device if_cgem # Zynq-7000 gig ethernet = device > device mii >=20 > Modified: head/sys/conf/NOTES > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/conf/NOTES Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/conf/NOTES Mon Jul 29 20:26:27 2013 = (r253779) > @@ -1132,6 +1132,9 @@ options VFS_AIO > # Cryptographically secure random number generator; /dev/random > device random >=20 > +# Yarrow software RNG adapter for random > +options YARROW_RNG > + > # The system memory devices; /dev/mem, /dev/kmem > device mem >=20 >=20 > Modified: head/sys/conf/files > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/conf/files Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/conf/files Mon Jul 29 20:26:27 2013 = (r253779) > @@ -540,8 +540,8 @@ crypto/des/des_ecb.c optional crypto = |=20 > crypto/des/des_setkey.c optional crypto | ipsec | netsmb > crypto/rc4/rc4.c optional netgraph_mppc_encryption | = kgssapi > crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \ > - ipsec | random | wlan_ccmp > -crypto/rijndael/rijndael-api-fst.c optional geom_bde | random > + ipsec | yarrow_rng | wlan_ccmp > +crypto/rijndael/rijndael-api-fst.c optional geom_bde | yarrow_rng > crypto/rijndael/rijndael-api.c optional crypto | ipsec | = wlan_ccmp > crypto/sha1.c optional carp | crypto | ipsec | \ > netgraph_mppc_encryption | sctp > @@ -2030,11 +2030,12 @@ rt2860.fw optional = rt2860fw | ralfw \ > no-obj no-implicit-rule = \ > clean "rt2860.fw" > dev/random/harvest.c standard > -dev/random/hash.c optional random > +dev/random/hash.c optional yarrow_rng > dev/random/probe.c optional random > +dev/random/random_adaptors.c standard > dev/random/randomdev.c optional random > -dev/random/randomdev_soft.c optional random > -dev/random/yarrow.c optional random > +dev/random/randomdev_soft.c optional yarrow_rng > +dev/random/yarrow.c optional yarrow_rng > dev/rc/rc.c optional rc > dev/re/if_re.c optional re > dev/rndtest/rndtest.c optional rndtest >=20 > Modified: head/sys/conf/options > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/conf/options Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/conf/options Mon Jul 29 20:26:27 2013 = (r253779) > @@ -905,3 +905,6 @@ RACCT opt_global.h >=20 > # Resource Limits > RCTL opt_global.h > + > +# Software random number generators for random(4) > +YARROW_RNG opt_dontuse.h >=20 > Modified: head/sys/dev/random/ivy.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/random/ivy.c Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/dev/random/ivy.c Mon Jul 29 20:26:27 2013 = (r253779) > @@ -28,16 +28,19 @@ > #include <sys/cdefs.h> > __FBSDID("$FreeBSD$"); >=20 > -#include "opt_cpu.h" > - > -#ifdef RDRAND_RNG > - > #include <sys/param.h> > #include <sys/time.h> > +#include <sys/kernel.h> > #include <sys/lock.h> > +#include <sys/module.h> > #include <sys/mutex.h> > #include <sys/selinfo.h> > #include <sys/systm.h> > + > +#include <machine/md_var.h> > +#include <machine/specialreg.h> > + > +#include <dev/random/random_adaptors.h> > #include <dev/random/randomdev.h> >=20 > #define RETRY_COUNT 10 > @@ -46,7 +49,7 @@ static void random_ivy_init(void); > static void random_ivy_deinit(void); > static int random_ivy_read(void *, int); >=20 > -struct random_systat random_ivy =3D { > +struct random_adaptor random_ivy =3D { > .ident =3D "Hardware, Intel IvyBridge+ RNG", > .init =3D random_ivy_init, > .deinit =3D random_ivy_deinit, > @@ -114,4 +117,32 @@ random_ivy_read(void *buf, int c) > return (c - count); > } >=20 > +static int > +rdrand_modevent(module_t mod, int type, void *unused) > +{ > + > + switch (type) { > + case MOD_LOAD: > + if (cpu_feature2 & CPUID2_RDRAND) { > + random_adaptor_register("rdrand", &random_ivy); > + EVENTHANDLER_INVOKE(random_adaptor_attach, = &random_ivy); > + return (0); > + } else { > +#ifndef KLD_MODULE > + if (bootverbose) > #endif > + printf( > + "%s: RDRAND feature is not present on this = CPU\n", > + random_ivy.ident); > +#ifdef KLD_MODULE > + return (ENXIO); > +#else > + return (0); > +#endif > + } > + } > + > + return (EINVAL); > +} > + > +RANDOM_ADAPTOR_MODULE(random_rdrand, rdrand_modevent, 1); >=20 > Modified: head/sys/dev/random/nehemiah.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/random/nehemiah.c Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/dev/random/nehemiah.c Mon Jul 29 20:26:27 2013 = (r253779) > @@ -28,19 +28,20 @@ > #include <sys/cdefs.h> > __FBSDID("$FreeBSD$"); >=20 > -#include "opt_cpu.h" > - > -#ifdef PADLOCK_RNG > - > #include <sys/param.h> > #include <sys/time.h> > #include <sys/lock.h> > #include <sys/mutex.h> > +#include <sys/module.h> > #include <sys/selinfo.h> > #include <sys/systm.h> > +#include <sys/kernel.h> >=20 > #include <machine/pcb.h> > +#include <machine/md_var.h> > +#include <machine/specialreg.h> >=20 > +#include <dev/random/random_adaptors.h> > #include <dev/random/randomdev.h> >=20 > #define RANDOM_BLOCK_SIZE 256 > @@ -50,7 +51,7 @@ static void random_nehemiah_init(void); > static void random_nehemiah_deinit(void); > static int random_nehemiah_read(void *, int); >=20 > -struct random_systat random_nehemiah =3D { > +struct random_adaptor random_nehemiah =3D { > .ident =3D "Hardware, VIA Nehemiah", > .init =3D random_nehemiah_init, > .deinit =3D random_nehemiah_deinit, > @@ -208,4 +209,33 @@ random_nehemiah_read(void *buf, int c) > return (c); > } >=20 > +static int > +nehemiah_modevent(module_t mod, int type, void *unused) > +{ > + > + switch (type) { > + case MOD_LOAD: > + if (via_feature_rng & VIA_HAS_RNG) { > + random_adaptor_register("nehemiah", = &random_nehemiah); > + EVENTHANDLER_INVOKE(random_adaptor_attach, > + &random_nehemiah); > + return (0); > + } else { > +#ifndef KLD_MODULE > + if (bootverbose) > #endif > + printf( > + "%s: VIA RNG feature is not present on this = CPU\n", > + random_nehemiah.ident); > +#ifdef KLD_MODULE > + return (ENXIO); > +#else > + return (0); > +#endif > + } > + } > + > + return (EINVAL); > +} > + > +RANDOM_ADAPTOR_MODULE(nehemiah, nehemiah_modevent, 1); >=20 > Modified: head/sys/dev/random/probe.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/random/probe.c Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/dev/random/probe.c Mon Jul 29 20:26:27 2013 = (r253779) > @@ -28,66 +28,35 @@ > #include <sys/cdefs.h> > __FBSDID("$FreeBSD$"); >=20 > -#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) > +#if defined(__amd64__) || defined(__i386__) > #include "opt_cpu.h" > #endif >=20 > -#include <sys/types.h> > #include <sys/param.h> > #include <sys/systm.h> > #include <sys/kernel.h> > -#include <sys/malloc.h> > -#include <sys/random.h> > #include <sys/selinfo.h> > -#include <sys/sysctl.h> > - > -#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) > -#include <machine/cpufunc.h> > -#include <machine/cputypes.h> > -#include <machine/md_var.h> > -#include <machine/specialreg.h> > -#endif >=20 > +#include <dev/random/random_adaptors.h> > #include <dev/random/randomdev.h> > -#include <dev/random/randomdev_soft.h> > - > -#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) > -#ifdef PADLOCK_RNG > -extern struct random_systat random_nehemiah; > -#endif > -#ifdef RDRAND_RNG > -extern struct random_systat random_ivy; > -#endif > -#endif >=20 > void > -random_ident_hardware(struct random_systat **systat) > +random_ident_hardware(struct random_adaptor **adaptor) > { > + struct random_adaptor *tmp; > + int enable; >=20 > - /* Set default to software */ > - *systat =3D &random_yarrow; > + /* Set default to software (yarrow) */ > + *adaptor =3D random_adaptor_get("yarrow"); >=20 > /* Then go looking for hardware */ > -#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) > -#ifdef PADLOCK_RNG > - if (via_feature_rng & VIA_HAS_RNG) { > - int enable; > - > - enable =3D 1; > - TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable); > - if (enable) > - *systat =3D &random_nehemiah; > - } > -#endif > -#ifdef RDRAND_RNG > - if (cpu_feature2 & CPUID2_RDRAND) { > - int enable; > - > - enable =3D 1; > - TUNABLE_INT_FETCH("hw.ivy_rng_enable", &enable); > - if (enable) > - *systat =3D &random_ivy; > - } > -#endif > -#endif > + enable =3D 1; > + TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable); > + if (enable && (tmp =3D random_adaptor_get("nehemiah"))) > + *adaptor =3D tmp; > + > + enable =3D 1; > + TUNABLE_INT_FETCH("hw.ivy_rng_enable", &enable); > + if (enable && (tmp =3D random_adaptor_get("rdrand"))) > + *adaptor =3D tmp; > } >=20 > Modified: head/sys/dev/random/randomdev.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/random/randomdev.c Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/dev/random/randomdev.c Mon Jul 29 20:26:27 2013 = (r253779) > @@ -70,12 +70,15 @@ static struct cdevsw random_cdevsw =3D { > .d_name =3D "random", > }; >=20 > -struct random_systat *random_systat; > +static struct random_adaptor *random_adaptor; > +static eventhandler_tag attach_tag; > +static int random_inited; > + >=20 > /* For use with make_dev(9)/destroy_dev(9). */ > static struct cdev *random_dev; >=20 > -/* Used to fake out unused random calls in random_systat */ > +/* Used to fake out unused random calls in random_adaptor */ > void > random_null_func(void) > { > @@ -88,8 +91,8 @@ random_close(struct cdev *dev __unused,=20 > { > if ((flags & FWRITE) && (priv_check(td, PRIV_RANDOM_RESEED) =3D=3D= 0) > && (securelevel_gt(td->td_ucred, 0) =3D=3D 0)) { > - (*random_systat->reseed)(); > - random_systat->seeded =3D 1; > + (*random_adaptor->reseed)(); > + random_adaptor->seeded =3D 1; > arc4rand(NULL, 0, 1); /* Reseed arc4random as well. */ > } >=20 > @@ -104,8 +107,8 @@ random_read(struct cdev *dev __unused, s > void *random_buf; >=20 > /* Blocking logic */ > - if (!random_systat->seeded) > - error =3D (*random_systat->block)(flag); > + if (!random_adaptor->seeded) > + error =3D (*random_adaptor->block)(flag); >=20 > /* The actual read */ > if (!error) { > @@ -114,7 +117,7 @@ random_read(struct cdev *dev __unused, s >=20 > while (uio->uio_resid > 0 && !error) { > c =3D MIN(uio->uio_resid, PAGE_SIZE); > - c =3D (*random_systat->read)(random_buf, c); > + c =3D (*random_adaptor->read)(random_buf, c); > error =3D uiomove(random_buf, c, uio); > } >=20 > @@ -139,7 +142,7 @@ random_write(struct cdev *dev __unused,=20 > error =3D uiomove(random_buf, c, uio); > if (error) > break; > - (*random_systat->write)(random_buf, c); > + (*random_adaptor->write)(random_buf, c); > } >=20 > free(random_buf, M_TEMP); > @@ -172,14 +175,37 @@ random_poll(struct cdev *dev __unused, i > int revents =3D 0; >=20 > if (events & (POLLIN | POLLRDNORM)) { > - if (random_systat->seeded) > + if (random_adaptor->seeded) > revents =3D events & (POLLIN | POLLRDNORM); > else > - revents =3D (*random_systat->poll) (events,td); > + revents =3D (*random_adaptor->poll) (events,td); > } > return (revents); > } >=20 > +static void > +random_initialize(void *p, struct random_adaptor *s) > +{ > + if (random_inited) { > + printf("random: <%s> already initialized\n", > + random_adaptor->ident); > + return; > + } > + > + random_adaptor =3D s; > + > + (s->init)(); > + > + printf("random: <%s> initialized\n", s->ident); > + > + random_dev =3D make_dev_credf(MAKEDEV_ETERNAL_KLD, = &random_cdevsw, > + RANDOM_MINOR, NULL, UID_ROOT, GID_WHEEL, 0666, "random"); > + make_dev_alias(random_dev, "urandom"); /* XXX Deprecated */ > + > + /* mark random(4) as initialized, to avoid being called again */ > + random_inited =3D 1; > +} > + > /* ARGSUSED */ > static int > random_modevent(module_t mod __unused, int type, void *data __unused) > @@ -188,23 +214,29 @@ random_modevent(module_t mod __unused, i >=20 > switch (type) { > case MOD_LOAD: > - random_ident_hardware(&random_systat); > - (*random_systat->init)(); > + random_ident_hardware(&random_adaptor); >=20 > - if (bootverbose) > - printf("random: <entropy source, %s>\n", > - random_systat->ident); > - > - random_dev =3D make_dev_credf(MAKEDEV_ETERNAL_KLD, = &random_cdevsw, > - RANDOM_MINOR, NULL, UID_ROOT, GID_WHEEL, 0666, = "random"); > - make_dev_alias(random_dev, "urandom"); /* XXX = Deprecated */ > + if (random_adaptor =3D=3D NULL) { > + printf( > + "random: No random adaptor attached, postponing = initialization\n"); > + attach_tag =3D = EVENTHANDLER_REGISTER(random_adaptor_attach, > + random_initialize, NULL, = EVENTHANDLER_PRI_ANY); > + } else { > + random_initialize(NULL, random_adaptor); > + } >=20 > break; >=20 > case MOD_UNLOAD: > - (*random_systat->deinit)(); > - > - destroy_dev(random_dev); > + if (random_adaptor !=3D NULL) { > + (*random_adaptor->deinit)(); > + destroy_dev(random_dev); > + } > + /* Unregister the event handler */ > + if (attach_tag !=3D NULL) { > + EVENTHANDLER_DEREGISTER(random_adaptor_attach, > + attach_tag); > + } >=20 > break; >=20 >=20 > Modified: head/sys/dev/random/randomdev.h > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/random/randomdev.h Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/dev/random/randomdev.h Mon Jul 29 20:26:27 2013 = (r253779) > @@ -38,7 +38,7 @@ typedef void random_write_func_t(void *, > typedef int random_poll_func_t(int, struct thread *); > typedef void random_reseed_func_t(void); >=20 > -struct random_systat { > +struct random_adaptor { > struct selinfo rsel; > const char *ident; > int seeded; > @@ -51,7 +51,5 @@ struct random_systat { > random_reseed_func_t *reseed; > }; >=20 > -extern struct random_systat *random_systat; > - > -extern void random_ident_hardware(struct random_systat **); > +extern void random_ident_hardware(struct random_adaptor **); > extern void random_null_func(void); >=20 > Modified: head/sys/dev/random/randomdev_soft.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/dev/random/randomdev_soft.c Mon Jul 29 19:50:30 2013 = (r253778) > +++ head/sys/dev/random/randomdev_soft.c Mon Jul 29 20:26:27 2013 = (r253779) > @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); > #include <sys/kthread.h> > #include <sys/lock.h> > #include <sys/malloc.h> > +#include <sys/module.h> > #include <sys/mutex.h> > #include <sys/poll.h> > #include <sys/proc.h> > @@ -50,6 +51,7 @@ __FBSDID("$FreeBSD$"); > #include <machine/bus.h> > #include <machine/cpu.h> >=20 > +#include <dev/random/random_adaptors.h> > #include <dev/random/randomdev.h> > #include <dev/random/randomdev_soft.h> >=20 > @@ -63,7 +65,7 @@ static int random_yarrow_poll(int event, > static int random_yarrow_block(int flag); > static void random_yarrow_flush_reseed(void); >=20 > -struct random_systat random_yarrow =3D { > +struct random_adaptor random_yarrow =3D { > .ident =3D "Software, Yarrow", > .init =3D random_yarrow_init, > .deinit =3D random_yarrow_deinit, > @@ -103,7 +105,7 @@ static int random_kthread_control =3D 0; > static struct proc *random_kthread_proc; >=20 > /* List for the dynamic sysctls */ > -struct sysctl_ctx_list random_clist; > +static struct sysctl_ctx_list random_clist; >=20 > /* ARGSUSED */ > static int > @@ -120,25 +122,20 @@ random_yarrow_init(void) > { > int error, i; > struct harvest *np; > - struct sysctl_oid *random_o, *random_sys_o, = *random_sys_harvest_o; > + struct sysctl_oid *random_sys_o, *random_sys_harvest_o; > enum esource e; >=20 > - random_o =3D SYSCTL_ADD_NODE(&random_clist, > - SYSCTL_STATIC_CHILDREN(_kern), > - OID_AUTO, "random", CTLFLAG_RW, 0, > - "Software Random Number Generator"); > - > - random_yarrow_init_alg(&random_clist, random_o); > + random_yarrow_init_alg(&random_clist); >=20 > random_sys_o =3D SYSCTL_ADD_NODE(&random_clist, > - SYSCTL_CHILDREN(random_o), > + SYSCTL_STATIC_CHILDREN(_kern_random), > OID_AUTO, "sys", CTLFLAG_RW, 0, > "Entropy Device Parameters"); >=20 > SYSCTL_ADD_PROC(&random_clist, > SYSCTL_CHILDREN(random_sys_o), > OID_AUTO, "seeded", CTLTYPE_INT | CTLFLAG_RW, > - &random_systat->seeded, 1, random_check_boolean, "I", > + &random_yarrow.seeded, 1, random_check_boolean, "I", > "Seeded State"); >=20 > random_sys_harvest_o =3D SYSCTL_ADD_NODE(&random_clist, > @@ -362,10 +359,10 @@ random_yarrow_write(void *buf, int count > void > random_yarrow_unblock(void) > { > - if (!random_systat->seeded) { > - random_systat->seeded =3D 1; > - selwakeuppri(&random_systat->rsel, PUSER); > - wakeup(random_systat); > + if (!random_yarrow.seeded) { > + random_yarrow.seeded =3D 1; > + selwakeuppri(&random_yarrow.rsel, PUSER); > + wakeup(&random_yarrow); > } > (void)atomic_cmpset_int(&arc4rand_iniseed_state, ARC4_ENTR_NONE, > ARC4_ENTR_HAVE); > @@ -377,10 +374,10 @@ random_yarrow_poll(int events, struct th >=20 > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** --Apple-Mail=_E0AA719C-1150-414D-968A-113B19AA18EA Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIEozCCBJ8w ggOHoAMCAQICCnDGsUgWa/KQbDEwDQYJKoZIhvcNAQEFBQAwgZExCzAJBgNVBAYTAkZSMQ0wCwYD VQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNjcTEuMCwGA1UEChMlTkVUQVNRIC0g U2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxMeTkVUQVNRIENlcnRpZmljYXRp b24gQXV0aG9yaXR5MB4XDTEzMDEyODA4MzIxNloXDTE0MDEyODA4MzIxNlowgdIxCzAJBgNVBAYT AkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNjcTEuMCwGA1UEChMl TkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UECxMeTkVUQVNRIENl cnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1GYWJpZW4gVEhPTUFTMScwJQYJKoZIhvcN AQkBFhhmYWJpZW4udGhvbWFzQG5ldGFzcS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK AoIBAQDGPW4/ExE5oultT1iyLXENhI+hSiMCOcV5alYZ9jSvbg51lnJaqrl4iMIKGSOtaKiiiICd WNMZLFviDvf8faW5fwvTy9RRaJoFKrKnSvl0Suy/cImRnGJQIj6587gpxLeeGoXXTKgMaVNWNsjT kh3aikBZy/3RLqiD7bEHMpq8nYtl9czn74DiXu2XQcmeCLVj5xZsj+Se6smKnuM8lkvi/rhUn52S +OkXgHFJwrfd/6OUMOt+aT/rWnsRGVxSsBG8l0p4d+5hHC5Lyt9d1r6gMYOXo6wwprcPzBr46dBA H4edS6pIJ0TmmMCsBbODy/Co0jkputL6e/SchgIQQqljAgMBAAGjgbUwgbIwHQYDVR0OBBYEFDWp SkuB9wp6x//Lis7oxL5I882dMB8GA1UdIwQYMBaAFCcq6x3ZRNo6F3NqCSAgySWo+X+yMAkGA1Ud EwQCMAAwDgYDVR0PAQH/BAQDAgPoMCMGA1UdEQQcMBqBGGZhYmllbi50aG9tYXNAbmV0YXNxLmNv bTARBglghkgBhvhCAQEEBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwQGCCsGAQUFBwMCMA0GCSqG SIb3DQEBBQUAA4IBAQBZ8Uh40v1su4Vpbb/eJzgoILfhCuABDIE7oGS2Aucequ1CD6LSpiu7NFQs pdORJHu5yteRB8Hclz9ADXqUQj2t+HOu93YiJngKUEIom1569ZILH5ocST22/TT5sHp182ZR72T5 JPwjNDIh+RSvOn1rouMBnUiFjRhlMMCjDJRUcmpIFVaiRFF2SesxmI2TX+kOJKBWEnCGEmJPuSpW MDzDF3uD/G/NsxG4CuzM0jL67rs2hX8kFYwgA9qativSyLVBuET8bzkSQcbDieX10uLE0gwKjCO4 GghNJEf2zTy5PoaofSJY85EsQosJJHfEezMsiyAHCeXu700q6XQ1xeEeMYIDkzCCA48CAQEwgaAw gZExCzAJBgNVBAYTAkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQnQXNj cTEuMCwGA1UEChMlTkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUGA1UE CxMeTkVUQVNRIENlcnRpZmljYXRpb24gQXV0aG9yaXR5AgpwxrFIFmvykGwxMAkGBSsOAwIaBQCg ggHHMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTEzMDgwMjA4MDU1 N1owIwYJKoZIhvcNAQkEMRYEFHJwHbGvvqIL6yttC/yGQGRGiuzOMIGxBgkrBgEEAYI3EAQxgaMw gaAwgZExCzAJBgNVBAYTAkZSMQ0wCwYDVQQIEwROb3JkMRowGAYDVQQHExFWaWxsZW5ldXZlIGQn QXNjcTEuMCwGA1UEChMlTkVUQVNRIC0gU2VjdXJlIEludGVybmV0IENvbm5lY3Rpdml0eTEnMCUG A1UECxMeTkVUQVNRIENlcnRpZmljYXRpb24gQXV0aG9yaXR5AgpwxrFIFmvykGwxMIGzBgsqhkiG 9w0BCRACCzGBo6CBoDCBkTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBE5vcmQxGjAYBgNVBAcTEVZp bGxlbmV1dmUgZCdBc2NxMS4wLAYDVQQKEyVORVRBU1EgLSBTZWN1cmUgSW50ZXJuZXQgQ29ubmVj dGl2aXR5MScwJQYDVQQLEx5ORVRBU1EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkCCnDGsUgWa/KQ bDEwDQYJKoZIhvcNAQEBBQAEggEAnQ9yhfoZhNrXbyXeYYbki6h3oQULo34YvzuZg6KWEaFqT458 Dr9Z5TG61KoWt6VZ8FQVTHVbD002dMN0zazIvFV5DYC4i9xiQCBODLIV0QbRGhq8Gm9y1nFhs7Af rDj1zcTkFgriKVotrYsH25g1AnHdR/bjion91hG0Z73A9xmbed1j5Jji6o3UiQB8YIbu7JP0OV/o lHIRTVFsUDc0Z3HpeIyYDnJCsWfx1RAYIlicaIKmIz5w8sr2j7DLPlxWUjLnpP8wF0wJRMOvBPfC +PfFUPcLEMLgyEbp0giG9L8hedehalEq7LOmK0YB5WTTZHfR9/PjZmmjFPPAXOvdgQAAAAAAAA== --Apple-Mail=_E0AA719C-1150-414D-968A-113B19AA18EA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5E61D610-3322-4240-9978-CB277C7161F5>