aboutsummaryrefslogtreecommitdiff
path: root/crypto/Makefile
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2015-06-01 13:43:56 +0200
committerMister Oyster <oysterized@gmail.com>2017-12-14 14:59:50 +0100
commit008fdc5dd47c8bb9b6bde7695fda050e272aac05 (patch)
tree1f5a1a9112aed1b539b6a6b0963b5ed141e5acd9 /crypto/Makefile
parentfc7b1cf3789a8844e28acb8a28745ed8fd0ee281 (diff)
UPSTREAM: crypto: chacha20 - Add a generic ChaCha20 stream cipher implementation
ChaCha20 is a high speed 256-bit key size stream cipher algorithm designed by Daniel J. Bernstein. It is further specified in RFC7539 for use in IETF protocols as a building block for the ChaCha20-Poly1305 AEAD. This is a portable C implementation without any architecture specific optimizations. It uses a 16-byte IV, which includes the 12-byte ChaCha20 nonce prepended by the initial block counter. Some algorithms require an explicit counter value, for example the mentioned AEAD construction. Signed-off-by: Martin Willi <martin@strongswan.org> Acked-by: Steffen Klassert <steffen.klassert@secunet.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit c08d0e647305c3f8f640010a56c9e4bafb9488d3) Change-Id: I5892b1451e46f915c0ed8e711bdded9e6f4a4aae Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'crypto/Makefile')
-rw-r--r--crypto/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index 41607e83e..6690a8964 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -80,6 +80,7 @@ obj-$(CONFIG_CRYPTO_KHAZAD) += khazad.o
obj-$(CONFIG_CRYPTO_ANUBIS) += anubis.o
obj-$(CONFIG_CRYPTO_SEED) += seed.o
obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o
+obj-$(CONFIG_CRYPTO_CHACHA20) += chacha20_generic.o
obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o