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)
151 lines
2.9 KiB
C
151 lines
2.9 KiB
C
/*-
|
|
* THE BEER-WARE LICENSE
|
|
*
|
|
* <dan@FreeBSD.ORG> wrote this file. As long as you retain this notice you
|
|
* can do whatever you want with this stuff. If we meet some day, and you
|
|
* think this stuff is worth it, you can buy me a beer in return.
|
|
*
|
|
* Dan Moschuk
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/random.h>
|
|
#include <sys/libkern.h>
|
|
#include <sys/lock.h>
|
|
#include <sys/mutex.h>
|
|
#include <sys/time.h>
|
|
|
|
#define ARC4_RESEED_BYTES 65536
|
|
#define ARC4_RESEED_SECONDS 300
|
|
#define ARC4_KEYBYTES 256
|
|
|
|
int arc4rand_iniseed_state = ARC4_ENTR_NONE;
|
|
|
|
static u_int8_t arc4_i, arc4_j;
|
|
static int arc4_numruns = 0;
|
|
static u_int8_t arc4_sbox[256];
|
|
static time_t arc4_t_reseed;
|
|
static struct mtx arc4_mtx;
|
|
|
|
static u_int8_t arc4_randbyte(void);
|
|
|
|
static __inline void
|
|
arc4_swap(u_int8_t *a, u_int8_t *b)
|
|
{
|
|
u_int8_t c;
|
|
|
|
c = *a;
|
|
*a = *b;
|
|
*b = c;
|
|
}
|
|
|
|
/*
|
|
* Stir our S-box.
|
|
*/
|
|
static void
|
|
arc4_randomstir(void)
|
|
{
|
|
u_int8_t key[ARC4_KEYBYTES];
|
|
int n;
|
|
struct timeval tv_now;
|
|
|
|
/*
|
|
* XXX: FIX!! This isn't brilliant. Need more confidence.
|
|
* This returns zero entropy before random(4) is seeded.
|
|
*/
|
|
(void)read_random(key, ARC4_KEYBYTES);
|
|
getmicrouptime(&tv_now);
|
|
mtx_lock(&arc4_mtx);
|
|
for (n = 0; n < 256; n++) {
|
|
arc4_j = (arc4_j + arc4_sbox[n] + key[n]) % 256;
|
|
arc4_swap(&arc4_sbox[n], &arc4_sbox[arc4_j]);
|
|
}
|
|
arc4_i = arc4_j = 0;
|
|
/* Reset for next reseed cycle. */
|
|
arc4_t_reseed = tv_now.tv_sec + ARC4_RESEED_SECONDS;
|
|
arc4_numruns = 0;
|
|
/*
|
|
* Throw away the first N words of output, as suggested in the
|
|
* paper "Weaknesses in the Key Scheduling Algorithm of RC4"
|
|
* by Fluher, Mantin, and Shamir. (N = 256 in our case.)
|
|
*
|
|
* http://dl.acm.org/citation.cfm?id=646557.694759
|
|
*/
|
|
for (n = 0; n < 256*4; n++)
|
|
arc4_randbyte();
|
|
mtx_unlock(&arc4_mtx);
|
|
}
|
|
|
|
/*
|
|
* Initialize our S-box to its beginning defaults.
|
|
*/
|
|
static void
|
|
arc4_init(void)
|
|
{
|
|
int n;
|
|
|
|
mtx_init(&arc4_mtx, "arc4_mtx", NULL, MTX_DEF);
|
|
arc4_i = arc4_j = 0;
|
|
for (n = 0; n < 256; n++)
|
|
arc4_sbox[n] = (u_int8_t) n;
|
|
|
|
arc4_t_reseed = 0;
|
|
}
|
|
|
|
SYSINIT(arc4_init, SI_SUB_LOCK, SI_ORDER_ANY, arc4_init, NULL);
|
|
|
|
/*
|
|
* Generate a random byte.
|
|
*/
|
|
static u_int8_t
|
|
arc4_randbyte(void)
|
|
{
|
|
u_int8_t arc4_t;
|
|
|
|
arc4_i = (arc4_i + 1) % 256;
|
|
arc4_j = (arc4_j + arc4_sbox[arc4_i]) % 256;
|
|
|
|
arc4_swap(&arc4_sbox[arc4_i], &arc4_sbox[arc4_j]);
|
|
|
|
arc4_t = (arc4_sbox[arc4_i] + arc4_sbox[arc4_j]) % 256;
|
|
return arc4_sbox[arc4_t];
|
|
}
|
|
|
|
/*
|
|
* MPSAFE
|
|
*/
|
|
void
|
|
arc4rand(void *ptr, u_int len, int reseed)
|
|
{
|
|
u_char *p;
|
|
struct timeval tv;
|
|
|
|
getmicrouptime(&tv);
|
|
if (atomic_cmpset_int(&arc4rand_iniseed_state, ARC4_ENTR_HAVE,
|
|
ARC4_ENTR_SEED) || reseed ||
|
|
(arc4_numruns > ARC4_RESEED_BYTES) ||
|
|
(tv.tv_sec > arc4_t_reseed))
|
|
arc4_randomstir();
|
|
|
|
mtx_lock(&arc4_mtx);
|
|
arc4_numruns += len;
|
|
p = ptr;
|
|
while (len--)
|
|
*p++ = arc4_randbyte();
|
|
mtx_unlock(&arc4_mtx);
|
|
}
|
|
|
|
uint32_t
|
|
arc4random(void)
|
|
{
|
|
uint32_t ret;
|
|
|
|
arc4rand(&ret, sizeof ret, 0);
|
|
return ret;
|
|
}
|