diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-27 15:11:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-27 15:11:55 -0700 |
commit | 818e607b57c94ade9824dad63a96c2ea6b21baf3 (patch) | |
tree | 2c83a38a1d090da464c435486e4a2e6f4afbacd2 /include/crypto | |
parent | ff9a082fda424257976f08fce942609f358015e0 (diff) | |
parent | 86a574de4590ffe6fd3f3ca34cdcf655a78e36ec (diff) | |
download | linux-818e607b57c94ade9824dad63a96c2ea6b21baf3.tar.gz linux-818e607b57c94ade9824dad63a96c2ea6b21baf3.tar.bz2 linux-818e607b57c94ade9824dad63a96c2ea6b21baf3.zip |
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull random driver updates from Ted Ts'o:
"A number of improvements for the /dev/random driver; the most
important is the use of a ChaCha20-based CRNG for /dev/urandom, which
is faster, more efficient, and easier to make scalable for
silly/abusive userspace programs that want to read from /dev/urandom
in a tight loop on NUMA systems.
This set of patches also improves entropy gathering on VM's running on
Microsoft Azure, and will take advantage of a hw random number
generator (if present) to initialize the /dev/urandom pool"
(It turns out that the random tree hadn't been in linux-next this time
around, because it had been dropped earlier as being too quiet. Oh
well).
* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
random: strengthen input validation for RNDADDTOENTCNT
random: add backtracking protection to the CRNG
random: make /dev/urandom scalable for silly userspace programs
random: replace non-blocking pool with a Chacha20-based CRNG
random: properly align get_random_int_hash
random: add interrupt callback to VMBus IRQ handler
random: print a warning for the first ten uninitialized random users
random: initialize the non-blocking pool via add_hwgenerator_randomness()
Diffstat (limited to 'include/crypto')
-rw-r--r-- | include/crypto/chacha20.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/crypto/chacha20.h b/include/crypto/chacha20.h index 274bbaeeed0f..20d20f681a72 100644 --- a/include/crypto/chacha20.h +++ b/include/crypto/chacha20.h @@ -16,6 +16,7 @@ struct chacha20_ctx { u32 key[8]; }; +void chacha20_block(u32 *state, void *stream); void crypto_chacha20_init(u32 *state, struct chacha20_ctx *ctx, u8 *iv); int crypto_chacha20_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keysize); |