From: Eric Biggers <ebiggers@kernel.org>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Linux Crypto Mailing List <linux-crypto@vger.kernel.org>
Subject: Re: [PATCH] crypto: chacha - Add DEFINE_CHACHA_STATE macro
Date: Mon, 6 Jul 2020 12:07:17 -0700 [thread overview]
Message-ID: <20200706190717.GB736284@gmail.com> (raw)
In-Reply-To: <20200706133733.GA6479@gondor.apana.org.au>
On Mon, Jul 06, 2020 at 11:37:34PM +1000, Herbert Xu wrote:
> diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c
> index ad0699ce702f9..1d7bb0b91b83c 100644
> --- a/lib/crypto/chacha20poly1305.c
> +++ b/lib/crypto/chacha20poly1305.c
> @@ -94,7 +94,7 @@ void chacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,
> const u64 nonce,
> const u8 key[CHACHA20POLY1305_KEY_SIZE])
> {
> - u32 chacha_state[CHACHA_STATE_WORDS];
> + DEFINE_CHACHA_STATE(chacha_state);
> u32 k[CHACHA_KEY_WORDS];
> __le64 iv[2];
>
> @@ -116,7 +116,7 @@ void xchacha20poly1305_encrypt(u8 *dst, const u8 *src, const size_t src_len,
> const u8 nonce[XCHACHA20POLY1305_NONCE_SIZE],
> const u8 key[CHACHA20POLY1305_KEY_SIZE])
> {
> - u32 chacha_state[CHACHA_STATE_WORDS];
> + DEFINE_CHACHA_STATE(chacha_state);
>
> xchacha_init(chacha_state, key, nonce);
> __chacha20poly1305_encrypt(dst, src, src_len, ad, ad_len, chacha_state);
> @@ -172,7 +172,7 @@ bool chacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len,
> const u64 nonce,
> const u8 key[CHACHA20POLY1305_KEY_SIZE])
> {
> - u32 chacha_state[CHACHA_STATE_WORDS];
> + DEFINE_CHACHA_STATE(chacha_state);
> u32 k[CHACHA_KEY_WORDS];
> __le64 iv[2];
> bool ret;
> @@ -198,7 +198,7 @@ bool xchacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len,
> const u8 nonce[XCHACHA20POLY1305_NONCE_SIZE],
> const u8 key[CHACHA20POLY1305_KEY_SIZE])
> {
> - u32 chacha_state[CHACHA_STATE_WORDS];
> + DEFINE_CHACHA_STATE(chacha_state);
>
> xchacha_init(chacha_state, key, nonce);
> return __chacha20poly1305_decrypt(dst, src, src_len, ad, ad_len,
> @@ -216,7 +216,7 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src,
> {
> const u8 *pad0 = page_address(ZERO_PAGE(0));
> struct poly1305_desc_ctx poly1305_state;
> - u32 chacha_state[CHACHA_STATE_WORDS];
> + DEFINE_CHACHA_STATE(chacha_state);
> struct sg_mapping_iter miter;
> size_t partial = 0;
> unsigned int flags;
This changes chacha_state to be a pointer, which breaks clearing the state
because that uses sizeof(chacha_state):
memzero_explicit(chacha_state, sizeof(chacha_state));
It would need to be changed to use CHACHA_BLOCK_SIZE.
- Eric
next prev parent reply other threads:[~2020-07-06 19:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 13:37 [PATCH] crypto: chacha - Add DEFINE_CHACHA_STATE macro Herbert Xu
2020-07-06 19:07 ` Eric Biggers [this message]
2020-07-06 22:37 ` [v2 PATCH] " Herbert Xu
2020-07-08 2:31 ` Eric Biggers
2020-07-08 2:44 ` [v3 " Herbert Xu
2020-07-08 5:46 ` Ard Biesheuvel
2020-07-08 6:28 ` Ard Biesheuvel
2020-07-08 6:54 ` Martin Willi
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=20200706190717.GB736284@gmail.com \
--to=ebiggers@kernel.org \
--cc=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.