svn commit: r255319 - in projects/random_number_generator/sys: dev/glxsb dev/hifn dev/rndtest dev/safe dev/ubsec mips/cavium
Mark Murray
markm at FreeBSD.org
Fri Sep 6 17:51:54 UTC 2013
Author: markm
Date: Fri Sep 6 17:51:52 2013
New Revision: 255319
URL: http://svnweb.freebsd.org/changeset/base/255319
Log:
Yarrow wants entropy estimations to be conservative; the usual idea
is that if you are certain you have N bits of entropy, you declare
N/2.
Modified:
projects/random_number_generator/sys/dev/glxsb/glxsb.c
projects/random_number_generator/sys/dev/hifn/hifn7751.c
projects/random_number_generator/sys/dev/rndtest/rndtest.c
projects/random_number_generator/sys/dev/safe/safe.c
projects/random_number_generator/sys/dev/ubsec/ubsec.c
projects/random_number_generator/sys/mips/cavium/octeon_rnd.c
Modified: projects/random_number_generator/sys/dev/glxsb/glxsb.c
==============================================================================
--- projects/random_number_generator/sys/dev/glxsb/glxsb.c Fri Sep 6 17:44:13 2013 (r255318)
+++ projects/random_number_generator/sys/dev/glxsb/glxsb.c Fri Sep 6 17:51:52 2013 (r255319)
@@ -476,7 +476,7 @@ glxsb_rnd(void *v)
if (status & SB_RNS_TRNG_VALID) {
value = bus_read_4(sc->sc_sr, SB_RANDOM_NUM);
/* feed with one uint32 */
- random_harvest(&value, 4, 32, 0, RANDOM_PURE);
+ random_harvest(&value, 4, 32/2, 0, RANDOM_PURE);
}
callout_reset(&sc->sc_rngco, sc->sc_rnghz, glxsb_rnd, sc);
Modified: projects/random_number_generator/sys/dev/hifn/hifn7751.c
==============================================================================
--- projects/random_number_generator/sys/dev/hifn/hifn7751.c Fri Sep 6 17:44:13 2013 (r255318)
+++ projects/random_number_generator/sys/dev/hifn/hifn7751.c Fri Sep 6 17:51:52 2013 (r255319)
@@ -258,7 +258,7 @@ hifn_partname(struct hifn_softc *sc)
static void
default_harvest(struct rndtest_state *rsp, void *buf, u_int count)
{
- random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE);
+ random_harvest(buf, count, count*NBBY/2, 0, RANDOM_PURE);
}
static u_int
Modified: projects/random_number_generator/sys/dev/rndtest/rndtest.c
==============================================================================
--- projects/random_number_generator/sys/dev/rndtest/rndtest.c Fri Sep 6 17:44:13 2013 (r255318)
+++ projects/random_number_generator/sys/dev/rndtest/rndtest.c Fri Sep 6 17:51:52 2013 (r255319)
@@ -152,7 +152,7 @@ rndtest_harvest(struct rndtest_state *rs
for (len /= sizeof (u_int32_t); len; len--)
add_true_randomness(*p++);
#else
- random_harvest(buf, len, len*NBBY, 0, RANDOM_PURE);
+ random_harvest(buf, len, len*NBBY/2, 0, RANDOM_PURE);
#endif
}
}
Modified: projects/random_number_generator/sys/dev/safe/safe.c
==============================================================================
--- projects/random_number_generator/sys/dev/safe/safe.c Fri Sep 6 17:44:13 2013 (r255318)
+++ projects/random_number_generator/sys/dev/safe/safe.c Fri Sep 6 17:51:52 2013 (r255319)
@@ -211,7 +211,7 @@ safe_partname(struct safe_softc *sc)
static void
default_harvest(struct rndtest_state *rsp, void *buf, u_int count)
{
- random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE);
+ random_harvest(buf, count, count*NBBY/2, 0, RANDOM_PURE);
}
#endif /* SAFE_NO_RNG */
Modified: projects/random_number_generator/sys/dev/ubsec/ubsec.c
==============================================================================
--- projects/random_number_generator/sys/dev/ubsec/ubsec.c Fri Sep 6 17:44:13 2013 (r255318)
+++ projects/random_number_generator/sys/dev/ubsec/ubsec.c Fri Sep 6 17:51:52 2013 (r255319)
@@ -259,7 +259,7 @@ ubsec_partname(struct ubsec_softc *sc)
static void
default_harvest(struct rndtest_state *rsp, void *buf, u_int count)
{
- random_harvest(buf, count, count*NBBY, 0, RANDOM_PURE);
+ random_harvest(buf, count, count*NBBY/2, 0, RANDOM_PURE);
}
static int
Modified: projects/random_number_generator/sys/mips/cavium/octeon_rnd.c
==============================================================================
--- projects/random_number_generator/sys/mips/cavium/octeon_rnd.c Fri Sep 6 17:44:13 2013 (r255318)
+++ projects/random_number_generator/sys/mips/cavium/octeon_rnd.c Fri Sep 6 17:51:52 2013 (r255319)
@@ -131,7 +131,7 @@ octeon_rnd_harvest(void *arg)
for (i = 0; i < OCTEON_RND_WORDS; i++)
sc->sc_entropy[i] = cvmx_rng_get_random64();
random_harvest(sc->sc_entropy, sizeof sc->sc_entropy,
- sizeof sc->sc_entropy * 8, 0, RANDOM_PURE);
+ (sizeof(sc->sc_entropy)*8)/2, 0, RANDOM_PURE);
callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc);
}
More information about the svn-src-projects
mailing list