Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: crypto: x86/chacha - expose SIMD ChaCha routine as library function

Browse Source 
Wire the existing x86 SIMD ChaCha code into the new ChaCha library
interface, so that users of the library interface will get the
accelerated version when available.

Given that calls into the library API will always go through the
routines in this module if it is enabled, switch to static keys
to select the optimal implementation available (which may be none
at all, in which case we defer to the generic implementation for
all invocations).

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 84e03fa39fbe95a5567d43bff458c6d3b3a23ad1)
Bug: 152722841
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I888d7c807c2c1227195a924895ec68c0377b1771
This commit is contained in:
Ard Biesheuvel
2019-11-08 13:22:10 +01:00
committed by Greg Kroah-Hartman
parent c2674ee0d9
commit 0a524ae566
3 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/crypto/chacha.h
View File

@ -24,6 +24,12 @@
#define CHACHA_KEY_SIZE 32
#define CHACHA_BLOCK_SIZE 64
#ifdef CONFIG_X86_64
#define CHACHA_STATE_WORDS ((CHACHA_BLOCK_SIZE + 12) / sizeof(u32))
#else
#define CHACHA_STATE_WORDS (CHACHA_BLOCK_SIZE / sizeof(u32))
#endif
/* 192-bit nonce, then 64-bit stream position */
#define XCHACHA_IV_SIZE 32