44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From c7d6f50650bc31f7bd117fdf6da0402657ba1e30 Mon Sep 17 00:00:00 2001
|
|
From: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
|
Date: Fri, 20 Dec 2019 16:02:13 -0300
|
|
Subject: [PATCH] crypto: qce - fix ctr-aes-qce block, chunk sizes
|
|
|
|
Set blocksize of ctr-aes-qce to 1, so it can operate as a stream cipher,
|
|
adding the definition for chucksize instead, where the underlying block
|
|
size belongs.
|
|
|
|
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
(cherry picked from commit bb5c863b3d3cbd10e80b2ebf409934a091058f54)
|
|
|
|
diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c
|
|
index fee07323f8f9..1f1f40a761fa 100644
|
|
--- a/drivers/crypto/qce/skcipher.c
|
|
+++ b/drivers/crypto/qce/skcipher.c
|
|
@@ -270,6 +270,7 @@ struct qce_skcipher_def {
|
|
const char *name;
|
|
const char *drv_name;
|
|
unsigned int blocksize;
|
|
+ unsigned int chunksize;
|
|
unsigned int ivsize;
|
|
unsigned int min_keysize;
|
|
unsigned int max_keysize;
|
|
@@ -298,7 +299,8 @@ static const struct qce_skcipher_def skcipher_def[] = {
|
|
.flags = QCE_ALG_AES | QCE_MODE_CTR,
|
|
.name = "ctr(aes)",
|
|
.drv_name = "ctr-aes-qce",
|
|
- .blocksize = AES_BLOCK_SIZE,
|
|
+ .blocksize = 1,
|
|
+ .chunksize = AES_BLOCK_SIZE,
|
|
.ivsize = AES_BLOCK_SIZE,
|
|
.min_keysize = AES_MIN_KEY_SIZE,
|
|
.max_keysize = AES_MAX_KEY_SIZE,
|
|
@@ -368,6 +370,7 @@ static int qce_skcipher_register_one(const struct qce_skcipher_def *def,
|
|
def->drv_name);
|
|
|
|
alg->base.cra_blocksize = def->blocksize;
|
|
+ alg->chunksize = def->chunksize;
|
|
alg->ivsize = def->ivsize;
|
|
alg->min_keysize = def->min_keysize;
|
|
alg->max_keysize = def->max_keysize;
|