crypto: chacha20-generic - refactor to allow varying number of rounds
In preparation for adding XChaCha12 support, rename/refactor chacha20-generic to support different numbers of rounds. The justification for needing XChaCha12 support is explained in more detail in the patch "crypto: chacha - add XChaCha12 support". The only difference between ChaCha{8,12,20} are the number of rounds itself; all other parts of the algorithm are the same. Therefore, remove the "20" from all definitions, structures, functions, files, etc. that will be shared by all ChaCha versions. Also make ->setkey() store the round count in the chacha_ctx (previously chacha20_ctx). The generic code then passes the round count through to chacha_block(). There will be a ->setkey() function for each explicitly allowed round count; the encrypt/decrypt functions will be the same. I decided not to do it the opposite way (same ->setkey() function for all round counts, with different encrypt/decrypt functions) because that would have required more boilerplate code in architecture-specific implementations of ChaCha and XChaCha. Reviewed-by:Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by:
Martin Willi <martin@strongswan.org> Signed-off-by:
Eric Biggers <ebiggers@google.com> Signed-off-by:
Herbert Xu <herbert@gondor.apana.org.au>
Showing
- arch/arm/crypto/chacha20-neon-glue.c 20 additions, 20 deletionsarch/arm/crypto/chacha20-neon-glue.c
- arch/arm64/crypto/chacha20-neon-glue.c 20 additions, 20 deletionsarch/arm64/crypto/chacha20-neon-glue.c
- arch/x86/crypto/chacha20_glue.c 24 additions, 24 deletionsarch/x86/crypto/chacha20_glue.c
- crypto/Makefile 1 addition, 1 deletioncrypto/Makefile
- crypto/chacha20poly1305.c 5 additions, 5 deletionscrypto/chacha20poly1305.c
- crypto/chacha_generic.c 59 additions, 51 deletionscrypto/chacha_generic.c
- drivers/char/random.c 25 additions, 26 deletionsdrivers/char/random.c
- drivers/crypto/caam/caamalg.c 1 addition, 1 deletiondrivers/crypto/caam/caamalg.c
- drivers/crypto/caam/caamalg_qi2.c 4 additions, 4 deletionsdrivers/crypto/caam/caamalg_qi2.c
- drivers/crypto/caam/compat.h 1 addition, 1 deletiondrivers/crypto/caam/compat.h
- include/crypto/chacha.h 47 additions, 0 deletionsinclude/crypto/chacha.h
- lib/Makefile 1 addition, 1 deletionlib/Makefile
- lib/chacha.c 24 additions, 19 deletionslib/chacha.c
Loading
Please register or sign in to comment