diff mbox series

crypto: adiantum - propagate CRYPTO_ALG_ASYNC flag to instance

Message ID 20181205004654.242204-1-ebiggers@kernel.org (mailing list archive)
State Accepted
Delegated to: Herbert Xu
Headers show
Series crypto: adiantum - propagate CRYPTO_ALG_ASYNC flag to instance | expand

Commit Message

Eric Biggers Dec. 5, 2018, 12:46 a.m. UTC
From: Eric Biggers <ebiggers@google.com>

If the stream cipher implementation is asynchronous, then the Adiantum
instance must be flagged as asynchronous as well.  Otherwise someone
asking for a synchronous algorithm can get an asynchronous algorithm.

There are no asynchronous xchacha12 or xchacha20 implementations yet
which makes this largely a theoretical issue, but it should be fixed.

Fixes: 059c2a4d8e16 ("crypto: adiantum - add Adiantum support")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 crypto/adiantum.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Herbert Xu Dec. 13, 2018, 10:32 a.m. UTC | #1
On Tue, Dec 04, 2018 at 04:46:54PM -0800, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> If the stream cipher implementation is asynchronous, then the Adiantum
> instance must be flagged as asynchronous as well.  Otherwise someone
> asking for a synchronous algorithm can get an asynchronous algorithm.
> 
> There are no asynchronous xchacha12 or xchacha20 implementations yet
> which makes this largely a theoretical issue, but it should be fixed.
> 
> Fixes: 059c2a4d8e16 ("crypto: adiantum - add Adiantum support")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  crypto/adiantum.c | 2 ++
>  1 file changed, 2 insertions(+)

Patch applied.  Thanks.
diff mbox series

Patch

diff --git a/crypto/adiantum.c b/crypto/adiantum.c
index 2dfcf12fd4529..ca27e0dc2958c 100644
--- a/crypto/adiantum.c
+++ b/crypto/adiantum.c
@@ -590,6 +590,8 @@  static int adiantum_create(struct crypto_template *tmpl, struct rtattr **tb)
 		     hash_alg->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
 		goto out_drop_hash;
 
+	inst->alg.base.cra_flags = streamcipher_alg->base.cra_flags &
+				   CRYPTO_ALG_ASYNC;
 	inst->alg.base.cra_blocksize = BLOCKCIPHER_BLOCK_SIZE;
 	inst->alg.base.cra_ctxsize = sizeof(struct adiantum_tfm_ctx);
 	inst->alg.base.cra_alignmask = streamcipher_alg->base.cra_alignmask |