Date: Sun, 27 Apr 2014 18:57:56 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r265021 - projects/random_number_generator/sys/dev/random Message-ID: <201404271857.s3RIvuP4089787@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Sun Apr 27 18:57:56 2014 New Revision: 265021 URL: http://svnweb.freebsd.org/changeset/base/265021 Log: Reorder to get 'n' set correctly. Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c Modified: projects/random_number_generator/sys/dev/random/live_entropy_sources.c ============================================================================== --- projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Apr 27 18:12:55 2014 (r265020) +++ projects/random_number_generator/sys/dev/random/live_entropy_sources.c Sun Apr 27 18:57:56 2014 (r265021) @@ -150,17 +150,17 @@ live_entropy_sources_feed(void) LIST_FOREACH(lles, &les_sources, lles_entries) { for (i = 0; i < harvest_pool_count*read_rate; i++) { + /* This *must* be quick, since it's a live entropy source. */ + n = lles->lles_rsource->les_read(event.he_entropy, HARVESTSIZE); + KASSERT((n > 0 && n <= HARVESTSIZE), ("very bad return from les_read (= %d) in %s", n, __func__)); + memset(event.he_entropy + n, 0, HARVESTSIZE - n); + event.he_somecounter = get_cyclecount(); event.he_size = n; event.he_bits = (n*8)/2; event.he_source = lles->lles_rsource->les_source; event.he_destination = harvest_destination[event.he_source]++; - /* This *must* be quick, since it's a live entropy source. */ - n = lles->lles_rsource->les_read(event.he_entropy, HARVESTSIZE); - KASSERT((n > 0 && n <= HARVESTSIZE), ("very bad return from les_read (= %d) in %s", n, __func__)); - memset(event.he_entropy + n, 0, HARVESTSIZE - n); - /* Do the actual entropy insertion */ harvest_process_event(&event); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404271857.s3RIvuP4089787>