[PATCH 6/9] crypto: caam/qi2 - add support for more XTS key lengths

[Andrei Botila]

From: Andrei Botila <andrei.bot...@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: <sta...@vger.kernel.org> # v4.20+
Signed-off-by: Andrei Botila <andrei.bot...@nxp.com>
---
 drivers/crypto/caam/caamalg_qi2.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/caamalg_qi2.c 
b/drivers/crypto/caam/caamalg_qi2.c
index a0b13bf6b528..f2f137f47972 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
@@ -1060,9 +1061,10 @@ 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;
        }
 
        err = crypto_skcipher_setkey(ctx->fallback, key, keylen);
@@ -1475,7 +1477,9 @@ 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->cdata.keylen != 2 * AES_KEYSIZE_128 &&
+                              ctx->cdata.keylen != 2 * AES_KEYSIZE_256))) {
                skcipher_request_set_tfm(&caam_req->fallback_req, 
ctx->fallback);
                skcipher_request_set_callback(&caam_req->fallback_req,
                                              req->base.flags,
@@ -1518,7 +1522,9 @@ 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->cdata.keylen != 2 * AES_KEYSIZE_128 &&
+                              ctx->cdata.keylen != 2 * AES_KEYSIZE_256))) {
                skcipher_request_set_tfm(&caam_req->fallback_req, 
ctx->fallback);
                skcipher_request_set_callback(&caam_req->fallback_req,
                                              req->base.flags,
-- 
2.17.1