From owner-svn-src-all@FreeBSD.ORG Sun Sep 8 02:01:52 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E73C6562; Sun, 8 Sep 2013 02:01:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mail0.glenbarber.us (mail0.glenbarber.us [208.86.227.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B7D242103; Sun, 8 Sep 2013 02:01:52 +0000 (UTC) Received: from glenbarber.us (c-71-224-221-174.hsd1.nj.comcast.net [71.224.221.174]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: gjb) by mail0.glenbarber.us (Postfix) with ESMTPSA id C0F6A212D; Sun, 8 Sep 2013 02:01:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us C0F6A212D Authentication-Results: mail0.glenbarber.us; dkim=none reason="no signature"; dkim-adsp=none Date: Sat, 7 Sep 2013 22:01:49 -0400 From: Glen Barber To: Mark Murray Subject: Re: svn commit: r255379 - head/sys/dev/random Message-ID: <20130908020149.GZ77463@glenbarber.us> References: <201309072207.r87M7aEI020346@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rYRijwbmzeJBcrGE" Content-Disposition: inline In-Reply-To: <201309072207.r87M7aEI020346@svn.freebsd.org> X-Operating-System: FreeBSD 10.0-CURRENT amd64 User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 02:01:53 -0000 --rYRijwbmzeJBcrGE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 07, 2013 at 10:07:36PM +0000, Mark Murray wrote: > Author: markm > Date: Sat Sep 7 22:07:36 2013 > New Revision: 255379 > URL: http://svnweb.freebsd.org/changeset/base/255379 >=20 > Log: > Fix the build; Certain linkable symbols need to always be present. > =20 > Pass the pointy hat please. > =20 > Also unblock the software (Yarrow) generator for now. This will be > reverted; Yarrow needs to block until secure, not this behaviour > of serving as soon as asked. > =20 > Folks with specific requiremnts will be able to (can!) unblock this > device with any write, and are encouraged to do so in /etc/rc.d/* > scripting. ("Any" in this case could be "echo '' > /dev/random" as > root). >=20 > Modified: > head/sys/dev/random/pseudo_rng.c > head/sys/dev/random/random_adaptors.c > head/sys/dev/random/random_adaptors.h > head/sys/dev/random/randomdev.c > head/sys/dev/random/randomdev.h > head/sys/dev/random/randomdev_soft.c >=20 > Modified: head/sys/dev/random/pseudo_rng.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/pseudo_rng.c Sat Sep 7 20:52:31 2013 (r255378) > +++ head/sys/dev/random/pseudo_rng.c Sat Sep 7 22:07:36 2013 (r255379) > @@ -39,6 +39,12 @@ __FBSDID("$FreeBSD$"); > =20 > static struct mtx pseudo_random_block_mtx; > =20 > +/* Used to fake out unused random calls in random_adaptor */ > +void > +random_null_func(void) > +{ > +} > + > static int > pseudo_random_block_read(void *buf __unused, int c __unused) > { >=20 > Modified: head/sys/dev/random/random_adaptors.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/random_adaptors.c Sat Sep 7 20:52:31 2013 (r2553= 78) > +++ head/sys/dev/random/random_adaptors.c Sat Sep 7 22:07:36 2013 (r2553= 79) > @@ -53,6 +53,8 @@ static struct sx adaptors_lock; /* need=20 > /* List for the dynamic sysctls */ > static struct sysctl_ctx_list random_clist; > =20 > +struct random_adaptor *random_adaptor; > + > MALLOC_DEFINE(M_RANDOM_ADAPTORS, "random_adaptors", "Random adaptors buf= fers"); > =20 > int > @@ -230,7 +232,7 @@ random_sysctl_active_adaptor_handler(SYS > int error; > =20 > name =3D NULL; > - rsp =3D random_get_active_adaptor(); > + rsp =3D random_adaptor; > =20 > if (rsp !=3D NULL) { > sx_slock(&adaptors_lock); >=20 > Modified: head/sys/dev/random/random_adaptors.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/random_adaptors.h Sat Sep 7 20:52:31 2013 (r2553= 78) > +++ head/sys/dev/random/random_adaptors.h Sat Sep 7 22:07:36 2013 (r2553= 79) > @@ -41,6 +41,8 @@ struct random_adaptor *random_adaptor_ge > int random_adaptor_register(const char *, struct random_adaptor *); > void random_adaptor_choose(struct random_adaptor **); > =20 > +extern struct random_adaptor *random_adaptor; > + > /* > * random_adaptor's should be registered prior to > * random module (SI_SUB_DRIVERS/SI_ORDER_MIDDLE) >=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 Sat Sep 7 20:52:31 2013 (r255378) > +++ head/sys/dev/random/randomdev.c Sat Sep 7 22:07:36 2013 (r255379) > @@ -72,27 +72,12 @@ static struct cdevsw random_cdevsw =3D { > .d_name =3D "random", > }; > =20 > -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_adaptor */ > -void > -random_null_func(void) > -{ > -} > - > -struct random_adaptor * > -random_get_active_adaptor(void) > -{=20 > - > - return (random_adaptor); > -} > - > /* ARGSUSED */ > static int > random_close(struct cdev *dev __unused, int flags, int fmt __unused, >=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 Sat Sep 7 20:52:31 2013 (r255378) > +++ head/sys/dev/random/randomdev.h Sat Sep 7 22:07:36 2013 (r255379) > @@ -53,4 +53,3 @@ struct random_adaptor { > =20 > extern void random_ident_hardware(struct random_adaptor **); > extern void random_null_func(void); > -struct random_adaptor *random_get_active_adaptor(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 Sat Sep 7 20:52:31 2013 (r25537= 8) > +++ head/sys/dev/random/randomdev_soft.c Sat Sep 7 22:07:36 2013 (r25537= 9) > @@ -79,7 +79,7 @@ static struct random_adaptor random_cont > .write =3D randomdev_write, > .poll =3D randomdev_poll, > .reseed =3D randomdev_flush_reseed, > - .seeded =3D 0, > + .seeded =3D 1, > }; > #define RANDOM_MODULE_NAME yarrow > #define RANDOM_CSPRNG_NAME "yarrow" > @@ -95,7 +95,7 @@ static struct random_adaptor random_cont > .write =3D randomdev_write, > .poll =3D randomdev_poll, > .reseed =3D randomdev_flush_reseed, > - .seeded =3D 0, > + .seeded =3D 1, > }; > #define RANDOM_MODULE_NAME fortuna > #define RANDOM_CSPRNG_NAME "fortuna" pseudo_rng.o:(.data+0x3c): undefined reference to `random_null_func' pseudo_rng.o:(.data+0x44): undefined reference to `random_null_func' pseudo_rng.o:(.data+0x74): undefined reference to `random_null_func' pseudo_rng.o:(.data+0x78): undefined reference to `random_null_func' pseudo_rng.o:(.data+0x84): undefined reference to `random_null_func' pseudo_rng.o:(.data+0x8c): more undefined references to `random_null_func' follow random_adaptors.o: In function `random_sysctl_active_adaptor_handler': /src/sys/dev/random/random_adaptors.c:233: undefined reference to `random_get_active_adaptor' *** Error code 1 Stop. bmake[1]: stopped in /obj/arm.arm/src/sys/SIMICS *** Error code 1 Stop. bmake: stopped in /src *** Error code 1 Stop in /src. TB --- 2013-09-07 23:28:23 - WARNING: /usr/bin/make returned exit code 1 TB --- 2013-09-07 23:28:23 - ERROR: failed to build SIMICS kernel TB --- 2013-09-07 23:28:23 - 13762.27 user 2777.03 system 18481.66 real http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-arm-arm.full Glen --rYRijwbmzeJBcrGE Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQEcBAEBCAAGBQJSK9qNAAoJEFJPDDeguUaj+E0IAJLk9QpAd1AkmDJbNSSvI7iM x1OujqRFsScr2kmNjdyna1E9lwtMRCKDP2vC76HeJd/8neVrqHRF3RyJmCZZ0nTW pJmS9QihtdrxUgkYvBrSi6J6wNfR0dJfLbvVzMQKoBebGgk+fc8prCAkj8hPwoXp yi5sczcknRKPKQbUWyW/pFvpBgdSXUcTHf21QwGg8Nom9pYVT6O8XeiWz075NNb7 3SIlL5eGtHECfJzuCZ9gSxsAsqV+dBDx8+8zbKiH8gIV0D9LB53+sxxfpUcDUkE8 VBHa+KgNDYMNDw5x9I3wOEKVHserLhjBY0Xaak/mzz10ydmc79btyLgsQjJ53Zs= =hUOc -----END PGP SIGNATURE----- --rYRijwbmzeJBcrGE--