mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Vincent Whitchurch <vincent.whitchurch@axis.com>
To: <herbert@gondor.apana.org.au>, <davem@davemloft.net>,
	<jesper.nilsson@axis.com>, <lars.persson@axis.com>
Cc: <kernel@axis.com>,
	Vincent Whitchurch <vincent.whitchurch@axis.com>,
	<linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 10/12] crypto: axis - fix XTS unaligned block size handling
Date: Tue, 10 Jan 2023 14:50:40 +0100	[thread overview]
Message-ID: <20230110135042.2940847-11-vincent.whitchurch@axis.com> (raw)
In-Reply-To: <20230110135042.2940847-1-vincent.whitchurch@axis.com>

The hardware does not implement ciphertext stealing so fallback to
software if the data length is not aligned to the block size.  Fixes
this kind of errors with CRYPTO_MANAGER_EXTRA_TESTS:

 alg: skcipher: artpec6-xts-aes encryption test failed (wrong result) on
 test vector "random: len=151 klen=64", cfg="random: inplace_two_sglists
 use_digest nosimd src_divs=[96.95%@+1949, 3.5%@+30]"

Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
---
 drivers/crypto/axis/artpec6_crypto.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
index 3b47faa06606..5eccb5a3a52e 100644
--- a/drivers/crypto/axis/artpec6_crypto.c
+++ b/drivers/crypto/axis/artpec6_crypto.c
@@ -1309,6 +1309,24 @@ static int artpec6_crypto_ctr_decrypt(struct skcipher_request *req)
 	return artpec6_crypto_ctr_crypt(req, false);
 }
 
+static int artpec6_crypto_xts_encrypt(struct skcipher_request *req)
+{
+	/* Hardware does not implement ciphertext stealing */
+	if (!IS_ALIGNED(req->cryptlen, AES_BLOCK_SIZE))
+		return artpec6_crypto_crypt_fallback(req, true);
+
+	return artpec6_crypto_encrypt(req);
+}
+
+static int artpec6_crypto_xts_decrypt(struct skcipher_request *req)
+{
+	/* Hardware does not implement ciphertext stealing */
+	if (!IS_ALIGNED(req->cryptlen, AES_BLOCK_SIZE))
+		return artpec6_crypto_crypt_fallback(req, false);
+
+	return artpec6_crypto_decrypt(req);
+}
+
 /*
  * AEAD functions
  */
@@ -2928,8 +2946,8 @@ static struct skcipher_alg crypto_algos[] = {
 		.max_keysize = 2*AES_MAX_KEY_SIZE,
 		.ivsize = 16,
 		.setkey = artpec6_crypto_xts_set_key,
-		.encrypt = artpec6_crypto_encrypt,
-		.decrypt = artpec6_crypto_decrypt,
+		.encrypt = artpec6_crypto_xts_encrypt,
+		.decrypt = artpec6_crypto_xts_decrypt,
 		.init = artpec6_crypto_aes_xts_init,
 		.exit = artpec6_crypto_aes_exit,
 	},
-- 
2.34.1


  parent reply	other threads:[~2023-01-10 13:52 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-10 13:50 [PATCH 00/12] crypto: axis - make tests pass Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 01/12] crypto: axis - do not DMA to ahash_request.result Vincent Whitchurch
2023-01-20  9:09   ` Herbert Xu
2023-01-27 15:35     ` Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 02/12] crypto: axis - do not DMA to IV Vincent Whitchurch
2023-01-20  9:11   ` Herbert Xu
2023-01-27 15:39     ` Vincent Whitchurch
2023-01-30  7:29       ` Herbert Xu
2023-01-10 13:50 ` [PATCH 03/12] crypto: axis - fix CTR output IV Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 04/12] crypto: axis - fix in-place CBC " Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 05/12] crypto: axis - validate AEAD authsize Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 06/12] crypto: axis - reject invalid sizes Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 07/12] crypto: axis - fix XTS blocksize Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 08/12] crypto: axis - add skcipher fallback Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 09/12] crypto: axis - add fallback for AEAD Vincent Whitchurch
2023-01-10 13:50 ` Vincent Whitchurch [this message]
2023-01-10 13:50 ` [PATCH 11/12] crypto: axis - handle zero cryptlen Vincent Whitchurch
2023-01-10 13:50 ` [PATCH 12/12] crypto: axis - allow small size for AEAD Vincent Whitchurch

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=20230110135042.2940847-11-vincent.whitchurch@axis.com \
    --to=vincent.whitchurch@axis.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=jesper.nilsson@axis.com \
    --cc=kernel@axis.com \
    --cc=lars.persson@axis.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®