From: Andrei Botila <andrei.botila@oss.nxp.com>
To: Horia Geanta <horia.geanta@nxp.com>,
Aymen Sghaier <aymen.sghaier@nxp.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 06/12] crypto: caam/qi2 - add support for more XTS key lengths
Date: Mon, 21 Sep 2020 10:31:59 +0300 [thread overview]
Message-ID: <20200921073205.24742-7-andrei.botila@oss.nxp.com> (raw)
In-Reply-To: <20200921073205.24742-1-andrei.botila@oss.nxp.com>
From: Andrei Botila <andrei.botila@nxp.com>
CAAM accelerator only supports XTS-AES-128 and XTS-AES-256 since
it adheres strictly to the standard. All the other key lengths
are accepted and processed through a fallback as long as they pass
the xts_verify_key() checks.
Fixes: 226853ac3ebe ("crypto: caam/qi2 - add skcipher algorithms")
Cc: <stable@vger.kernel.org> # v4.20+
Signed-off-by: Andrei Botila <andrei.botila@nxp.com>
---
drivers/crypto/caam/caamalg_qi2.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamalg_qi2.c
index 2e37e6e63c8c..5d2e554774c9 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -19,6 +19,7 @@
#include <linux/fsl/mc.h>
#include <soc/fsl/dpaa2-io.h>
#include <soc/fsl/dpaa2-fd.h>
+#include <crypto/xts.h>
#include <asm/unaligned.h>
#define CAAM_CRA_PRIORITY 2000
@@ -81,6 +82,7 @@ struct caam_ctx {
struct alginfo adata;
struct alginfo cdata;
unsigned int authsize;
+ bool xts_key_fallback;
struct crypto_skcipher *fallback;
};
@@ -1060,11 +1062,15 @@ static int xts_skcipher_setkey(struct crypto_skcipher *skcipher, const u8 *key,
u32 *desc;
int err;
- if (keylen != 2 * AES_MIN_KEY_SIZE && keylen != 2 * AES_MAX_KEY_SIZE) {
+ err = xts_verify_key(skcipher, key, keylen);
+ if (err) {
dev_dbg(dev, "key size mismatch\n");
- return -EINVAL;
+ return err;
}
+ if (keylen != 2 * AES_KEYSIZE_128 && keylen != 2 * AES_KEYSIZE_256)
+ ctx->xts_key_fallback = true;
+
err = crypto_skcipher_setkey(ctx->fallback, key, keylen);
if (err)
return err;
@@ -1472,7 +1478,8 @@ static int skcipher_encrypt(struct skcipher_request *req)
if (!req->cryptlen)
return 0;
- if (ctx->fallback && xts_skcipher_ivsize(req)) {
+ if (ctx->fallback && (xts_skcipher_ivsize(req) ||
+ ctx->xts_key_fallback)) {
skcipher_request_set_tfm(&caam_req->fallback_req, ctx->fallback);
skcipher_request_set_callback(&caam_req->fallback_req,
req->base.flags,
@@ -1515,7 +1522,8 @@ static int skcipher_decrypt(struct skcipher_request *req)
if (!req->cryptlen)
return 0;
- if (ctx->fallback && xts_skcipher_ivsize(req)) {
+ if (ctx->fallback && (xts_skcipher_ivsize(req) ||
+ ctx->xts_key_fallback)) {
skcipher_request_set_tfm(&caam_req->fallback_req, ctx->fallback);
skcipher_request_set_callback(&caam_req->fallback_req,
req->base.flags,
--
2.17.1
next prev parent reply other threads:[~2020-09-21 7:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 7:31 [PATCH v2 00/12] crypto: caam - xts(aes) updates Andrei Botila
2020-09-21 7:31 ` [PATCH v2 01/12] crypto: caam/jr - add fallback for XTS with more than 8B IV Andrei Botila
2020-09-21 11:46 ` Horia Geantă
2020-09-21 7:31 ` [PATCH v2 02/12] crypto: caam/qi " Andrei Botila
2020-09-21 7:31 ` [PATCH v2 03/12] crypto: caam/qi2 " Andrei Botila
2020-09-21 7:31 ` [PATCH v2 04/12] crypto: caam/jr - add support for more XTS key lengths Andrei Botila
2020-09-21 7:31 ` [PATCH v2 05/12] crypto: caam/qi " Andrei Botila
2020-09-21 7:31 ` Andrei Botila [this message]
2020-09-21 7:32 ` [PATCH v2 07/12] crypto: caam/jr - add xts check for block length equal to zero Andrei Botila
2020-09-21 7:32 ` [PATCH v2 08/12] crypto: caam/qi " Andrei Botila
2020-09-21 7:32 ` [PATCH v2 09/12] crypto: caam/qi2 " Andrei Botila
2020-09-21 7:32 ` [PATCH v2 10/12] crypto: caam/jr - add support for XTS with 16B IV Andrei Botila
2020-09-21 7:32 ` [PATCH v2 11/12] crypto: caam/qi " Andrei Botila
2020-09-21 7:32 ` [PATCH v2 12/12] crypto: caam/qi2 " Andrei Botila
2020-09-21 11:46 ` [PATCH v2 00/12] crypto: caam - xts(aes) updates Horia Geantă
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=20200921073205.24742-7-andrei.botila@oss.nxp.com \
--to=andrei.botila@oss.nxp.com \
--cc=aymen.sghaier@nxp.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=horia.geanta@nxp.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®