1999-11-28 17:51:09 +00:00
|
|
|
/*-
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
2003-06-11 05:37:42 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2000-06-25 10:15:58 +00:00
|
|
|
#include <sys/types.h>
|
2003-08-15 06:34:47 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/kernel.h>
|
2000-06-25 10:15:58 +00:00
|
|
|
#include <sys/random.h>
|
1999-11-28 17:51:09 +00:00
|
|
|
#include <sys/libkern.h>
|
2003-08-15 06:34:47 +00:00
|
|
|
#include <sys/lock.h>
|
|
|
|
#include <sys/mutex.h>
|
2001-08-30 01:15:25 +00:00
|
|
|
#include <sys/time.h>
|
2016-11-25 13:49:33 +00:00
|
|
|
#include <sys/smp.h>
|
|
|
|
#include <sys/malloc.h>
|
1999-11-28 23:39:49 +00:00
|
|
|
|
2002-10-11 13:13:08 +00:00
|
|
|
#define ARC4_RESEED_BYTES 65536
|
2001-08-30 01:15:25 +00:00
|
|
|
#define ARC4_RESEED_SECONDS 300
|
Huge cleanup of random(4) code.
* 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)
2015-06-30 17:00:45 +00:00
|
|
|
#define ARC4_KEYBYTES 256
|
1999-11-28 17:51:09 +00:00
|
|
|
|
2013-04-19 00:30:52 +00:00
|
|
|
int arc4rand_iniseed_state = ARC4_ENTR_NONE;
|
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
MALLOC_DEFINE(M_ARC4RANDOM, "arc4random", "arc4random structures");
|
2001-08-30 01:15:25 +00:00
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
struct arc4_s {
|
2016-11-25 17:20:23 +00:00
|
|
|
struct mtx mtx;
|
2016-11-25 13:49:33 +00:00
|
|
|
u_int8_t i, j;
|
|
|
|
int numruns;
|
|
|
|
u_int8_t sbox[256];
|
|
|
|
time_t t_reseed;
|
|
|
|
|
2016-11-25 17:20:23 +00:00
|
|
|
} __aligned(CACHE_LINE_SIZE);
|
2016-11-25 13:49:33 +00:00
|
|
|
|
|
|
|
static struct arc4_s *arc4inst = NULL;
|
|
|
|
|
|
|
|
#define ARC4_FOREACH(_arc4) \
|
|
|
|
for (_arc4 = &arc4inst[0]; _arc4 <= &arc4inst[mp_maxid]; _arc4++)
|
|
|
|
|
|
|
|
static u_int8_t arc4_randbyte(struct arc4_s *arc4);
|
1999-11-28 17:51:09 +00:00
|
|
|
|
|
|
|
static __inline void
|
|
|
|
arc4_swap(u_int8_t *a, u_int8_t *b)
|
|
|
|
{
|
|
|
|
u_int8_t c;
|
|
|
|
|
|
|
|
c = *a;
|
|
|
|
*a = *b;
|
|
|
|
*b = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1999-11-28 23:39:49 +00:00
|
|
|
* Stir our S-box.
|
1999-11-28 17:51:09 +00:00
|
|
|
*/
|
|
|
|
static void
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4_randomstir(struct arc4_s* arc4)
|
1999-11-28 17:51:09 +00:00
|
|
|
{
|
Huge cleanup of random(4) code.
* 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)
2015-06-30 17:00:45 +00:00
|
|
|
u_int8_t key[ARC4_KEYBYTES];
|
|
|
|
int n;
|
2002-10-11 13:13:08 +00:00
|
|
|
struct timeval tv_now;
|
1999-11-28 17:51:09 +00:00
|
|
|
|
2001-08-30 12:30:58 +00:00
|
|
|
/*
|
Huge cleanup of random(4) code.
* 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)
2015-06-30 17:00:45 +00:00
|
|
|
* XXX: FIX!! This isn't brilliant. Need more confidence.
|
|
|
|
* This returns zero entropy before random(4) is seeded.
|
2000-12-02 16:23:54 +00:00
|
|
|
*/
|
Huge cleanup of random(4) code.
* 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)
2015-06-30 17:00:45 +00:00
|
|
|
(void)read_random(key, ARC4_KEYBYTES);
|
2003-08-15 06:34:47 +00:00
|
|
|
getmicrouptime(&tv_now);
|
2016-11-25 13:49:33 +00:00
|
|
|
mtx_lock(&arc4->mtx);
|
2002-10-11 13:13:08 +00:00
|
|
|
for (n = 0; n < 256; n++) {
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4->j = (arc4->j + arc4->sbox[n] + key[n]) % 256;
|
|
|
|
arc4_swap(&arc4->sbox[n], &arc4->sbox[arc4->j]);
|
1999-11-28 17:51:09 +00:00
|
|
|
}
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4->i = arc4->j = 0;
|
2001-08-30 01:15:25 +00:00
|
|
|
/* Reset for next reseed cycle. */
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4->t_reseed = tv_now.tv_sec + ARC4_RESEED_SECONDS;
|
|
|
|
arc4->numruns = 0;
|
2003-08-15 06:34:47 +00:00
|
|
|
/*
|
2008-07-25 15:53:32 +00:00
|
|
|
* Throw away the first N words of output, as suggested in the
|
2003-08-15 06:34:47 +00:00
|
|
|
* paper "Weaknesses in the Key Scheduling Algorithm of RC4"
|
2008-07-25 15:53:32 +00:00
|
|
|
* by Fluher, Mantin, and Shamir. (N = 256 in our case.)
|
Huge cleanup of random(4) code.
* 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)
2015-06-30 17:00:45 +00:00
|
|
|
*
|
|
|
|
* http://dl.acm.org/citation.cfm?id=646557.694759
|
2003-08-15 06:34:47 +00:00
|
|
|
*/
|
2008-07-25 15:53:32 +00:00
|
|
|
for (n = 0; n < 256*4; n++)
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4_randbyte(arc4);
|
|
|
|
|
|
|
|
mtx_unlock(&arc4->mtx);
|
1999-11-28 23:39:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize our S-box to its beginning defaults.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
arc4_init(void)
|
|
|
|
{
|
2016-11-25 13:49:33 +00:00
|
|
|
struct arc4_s *arc4;
|
1999-11-28 23:39:49 +00:00
|
|
|
int n;
|
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4inst = malloc((mp_maxid + 1) * sizeof(struct arc4_s),
|
|
|
|
M_ARC4RANDOM, M_NOWAIT | M_ZERO);
|
|
|
|
KASSERT(arc4inst != NULL, ("arc4_init: memory allocation error"));
|
|
|
|
|
|
|
|
ARC4_FOREACH(arc4) {
|
|
|
|
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 = -1;
|
|
|
|
arc4->numruns = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SYSINIT(arc4, SI_SUB_LOCK, SI_ORDER_ANY, arc4_init, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
arc4_uninit(void)
|
|
|
|
{
|
|
|
|
struct arc4_s *arc4;
|
|
|
|
|
|
|
|
ARC4_FOREACH(arc4) {
|
|
|
|
mtx_destroy(&arc4->mtx);
|
|
|
|
}
|
1999-11-28 23:39:49 +00:00
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
free(arc4inst, M_ARC4RANDOM);
|
1999-11-28 17:51:09 +00:00
|
|
|
}
|
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
SYSUNINIT(arc4, SI_SUB_LOCK, SI_ORDER_ANY, arc4_uninit, NULL);
|
|
|
|
|
2003-08-15 06:34:47 +00:00
|
|
|
|
1999-11-28 17:51:09 +00:00
|
|
|
/*
|
|
|
|
* Generate a random byte.
|
|
|
|
*/
|
|
|
|
static u_int8_t
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4_randbyte(struct arc4_s *arc4)
|
1999-11-28 17:51:09 +00:00
|
|
|
{
|
|
|
|
u_int8_t arc4_t;
|
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4->i = (arc4->i + 1) % 256;
|
|
|
|
arc4->j = (arc4->j + arc4->sbox[arc4->i]) % 256;
|
1999-11-28 17:51:09 +00:00
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4_swap(&arc4->sbox[arc4->i], &arc4->sbox[arc4->j]);
|
1999-11-28 17:51:09 +00:00
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
arc4_t = (arc4->sbox[arc4->i] + arc4->sbox[arc4->j]) % 256;
|
|
|
|
return arc4->sbox[arc4_t];
|
1999-11-28 17:51:09 +00:00
|
|
|
}
|
|
|
|
|
2003-08-15 06:34:47 +00:00
|
|
|
/*
|
|
|
|
* MPSAFE
|
|
|
|
*/
|
2002-10-11 13:13:08 +00:00
|
|
|
void
|
|
|
|
arc4rand(void *ptr, u_int len, int reseed)
|
1999-11-28 17:51:09 +00:00
|
|
|
{
|
2002-10-11 13:13:08 +00:00
|
|
|
u_char *p;
|
|
|
|
struct timeval tv;
|
2016-11-25 13:49:33 +00:00
|
|
|
struct arc4_s *arc4;
|
1999-11-28 17:51:09 +00:00
|
|
|
|
2016-11-25 13:49:33 +00:00
|
|
|
if (reseed || atomic_cmpset_int(&arc4rand_iniseed_state,
|
|
|
|
ARC4_ENTR_HAVE, ARC4_ENTR_SEED)) {
|
|
|
|
ARC4_FOREACH(arc4)
|
|
|
|
arc4_randomstir(arc4);
|
|
|
|
}
|
|
|
|
|
|
|
|
arc4 = &arc4inst[curcpu];
|
2002-10-11 13:13:08 +00:00
|
|
|
getmicrouptime(&tv);
|
2016-11-25 13:49:33 +00:00
|
|
|
if ((arc4->numruns > ARC4_RESEED_BYTES) ||
|
|
|
|
(tv.tv_sec > arc4->t_reseed))
|
|
|
|
arc4_randomstir(arc4);
|
|
|
|
|
|
|
|
mtx_lock(&arc4->mtx);
|
|
|
|
arc4->numruns += len;
|
2002-10-11 13:13:08 +00:00
|
|
|
p = ptr;
|
|
|
|
while (len--)
|
2016-11-25 13:49:33 +00:00
|
|
|
*p++ = arc4_randbyte(arc4);
|
|
|
|
mtx_unlock(&arc4->mtx);
|
2002-10-11 13:13:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t
|
|
|
|
arc4random(void)
|
|
|
|
{
|
|
|
|
uint32_t ret;
|
1999-11-28 17:51:09 +00:00
|
|
|
|
2002-10-11 13:13:08 +00:00
|
|
|
arc4rand(&ret, sizeof ret, 0);
|
1999-11-28 17:51:09 +00:00
|
|
|
return ret;
|
|
|
|
}
|