diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-04 22:15:36 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-04 22:25:40 -0400 |
| commit | d13bbb2955f899f10be4ab315ad229d2951fdcda (patch) | |
| tree | d84a27d61361ac6b884c8c6decabfbaed02a7be0 /linux | |
| parent | be02db130bf75c28e402d890f4d994f3608707ff (diff) | |
Update bcachefs sources to d83b992f65 bcachefs: Rewrite journal_seq_blacklist machinery
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/crypto/chacha20_generic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/crypto/chacha20_generic.c b/linux/crypto/chacha20_generic.c index c6f14945..914189e7 100644 --- a/linux/crypto/chacha20_generic.c +++ b/linux/crypto/chacha20_generic.c @@ -17,7 +17,7 @@ #include <linux/crypto.h> #include <crypto/algapi.h> -#include <crypto/chacha20.h> +#include <crypto/chacha.h> #include <crypto/skcipher.h> #include <sodium/crypto_stream_chacha20.h> @@ -36,7 +36,7 @@ static int crypto_chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key, container_of(tfm, struct chacha20_tfm, tfm); int i; - if (keysize != CHACHA20_KEY_SIZE) + if (keysize != CHACHA_KEY_SIZE) return -EINVAL; for (i = 0; i < ARRAY_SIZE(ctx->key); i++) @@ -72,8 +72,8 @@ static int crypto_chacha20_crypt(struct skcipher_request *req) if (sg_is_last(sg)) break; - BUG_ON(sg->length % CHACHA20_BLOCK_SIZE); - iv[0] += sg->length / CHACHA20_BLOCK_SIZE; + BUG_ON(sg->length % CHACHA_BLOCK_SIZE); + iv[0] += sg->length / CHACHA_BLOCK_SIZE; sg = sg_next(sg); }; @@ -93,8 +93,8 @@ static void *crypto_chacha20_alloc_tfm(void) tfm->tfm.setkey = crypto_chacha20_setkey; tfm->tfm.encrypt = crypto_chacha20_crypt; tfm->tfm.decrypt = crypto_chacha20_crypt; - tfm->tfm.ivsize = CHACHA20_IV_SIZE; - tfm->tfm.keysize = CHACHA20_KEY_SIZE; + tfm->tfm.ivsize = CHACHA_IV_SIZE; + tfm->tfm.keysize = CHACHA_KEY_SIZE; return tfm; } |