d1b06863fb
* GENERAL - Update copyright. - Make kernel options for RANDOM_YARROW and RANDOM_DUMMY. Set neither to ON, which means we want Fortuna - If there is no 'device random' in the kernel, there will be NO random(4) device in the kernel, and the KERN_ARND sysctl will return nothing. With RANDOM_DUMMY there will be a random(4) that always blocks. - Repair kern.arandom (KERN_ARND sysctl). The old version went through arc4random(9) and was a bit weird. - Adjust arc4random stirring a bit - the existing code looks a little suspect. - Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks. - Redo read_random(9) so as to duplicate random(4)'s read internals. This makes it a first-class citizen rather than a hack. - Move stuff out of locked regions when it does not need to be there. - Trim RANDOM_DEBUG printfs. Some are excess to requirement, some behind boot verbose. - Use SYSINIT to sequence the startup. - Fix init/deinit sysctl stuff. - Make relevant sysctls also tunables. - Add different harvesting "styles" to allow for different requirements (direct, queue, fast). - Add harvesting of FFS atime events. This needs to be checked for weighing down the FS code. - Add harvesting of slab allocator events. This needs to be checked for weighing down the allocator code. - Fix the random(9) manpage. - Loadable modules are not present for now. These will be re-engineered when the dust settles. - Use macros for locks. - Fix comments. * src/share/man/... - Update the man pages. * src/etc/... - The startup/shutdown work is done in D2924. * src/UPDATING - Add UPDATING announcement. * src/sys/dev/random/build.sh - Add copyright. - Add libz for unit tests. * src/sys/dev/random/dummy.c - Remove; no longer needed. Functionality incorporated into randomdev.*. * live_entropy_sources.c live_entropy_sources.h - Remove; content moved. - move content to randomdev.[ch] and optimise. * src/sys/dev/random/random_adaptors.c src/sys/dev/random/random_adaptors.h - Remove; plugability is no longer used. Compile-time algorithm selection is the way to go. * src/sys/dev/random/random_harvestq.c src/sys/dev/random/random_harvestq.h - Add early (re)boot-time randomness caching. * src/sys/dev/random/randomdev_soft.c src/sys/dev/random/randomdev_soft.h - Remove; no longer needed. * src/sys/dev/random/uint128.h - Provide a fake uint128_t; if a real one ever arrived, we can use that instead. All that is needed here is N=0, N++, N==0, and some localised trickery is used to manufacture a 128-bit 0ULLL. * src/sys/dev/random/unit_test.c src/sys/dev/random/unit_test.h - Improve unit tests; previously the testing human needed clairvoyance; now the test will do a basic check of compressibility. Clairvoyant talent is still a good idea. - This is still a long way off a proper unit test. * src/sys/dev/random/fortuna.c src/sys/dev/random/fortuna.h - Improve messy union to just uint128_t. - Remove unneeded 'static struct fortuna_start_cache'. - Tighten up up arithmetic. - Provide a method to allow eternal junk to be introduced; harden it against blatant by compress/hashing. - Assert that locks are held correctly. - Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks. - Turn into self-sufficient module (no longer requires randomdev_soft.[ch]) * src/sys/dev/random/yarrow.c src/sys/dev/random/yarrow.h - Improve messy union to just uint128_t. - Remove unneeded 'staic struct start_cache'. - Tighten up up arithmetic. - Provide a method to allow eternal junk to be introduced; harden it against blatant by compress/hashing. - Assert that locks are held correctly. - Fix the nasty pre- and post-read overloading by providing explictit functions to do these tasks. - Turn into self-sufficient module (no longer requires randomdev_soft.[ch]) - Fix some magic numbers elsewhere used as FAST and SLOW. Differential Revision: https://reviews.freebsd.org/D2025 Reviewed by: vsevolod,delphij,rwatson,trasz,jmg Approved by: so (delphij)
492 lines
15 KiB
C
492 lines
15 KiB
C
/*-
|
|
* Copyright (c) 2013-2015 Mark R V Murray
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer
|
|
* in this position and unchanged.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* This implementation of Fortuna is based on the descriptions found in
|
|
* ISBN 978-0-470-47424-2 "Cryptography Engineering" by Ferguson, Schneier
|
|
* and Kohno ("FS&K").
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/limits.h>
|
|
|
|
#ifdef _KERNEL
|
|
#include <sys/param.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/conf.h>
|
|
#include <sys/lock.h>
|
|
#include <sys/malloc.h>
|
|
#include <sys/module.h>
|
|
#include <sys/mutex.h>
|
|
#include <sys/random.h>
|
|
#include <sys/sysctl.h>
|
|
#include <sys/systm.h>
|
|
|
|
#include <machine/cpu.h>
|
|
|
|
#include <crypto/rijndael/rijndael-api-fst.h>
|
|
#include <crypto/sha2/sha2.h>
|
|
|
|
#include <dev/random/hash.h>
|
|
#include <dev/random/randomdev.h>
|
|
#include <dev/random/random_harvestq.h>
|
|
#include <dev/random/uint128.h>
|
|
#include <dev/random/fortuna.h>
|
|
#else /* !_KERNEL */
|
|
#include <inttypes.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <threads.h>
|
|
|
|
#include "unit_test.h"
|
|
|
|
#include <crypto/rijndael/rijndael-api-fst.h>
|
|
#include <crypto/sha2/sha2.h>
|
|
|
|
#include <dev/random/hash.h>
|
|
#include <dev/random/uint128.h>
|
|
#include <dev/random/fortuna.h>
|
|
#endif /* _KERNEL */
|
|
|
|
/* Defined in FS&K */
|
|
#define RANDOM_FORTUNA_NPOOLS 32 /* The number of accumulation pools */
|
|
#define RANDOM_FORTUNA_DEFPOOLSIZE 64 /* The default pool size/length for a (re)seed */
|
|
#define RANDOM_FORTUNA_MAX_READ (1 << 20) /* Max bytes in a single read */
|
|
|
|
/*
|
|
* The allowable range of RANDOM_FORTUNA_DEFPOOLSIZE. The default value is above.
|
|
* Making RANDOM_FORTUNA_DEFPOOLSIZE too large will mean a long time between reseeds,
|
|
* and too small may compromise initial security but get faster reseeds.
|
|
*/
|
|
#define RANDOM_FORTUNA_MINPOOLSIZE 16
|
|
#define RANDOM_FORTUNA_MAXPOOLSIZE UINT_MAX
|
|
CTASSERT(RANDOM_FORTUNA_MINPOOLSIZE <= RANDOM_FORTUNA_DEFPOOLSIZE);
|
|
CTASSERT(RANDOM_FORTUNA_DEFPOOLSIZE <= RANDOM_FORTUNA_MAXPOOLSIZE);
|
|
|
|
/* This algorithm (and code) presumes that RANDOM_KEYSIZE is twice as large as RANDOM_BLOCKSIZE */
|
|
CTASSERT(RANDOM_BLOCKSIZE == sizeof(uint128_t));
|
|
CTASSERT(RANDOM_KEYSIZE == 2*RANDOM_BLOCKSIZE);
|
|
|
|
/*
|
|
* This is the beastie that needs protecting. It contains all of the
|
|
* state that we are excited about. Exactly one is instantiated.
|
|
*/
|
|
static struct fortuna_state {
|
|
struct fs_pool { /* P_i */
|
|
u_int fsp_length; /* Only the first one is used by Fortuna */
|
|
struct randomdev_hash fsp_hash;
|
|
} fs_pool[RANDOM_FORTUNA_NPOOLS];
|
|
u_int fs_reseedcount; /* ReseedCnt */
|
|
uint128_t fs_counter; /* C */
|
|
struct randomdev_key fs_key; /* K */
|
|
u_int fs_minpoolsize; /* Extras */
|
|
/* Extras for the OS */
|
|
#ifdef _KERNEL
|
|
/* For use when 'pacing' the reseeds */
|
|
sbintime_t fs_lasttime;
|
|
#endif
|
|
/* Reseed lock */
|
|
mtx_t fs_mtx;
|
|
} fortuna_state;
|
|
|
|
#ifdef _KERNEL
|
|
static struct sysctl_ctx_list random_clist;
|
|
RANDOM_CHECK_UINT(fs_minpoolsize, RANDOM_FORTUNA_MINPOOLSIZE, RANDOM_FORTUNA_MAXPOOLSIZE);
|
|
#else
|
|
static uint8_t zero_region[RANDOM_ZERO_BLOCKSIZE];
|
|
#endif
|
|
|
|
static void random_fortuna_pre_read(void);
|
|
static void random_fortuna_read(uint8_t *, u_int);
|
|
static void random_fortuna_post_read(void);
|
|
static void random_fortuna_write(uint8_t *, u_int);
|
|
static void random_fortuna_reseed(void);
|
|
static int random_fortuna_seeded(void);
|
|
static void random_fortuna_process_event(struct harvest_event *);
|
|
|
|
#ifdef _KERNEL
|
|
/* Interface to Adaptors system */
|
|
struct random_algorithm random_alg_context = {
|
|
.ra_ident = "Fortuna",
|
|
.ra_pre_read = random_fortuna_pre_read,
|
|
.ra_read = random_fortuna_read,
|
|
.ra_post_read = random_fortuna_post_read,
|
|
.ra_write = random_fortuna_write,
|
|
.ra_reseed = random_fortuna_reseed,
|
|
.ra_seeded = random_fortuna_seeded,
|
|
.ra_event_processor = random_fortuna_process_event,
|
|
.ra_poolcount = RANDOM_FORTUNA_NPOOLS,
|
|
};
|
|
#endif
|
|
|
|
/* ARGSUSED */
|
|
static void
|
|
random_fortuna_init_alg(void *unused __unused)
|
|
{
|
|
int i;
|
|
#ifdef _KERNEL
|
|
struct sysctl_oid *random_fortuna_o;
|
|
#endif
|
|
|
|
RANDOM_RESEED_INIT_LOCK();
|
|
/*
|
|
* Fortuna parameters. Do not adjust these unless you have
|
|
* have a very good clue about what they do!
|
|
*/
|
|
fortuna_state.fs_minpoolsize = RANDOM_FORTUNA_DEFPOOLSIZE;
|
|
#ifdef _KERNEL
|
|
fortuna_state.fs_lasttime = 0;
|
|
random_fortuna_o = SYSCTL_ADD_NODE(&random_clist,
|
|
SYSCTL_STATIC_CHILDREN(_kern_random),
|
|
OID_AUTO, "fortuna", CTLFLAG_RW, 0,
|
|
"Fortuna Parameters");
|
|
SYSCTL_ADD_PROC(&random_clist,
|
|
SYSCTL_CHILDREN(random_fortuna_o), OID_AUTO,
|
|
"minpoolsize", CTLTYPE_UINT | CTLFLAG_RWTUN,
|
|
&fortuna_state.fs_minpoolsize, RANDOM_FORTUNA_DEFPOOLSIZE,
|
|
random_check_uint_fs_minpoolsize, "IU",
|
|
"Minimum pool size necessary to cause a reseed");
|
|
KASSERT(fortuna_state.fs_minpoolsize > 0, ("random: Fortuna threshold must be > 0 at startup"));
|
|
#endif
|
|
|
|
/*-
|
|
* FS&K - InitializePRNG()
|
|
* - P_i = \epsilon
|
|
* - ReseedCNT = 0
|
|
*/
|
|
for (i = 0; i < RANDOM_FORTUNA_NPOOLS; i++) {
|
|
randomdev_hash_init(&fortuna_state.fs_pool[i].fsp_hash);
|
|
fortuna_state.fs_pool[i].fsp_length = 0;
|
|
}
|
|
fortuna_state.fs_reseedcount = 0;
|
|
/*-
|
|
* FS&K - InitializeGenerator()
|
|
* - C = 0
|
|
* - K = 0
|
|
*/
|
|
fortuna_state.fs_counter = UINT128_ZERO;
|
|
explicit_bzero(&fortuna_state.fs_key, sizeof(fortuna_state.fs_key));
|
|
}
|
|
#ifdef _KERNEL
|
|
SYSINIT(random_fortuna, SI_SUB_RANDOM, SI_ORDER_THIRD, random_fortuna_init_alg, NULL);
|
|
#endif
|
|
|
|
/* ARGSUSED */
|
|
static void
|
|
random_fortuna_deinit_alg(void *unused __unused)
|
|
{
|
|
|
|
RANDOM_RESEED_DEINIT_LOCK();
|
|
explicit_bzero(&fortuna_state, sizeof(fortuna_state));
|
|
#ifdef _KERNEL
|
|
sysctl_ctx_free(&random_clist);
|
|
#endif
|
|
}
|
|
#ifdef _KERNEL
|
|
SYSUNINIT(random_fortuna, SI_SUB_RANDOM, SI_ORDER_THIRD, random_fortuna_deinit_alg, NULL);
|
|
#endif
|
|
|
|
/*-
|
|
* FS&K - AddRandomEvent()
|
|
* Process a single stochastic event off the harvest queue
|
|
*/
|
|
void
|
|
random_fortuna_process_event(struct harvest_event *event)
|
|
{
|
|
u_int pl;
|
|
|
|
RANDOM_RESEED_LOCK();
|
|
/*-
|
|
* FS&K - P_i = P_i|<harvested stuff>
|
|
* Accumulate the event into the appropriate pool
|
|
* where each event carries the destination information.
|
|
*
|
|
* The hash_init() and hash_finish() calls are done in
|
|
* random_fortuna_pre_read().
|
|
*
|
|
* We must be locked against pool state modification which can happen
|
|
* during accumulation/reseeding and reading/regating.
|
|
*/
|
|
pl = event->he_destination % RANDOM_FORTUNA_NPOOLS;
|
|
randomdev_hash_iterate(&fortuna_state.fs_pool[pl].fsp_hash, event, sizeof(*event));
|
|
/*-
|
|
* Don't wrap the length. Doing the the hard way so as not to wrap at MAXUINT.
|
|
* This is a "saturating" add.
|
|
* XXX: FIX!!: We don't actually need lengths for anything but fs_pool[0],
|
|
* but it's been useful debugging to see them all.
|
|
*/
|
|
if (RANDOM_FORTUNA_MAXPOOLSIZE - fortuna_state.fs_pool[pl].fsp_length > event->he_size)
|
|
fortuna_state.fs_pool[pl].fsp_length += event->he_size;
|
|
else
|
|
fortuna_state.fs_pool[pl].fsp_length = RANDOM_FORTUNA_MAXPOOLSIZE;
|
|
explicit_bzero(event, sizeof(*event));
|
|
RANDOM_RESEED_UNLOCK();
|
|
}
|
|
|
|
/*-
|
|
* Process a block of data suspected to be slightly stochastic.
|
|
* Do this by breaking it up and inserting the pieces as if
|
|
* they were separate events.
|
|
*/
|
|
static void
|
|
random_fortuna_process_buffer(uint32_t *buf, u_int wordcount)
|
|
{
|
|
static struct harvest_event event;
|
|
static u_int destination = 0;
|
|
int i;
|
|
|
|
for (i = 0; i < wordcount; i += sizeof(event.he_entropy)/sizeof(event.he_entropy[0])) {
|
|
event.he_somecounter = (uint32_t)get_cyclecount();
|
|
event.he_size = sizeof(event.he_entropy);
|
|
event.he_bits = event.he_size/8;
|
|
event.he_source = RANDOM_CACHED;
|
|
event.he_destination = destination++; /* Harmless cheating */
|
|
memcpy(event.he_entropy, buf + i, sizeof(event.he_entropy));
|
|
random_fortuna_process_event(&event);
|
|
}
|
|
}
|
|
|
|
/*-
|
|
* FS&K - Reseed()
|
|
* This introduces new key material into the output generator.
|
|
* Additionaly it increments the output generator's counter
|
|
* variable C. When C > 0, the output generator is seeded and
|
|
* will deliver output.
|
|
* The entropy_data buffer passed is a very specific size; the
|
|
* product of RANDOM_FORTUNA_NPOOLS and RANDOM_KEYSIZE.
|
|
*/
|
|
static void
|
|
random_fortuna_reseed_internal(uint32_t *entropy_data, u_int blockcount)
|
|
{
|
|
struct randomdev_hash context;
|
|
uint8_t hash[RANDOM_KEYSIZE];
|
|
|
|
RANDOM_RESEED_ASSERT_LOCK_OWNED();
|
|
/*-
|
|
* FS&K - K = Hd(K|s) where Hd(m) is H(H(0^512|m))
|
|
* - C = C + 1
|
|
*/
|
|
randomdev_hash_init(&context);
|
|
randomdev_hash_iterate(&context, zero_region, RANDOM_ZERO_BLOCKSIZE);
|
|
randomdev_hash_iterate(&context, &fortuna_state.fs_key, sizeof(fortuna_state.fs_key));
|
|
randomdev_hash_iterate(&context, entropy_data, RANDOM_KEYSIZE*blockcount);
|
|
randomdev_hash_finish(&context, hash);
|
|
randomdev_hash_init(&context);
|
|
randomdev_hash_iterate(&context, hash, RANDOM_KEYSIZE);
|
|
randomdev_hash_finish(&context, hash);
|
|
randomdev_encrypt_init(&fortuna_state.fs_key, hash);
|
|
explicit_bzero(hash, sizeof(hash));
|
|
/* Unblock the device if this is the first time we are reseeding. */
|
|
if (uint128_is_zero(fortuna_state.fs_counter))
|
|
randomdev_unblock();
|
|
uint128_increment(&fortuna_state.fs_counter);
|
|
}
|
|
|
|
/*-
|
|
* FS&K - GenerateBlocks()
|
|
* Generate a number of complete blocks of random output.
|
|
*/
|
|
static __inline void
|
|
random_fortuna_genblocks(uint8_t *buf, u_int blockcount)
|
|
{
|
|
u_int i;
|
|
|
|
RANDOM_RESEED_ASSERT_LOCK_OWNED();
|
|
for (i = 0; i < blockcount; i++) {
|
|
/*-
|
|
* FS&K - r = r|E(K,C)
|
|
* - C = C + 1
|
|
*/
|
|
randomdev_encrypt(&fortuna_state.fs_key, &fortuna_state.fs_counter, buf, RANDOM_BLOCKSIZE);
|
|
buf += RANDOM_BLOCKSIZE;
|
|
uint128_increment(&fortuna_state.fs_counter);
|
|
}
|
|
}
|
|
|
|
/*-
|
|
* FS&K - PseudoRandomData()
|
|
* This generates no more than 2^20 bytes of data, and cleans up its
|
|
* internal state when finished. It is assumed that a whole number of
|
|
* blocks are available for writing; any excess generated will be
|
|
* ignored.
|
|
*/
|
|
static __inline void
|
|
random_fortuna_genrandom(uint8_t *buf, u_int bytecount)
|
|
{
|
|
static uint8_t temp[RANDOM_BLOCKSIZE*(RANDOM_KEYS_PER_BLOCK)];
|
|
u_int blockcount;
|
|
|
|
RANDOM_RESEED_ASSERT_LOCK_OWNED();
|
|
/*-
|
|
* FS&K - assert(n < 2^20 (== 1 MB)
|
|
* - r = first-n-bytes(GenerateBlocks(ceil(n/16)))
|
|
* - K = GenerateBlocks(2)
|
|
*/
|
|
KASSERT((bytecount <= RANDOM_FORTUNA_MAX_READ), ("invalid single read request to Fortuna of %d bytes", bytecount));
|
|
blockcount = (bytecount + RANDOM_BLOCKSIZE - 1)/RANDOM_BLOCKSIZE;
|
|
random_fortuna_genblocks(buf, blockcount);
|
|
random_fortuna_genblocks(temp, RANDOM_KEYS_PER_BLOCK);
|
|
randomdev_encrypt_init(&fortuna_state.fs_key, temp);
|
|
explicit_bzero(temp, sizeof(temp));
|
|
}
|
|
|
|
/*-
|
|
* FS&K - RandomData()
|
|
* Used to return processed entropy from the PRNG.
|
|
* There is a pre_read and a post_read required to be present
|
|
* (but they can be null functions) in order to allow specific
|
|
* actions at the begin or the end of a read. Fortuna does its
|
|
* reseeding in the _pre_read() part, and _post_read() is not
|
|
* used.
|
|
*/
|
|
void
|
|
random_fortuna_pre_read(void)
|
|
{
|
|
#ifdef _KERNEL
|
|
sbintime_t now;
|
|
#endif
|
|
struct randomdev_hash context;
|
|
uint32_t s[RANDOM_FORTUNA_NPOOLS*RANDOM_KEYSIZE_WORDS];
|
|
uint8_t temp[RANDOM_KEYSIZE];
|
|
u_int i;
|
|
|
|
KASSERT(fortuna_state.fs_minpoolsize > 0, ("random: Fortuna threshold must be > 0"));
|
|
#ifdef _KERNEL
|
|
/* FS&K - Use 'getsbinuptime()' to prevent reseed-spamming. */
|
|
now = getsbinuptime();
|
|
#endif
|
|
RANDOM_RESEED_LOCK();
|
|
|
|
if (fortuna_state.fs_pool[0].fsp_length >= fortuna_state.fs_minpoolsize
|
|
#ifdef _KERNEL
|
|
/* FS&K - Use 'getsbinuptime()' to prevent reseed-spamming. */
|
|
&& (now - fortuna_state.fs_lasttime > hz/10)
|
|
#endif
|
|
) {
|
|
#ifdef _KERNEL
|
|
fortuna_state.fs_lasttime = now;
|
|
#endif
|
|
|
|
/* FS&K - ReseedCNT = ReseedCNT + 1 */
|
|
fortuna_state.fs_reseedcount++;
|
|
/* s = \epsilon at start */
|
|
for (i = 0; i < RANDOM_FORTUNA_NPOOLS; i++) {
|
|
/* FS&K - if Divides(ReseedCnt, 2^i) ... */
|
|
if ((fortuna_state.fs_reseedcount % (1 << i)) == 0) {
|
|
/*-
|
|
* FS&K - temp = (P_i)
|
|
* - P_i = \epsilon
|
|
* - s = s|H(temp)
|
|
*/
|
|
randomdev_hash_finish(&fortuna_state.fs_pool[i].fsp_hash, temp);
|
|
randomdev_hash_init(&fortuna_state.fs_pool[i].fsp_hash);
|
|
fortuna_state.fs_pool[i].fsp_length = 0;
|
|
randomdev_hash_init(&context);
|
|
randomdev_hash_iterate(&context, temp, RANDOM_KEYSIZE);
|
|
randomdev_hash_finish(&context, s + i*RANDOM_KEYSIZE_WORDS);
|
|
} else
|
|
break;
|
|
}
|
|
#ifdef RANDOM_DEBUG
|
|
{
|
|
u_int j;
|
|
|
|
printf("random: reseedcount [%d]", fortuna_state.fs_reseedcount);
|
|
for (j = 0; j < RANDOM_FORTUNA_NPOOLS; j++)
|
|
printf(" %X", fortuna_state.fs_pool[j].fsp_length);
|
|
printf("\n");
|
|
}
|
|
#endif
|
|
/* FS&K */
|
|
random_fortuna_reseed_internal(s, i < RANDOM_FORTUNA_NPOOLS ? i + 1 : RANDOM_FORTUNA_NPOOLS);
|
|
/* Clean up and secure */
|
|
explicit_bzero(s, sizeof(s));
|
|
explicit_bzero(temp, sizeof(temp));
|
|
explicit_bzero(&context, sizeof(context));
|
|
}
|
|
RANDOM_RESEED_UNLOCK();
|
|
}
|
|
|
|
/*-
|
|
* Main read from Fortuna.
|
|
* The supplied buf MUST be a multiple (>=0) of RANDOM_BLOCKSIZE in size.
|
|
* Lots of code presumes this for efficiency, both here and in other
|
|
* routines. You are NOT allowed to break this!
|
|
*/
|
|
void
|
|
random_fortuna_read(uint8_t *buf, u_int bytecount)
|
|
{
|
|
|
|
RANDOM_RESEED_LOCK();
|
|
random_fortuna_genrandom(buf, bytecount);
|
|
RANDOM_RESEED_UNLOCK();
|
|
}
|
|
|
|
void
|
|
random_fortuna_post_read(void)
|
|
{
|
|
|
|
/* CWOT */
|
|
}
|
|
|
|
/* Internal function to hand external entropy to the PRNG. */
|
|
void
|
|
random_fortuna_write(uint8_t *buf, u_int count)
|
|
{
|
|
struct randomdev_hash hash;
|
|
uint32_t entropy_data[RANDOM_KEYSIZE_WORDS], timestamp;
|
|
|
|
/* Extra timing here is helpful to scrape scheduler timing entropy */
|
|
randomdev_hash_init(&hash);
|
|
timestamp = (uint32_t)get_cyclecount();
|
|
randomdev_hash_iterate(&hash, ×tamp, sizeof(timestamp));
|
|
randomdev_hash_iterate(&hash, buf, count);
|
|
timestamp = (uint32_t)get_cyclecount();
|
|
randomdev_hash_iterate(&hash, ×tamp, sizeof(timestamp));
|
|
randomdev_hash_finish(&hash, entropy_data);
|
|
explicit_bzero(&hash, sizeof(hash));
|
|
random_fortuna_process_buffer(entropy_data, sizeof(entropy_data)/sizeof(entropy_data[0]));
|
|
explicit_bzero(entropy_data, sizeof(entropy_data));
|
|
}
|
|
|
|
void
|
|
random_fortuna_reseed(void)
|
|
{
|
|
|
|
/* CWOT */
|
|
}
|
|
|
|
int
|
|
random_fortuna_seeded(void)
|
|
{
|
|
|
|
return (!uint128_is_zero(fortuna_state.fs_counter));
|
|
}
|