From: Herbert Xu <herbert@gondor.apana.org.au>
To: Linux Crypto Mailing List <linux-crypto@vger.kernel.org>
Subject: [PATCH 09/15] crypto: chacha-generic - Convert from skcipher to lskcipher
Date: Wed, 6 Dec 2023 13:49:32 +0800 [thread overview]
Message-ID: <1585df67b3f356eba2c23ac9f36c7181432d191e.1707815065.git.herbert@gondor.apana.org.au> (raw)
In-Reply-To: <cover.1707815065.git.herbert@gondor.apana.org.au>
Replace skcipher implementation with lskcipher.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
crypto/chacha_generic.c | 161 ++++++++++++++++---------------
include/crypto/internal/chacha.h | 22 ++++-
2 files changed, 100 insertions(+), 83 deletions(-)
diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c
index 8beea79ab117..6500fa570ddc 100644
--- a/crypto/chacha_generic.c
+++ b/crypto/chacha_generic.c
@@ -7,122 +7,127 @@
*/
#include <asm/unaligned.h>
-#include <crypto/algapi.h>
#include <crypto/internal/chacha.h>
-#include <crypto/internal/skcipher.h>
+#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/string.h>
-static int chacha_stream_xor(struct skcipher_request *req,
- const struct chacha_ctx *ctx, const u8 *iv)
+static int chacha_stream_xor(const struct chacha_ctx *ctx, const u8 *src,
+ u8 *dst, unsigned nbytes, u8 *siv, u32 flags)
{
- struct skcipher_walk walk;
- u32 state[16];
- int err;
+ u32 *state = (u32 *)(siv + CHACHA_IV_SIZE);
+ unsigned len = nbytes;
- err = skcipher_walk_virt(&walk, req, false);
+ if (!(flags & CRYPTO_LSKCIPHER_FLAG_CONT))
+ chacha_init_generic(state, ctx->key, siv);
- chacha_init_generic(state, ctx->key, iv);
+ if (!(flags & CRYPTO_LSKCIPHER_FLAG_FINAL))
+ len = round_down(len, CHACHA_BLOCK_SIZE);
- while (walk.nbytes > 0) {
- unsigned int nbytes = walk.nbytes;
+ chacha_crypt_generic(state, dst, src, len, ctx->nrounds);
- if (nbytes < walk.total)
- nbytes = round_down(nbytes, CHACHA_BLOCK_SIZE);
-
- chacha_crypt_generic(state, walk.dst.virt.addr,
- walk.src.virt.addr, nbytes, ctx->nrounds);
- err = skcipher_walk_done(&walk, walk.nbytes - nbytes);
- }
-
- return err;
+ return nbytes - len;
}
-static int crypto_chacha_crypt(struct skcipher_request *req)
+static int crypto_chacha_crypt(struct crypto_lskcipher *tfm, const u8 *src,
+ u8 *dst, unsigned nbytes, u8 *siv, u32 flags)
{
- struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
- struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
+ const struct chacha_ctx *ctx = crypto_lskcipher_ctx(tfm);
- return chacha_stream_xor(req, ctx, req->iv);
+ return chacha_stream_xor(ctx, src, dst, nbytes, siv, flags);
}
-static int crypto_xchacha_crypt(struct skcipher_request *req)
+static int crypto_xchacha_crypt(struct crypto_lskcipher *tfm, const u8 *src,
+ u8 *dst, unsigned nbytes, u8 *siv, u32 flags)
{
- struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
- struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
+ struct chacha_ctx *ctx = crypto_lskcipher_ctx(tfm);
struct chacha_ctx subctx;
- u32 state[16];
- u8 real_iv[16];
+ u8 *real_iv;
+ u32 *state;
- /* Compute the subkey given the original key and first 128 nonce bits */
- chacha_init_generic(state, ctx->key, req->iv);
- hchacha_block_generic(state, subctx.key, ctx->nrounds);
+ real_iv = siv + XCHACHA_IV_SIZE;
+ state = (u32 *)(real_iv + CHACHA_IV_SIZE);
subctx.nrounds = ctx->nrounds;
- /* Build the real IV */
- memcpy(&real_iv[0], req->iv + 24, 8); /* stream position */
- memcpy(&real_iv[8], req->iv + 16, 8); /* remaining 64 nonce bits */
+ if (flags & CRYPTO_LSKCIPHER_FLAG_CONT)
+ goto out;
+ /* Compute the subkey given the original key and first 128 nonce bits */
+ chacha_init_generic(state, ctx->key, siv);
+ hchacha_block_generic(state, subctx.key, ctx->nrounds);
+
+ /* Build the real IV */
+ memcpy(&real_iv[0], siv + 24, 8); /* stream position */
+ memcpy(&real_iv[8], siv + 16, 8); /* remaining 64 nonce bits */
+
+out:
/* Generate the stream and XOR it with the data */
- return chacha_stream_xor(req, &subctx, real_iv);
+ return chacha_stream_xor(&subctx, src, dst, nbytes, real_iv, flags);
}
-static struct skcipher_alg algs[] = {
+static struct lskcipher_alg algs[] = {
{
- .base.cra_name = "chacha20",
- .base.cra_driver_name = "chacha20-generic",
- .base.cra_priority = 100,
- .base.cra_blocksize = 1,
- .base.cra_ctxsize = sizeof(struct chacha_ctx),
- .base.cra_module = THIS_MODULE,
+ .co.base.cra_name = "chacha20",
+ .co.base.cra_driver_name = "chacha20-generic",
+ .co.base.cra_priority = 100,
+ .co.base.cra_blocksize = 1,
+ .co.base.cra_ctxsize = sizeof(struct chacha_ctx),
+ .co.base.cra_alignmask = __alignof__(u32) - 1,
+ .co.base.cra_module = THIS_MODULE,
- .min_keysize = CHACHA_KEY_SIZE,
- .max_keysize = CHACHA_KEY_SIZE,
- .ivsize = CHACHA_IV_SIZE,
- .chunksize = CHACHA_BLOCK_SIZE,
- .setkey = chacha20_setkey,
- .encrypt = crypto_chacha_crypt,
- .decrypt = crypto_chacha_crypt,
+ .co.min_keysize = CHACHA_KEY_SIZE,
+ .co.max_keysize = CHACHA_KEY_SIZE,
+ .co.ivsize = CHACHA_IV_SIZE,
+ .co.chunksize = CHACHA_BLOCK_SIZE,
+ .co.statesize = 64,
+ .setkey = chacha20_lskcipher_setkey,
+ .encrypt = crypto_chacha_crypt,
+ .decrypt = crypto_chacha_crypt,
}, {
- .base.cra_name = "xchacha20",
- .base.cra_driver_name = "xchacha20-generic",
- .base.cra_priority = 100,
- .base.cra_blocksize = 1,
- .base.cra_ctxsize = sizeof(struct chacha_ctx),
- .base.cra_module = THIS_MODULE,
+ .co.base.cra_name = "xchacha20",
+ .co.base.cra_driver_name = "xchacha20-generic",
+ .co.base.cra_priority = 100,
+ .co.base.cra_blocksize = 1,
+ .co.base.cra_ctxsize = sizeof(struct chacha_ctx),
+ .co.base.cra_alignmask = __alignof__(u32) - 1,
+ .co.base.cra_module = THIS_MODULE,
- .min_keysize = CHACHA_KEY_SIZE,
- .max_keysize = CHACHA_KEY_SIZE,
- .ivsize = XCHACHA_IV_SIZE,
- .chunksize = CHACHA_BLOCK_SIZE,
- .setkey = chacha20_setkey,
- .encrypt = crypto_xchacha_crypt,
- .decrypt = crypto_xchacha_crypt,
+ .co.min_keysize = CHACHA_KEY_SIZE,
+ .co.max_keysize = CHACHA_KEY_SIZE,
+ .co.ivsize = XCHACHA_IV_SIZE,
+ .co.chunksize = CHACHA_BLOCK_SIZE,
+ .co.statesize = 80,
+ .setkey = chacha20_lskcipher_setkey,
+ .encrypt = crypto_xchacha_crypt,
+ .decrypt = crypto_xchacha_crypt,
}, {
- .base.cra_name = "xchacha12",
- .base.cra_driver_name = "xchacha12-generic",
- .base.cra_priority = 100,
- .base.cra_blocksize = 1,
- .base.cra_ctxsize = sizeof(struct chacha_ctx),
- .base.cra_module = THIS_MODULE,
+ .co.base.cra_name = "xchacha12",
+ .co.base.cra_driver_name = "xchacha12-generic",
+ .co.base.cra_priority = 100,
+ .co.base.cra_blocksize = 1,
+ .co.base.cra_ctxsize = sizeof(struct chacha_ctx),
+ .co.base.cra_alignmask = __alignof__(u32) - 1,
+ .co.base.cra_module = THIS_MODULE,
- .min_keysize = CHACHA_KEY_SIZE,
- .max_keysize = CHACHA_KEY_SIZE,
- .ivsize = XCHACHA_IV_SIZE,
- .chunksize = CHACHA_BLOCK_SIZE,
- .setkey = chacha12_setkey,
- .encrypt = crypto_xchacha_crypt,
- .decrypt = crypto_xchacha_crypt,
+ .co.min_keysize = CHACHA_KEY_SIZE,
+ .co.max_keysize = CHACHA_KEY_SIZE,
+ .co.ivsize = XCHACHA_IV_SIZE,
+ .co.chunksize = CHACHA_BLOCK_SIZE,
+ .co.statesize = 80,
+ .setkey = chacha12_lskcipher_setkey,
+ .encrypt = crypto_xchacha_crypt,
+ .decrypt = crypto_xchacha_crypt,
}
};
static int __init chacha_generic_mod_init(void)
{
- return crypto_register_skciphers(algs, ARRAY_SIZE(algs));
+ return crypto_register_lskciphers(algs, ARRAY_SIZE(algs));
}
static void __exit chacha_generic_mod_fini(void)
{
- crypto_unregister_skciphers(algs, ARRAY_SIZE(algs));
+ crypto_unregister_lskciphers(algs, ARRAY_SIZE(algs));
}
subsys_initcall(chacha_generic_mod_init);
diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h
index b085dc1ac151..568c7c7f042f 100644
--- a/include/crypto/internal/chacha.h
+++ b/include/crypto/internal/chacha.h
@@ -5,17 +5,15 @@
#include <crypto/chacha.h>
#include <crypto/internal/skcipher.h>
-#include <linux/crypto.h>
struct chacha_ctx {
u32 key[8];
int nrounds;
};
-static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,
+static inline int chacha_setkey(struct chacha_ctx *ctx, const u8 *key,
unsigned int keysize, int nrounds)
{
- struct chacha_ctx *ctx = crypto_skcipher_ctx(tfm);
int i;
if (keysize != CHACHA_KEY_SIZE)
@@ -31,13 +29,27 @@ static inline int chacha_setkey(struct crypto_skcipher *tfm, const u8 *key,
static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keysize)
{
- return chacha_setkey(tfm, key, keysize, 20);
+ return chacha_setkey(crypto_skcipher_ctx(tfm), key, keysize, 20);
+}
+
+static inline int chacha20_lskcipher_setkey(struct crypto_lskcipher *tfm,
+ const u8 *key,
+ unsigned int keysize)
+{
+ return chacha_setkey(crypto_lskcipher_ctx(tfm), key, keysize, 20);
}
static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
unsigned int keysize)
{
- return chacha_setkey(tfm, key, keysize, 12);
+ return chacha_setkey(crypto_skcipher_ctx(tfm), key, keysize, 12);
+}
+
+static inline int chacha12_lskcipher_setkey(struct crypto_lskcipher *tfm,
+ const u8 *key,
+ unsigned int keysize)
+{
+ return chacha_setkey(crypto_lskcipher_ctx(tfm), key, keysize, 12);
}
#endif /* _CRYPTO_CHACHA_H */
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
next prev parent reply other threads:[~2024-02-13 9:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 9:04 [PATCH 00/15] crypto: Add twopass lskcipher for adiantum Herbert Xu
2023-12-02 4:55 ` [PATCH 01/15] crypto: skcipher - Add tailsize attribute Herbert Xu
2024-02-14 23:44 ` Eric Biggers
2024-02-15 6:40 ` Herbert Xu
2024-02-23 6:01 ` Eric Biggers
2023-12-02 5:42 ` [PATCH 02/15] crypto: algif_skcipher - Add support for tailsize Herbert Xu
2023-12-04 10:24 ` [PATCH 04/15] crypto: xts - Convert from skcipher to lskcipher Herbert Xu
2023-12-05 6:09 ` [PATCH 05/15] crypto: skcipher - Add twopass attribute Herbert Xu
2023-12-05 6:13 ` [PATCH 06/15] crypto: algif_skcipher - Disallow nonincremental algorithms Herbert Xu
2024-02-14 22:56 ` Eric Biggers
2024-02-15 6:47 ` Herbert Xu
2024-02-23 6:00 ` Eric Biggers
2023-12-05 9:52 ` [PATCH 07/15] crypto: adiantum - Use lskcipher instead of cipher Herbert Xu
2023-12-06 4:46 ` [PATCH 08/15] crypto: skcipher - Add incremental support to lskcipher wrapper Herbert Xu
2023-12-06 5:49 ` Herbert Xu [this message]
2024-02-14 23:41 ` [PATCH 09/15] crypto: chacha-generic - Convert from skcipher to lskcipher Eric Biggers
2024-02-15 6:52 ` Herbert Xu
2023-12-06 6:05 ` [PATCH 10/15] crypto: skcipher - Move nesting check into ecb Herbert Xu
2023-12-06 8:55 ` [PATCH 11/15] crypto: skcipher - Propagate zero-length requests to lskcipher Herbert Xu
2023-12-07 10:03 ` [PATCH 03/15] crypto: skcipher - Remove ivsize check for lskcipher simple templates Herbert Xu
2023-12-07 10:13 ` [PATCH 12/15] crypto: cts - Convert from skcipher to lskcipher Herbert Xu
2023-12-29 10:47 ` [PATCH 13/15] crypto: cts,xts - Update parameters blocksize/chunksize/tailsize Herbert Xu
2024-02-14 23:00 ` Eric Biggers
2024-02-15 7:57 ` Herbert Xu
2024-02-23 6:09 ` Eric Biggers
2023-12-30 7:16 ` [PATCH 14/15] crypto: lskcipher - Export incremental interface internally Herbert Xu
2024-02-13 8:48 ` [PATCH 15/15] crypto: adiantum - Convert from skcipher to lskcipher Herbert Xu
2024-02-14 23:35 ` [PATCH 00/15] crypto: Add twopass lskcipher for adiantum Eric Biggers
2024-02-15 8:20 ` Herbert Xu
2024-02-23 6:39 ` Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1585df67b3f356eba2c23ac9f36c7181432d191e.1707815065.git.herbert@gondor.apana.org.au \
--to=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.