svn commit: r255379 - head/sys/dev/random
Glen Barber
gjb at FreeBSD.org
Sun Sep 8 02:01:53 UTC 2013
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
>
> Log:
> Fix the build; Certain linkable symbols need to always be present.
>
> Pass the pointy hat please.
>
> 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.
>
> 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).
>
> 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
>
> Modified: head/sys/dev/random/pseudo_rng.c
> ==============================================================================
> --- 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$");
>
> static struct mtx pseudo_random_block_mtx;
>
> +/* 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)
> {
>
> Modified: head/sys/dev/random/random_adaptors.c
> ==============================================================================
> --- head/sys/dev/random/random_adaptors.c Sat Sep 7 20:52:31 2013 (r255378)
> +++ head/sys/dev/random/random_adaptors.c Sat Sep 7 22:07:36 2013 (r255379)
> @@ -53,6 +53,8 @@ static struct sx adaptors_lock; /* need
> /* List for the dynamic sysctls */
> static struct sysctl_ctx_list random_clist;
>
> +struct random_adaptor *random_adaptor;
> +
> MALLOC_DEFINE(M_RANDOM_ADAPTORS, "random_adaptors", "Random adaptors buffers");
>
> int
> @@ -230,7 +232,7 @@ random_sysctl_active_adaptor_handler(SYS
> int error;
>
> name = NULL;
> - rsp = random_get_active_adaptor();
> + rsp = random_adaptor;
>
> if (rsp != NULL) {
> sx_slock(&adaptors_lock);
>
> Modified: head/sys/dev/random/random_adaptors.h
> ==============================================================================
> --- head/sys/dev/random/random_adaptors.h Sat Sep 7 20:52:31 2013 (r255378)
> +++ head/sys/dev/random/random_adaptors.h Sat Sep 7 22:07:36 2013 (r255379)
> @@ -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 **);
>
> +extern struct random_adaptor *random_adaptor;
> +
> /*
> * random_adaptor's should be registered prior to
> * random module (SI_SUB_DRIVERS/SI_ORDER_MIDDLE)
>
> Modified: head/sys/dev/random/randomdev.c
> ==============================================================================
> --- 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 = {
> .d_name = "random",
> };
>
> -static struct random_adaptor *random_adaptor;
> static eventhandler_tag attach_tag;
> static int random_inited;
>
> -
> /* For use with make_dev(9)/destroy_dev(9). */
> static struct cdev *random_dev;
>
> -/* Used to fake out unused random calls in random_adaptor */
> -void
> -random_null_func(void)
> -{
> -}
> -
> -struct random_adaptor *
> -random_get_active_adaptor(void)
> -{
> -
> - return (random_adaptor);
> -}
> -
> /* ARGSUSED */
> static int
> random_close(struct cdev *dev __unused, int flags, int fmt __unused,
>
> Modified: head/sys/dev/random/randomdev.h
> ==============================================================================
> --- 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 {
>
> extern void random_ident_hardware(struct random_adaptor **);
> extern void random_null_func(void);
> -struct random_adaptor *random_get_active_adaptor(void);
>
> Modified: head/sys/dev/random/randomdev_soft.c
> ==============================================================================
> --- head/sys/dev/random/randomdev_soft.c Sat Sep 7 20:52:31 2013 (r255378)
> +++ head/sys/dev/random/randomdev_soft.c Sat Sep 7 22:07:36 2013 (r255379)
> @@ -79,7 +79,7 @@ static struct random_adaptor random_cont
> .write = randomdev_write,
> .poll = randomdev_poll,
> .reseed = randomdev_flush_reseed,
> - .seeded = 0,
> + .seeded = 1,
> };
> #define RANDOM_MODULE_NAME yarrow
> #define RANDOM_CSPRNG_NAME "yarrow"
> @@ -95,7 +95,7 @@ static struct random_adaptor random_cont
> .write = randomdev_write,
> .poll = randomdev_poll,
> .reseed = randomdev_flush_reseed,
> - .seeded = 0,
> + .seeded = 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20130907/f3fbe116/attachment.sig>
More information about the svn-src-all
mailing list