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 03/12] crypto: axis - fix CTR output IV
Date: Tue, 10 Jan 2023 14:50:33 +0100 [thread overview]
Message-ID: <20230110135042.2940847-4-vincent.whitchurch@axis.com> (raw)
In-Reply-To: <20230110135042.2940847-1-vincent.whitchurch@axis.com>
Write the updated counter value to the IV with software since the
hardware does not do it. Fixes this self test:
alg: skcipher: artpec6-ctr-aes encryption test failed (wrong output IV)
on test vector 0, cfg="in-place (one sglist)"
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
---
drivers/crypto/axis/artpec6_crypto.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/artpec6_crypto.c
index d3b6ee065a81..67f510c497f2 100644
--- a/drivers/crypto/axis/artpec6_crypto.c
+++ b/drivers/crypto/axis/artpec6_crypto.c
@@ -370,6 +370,8 @@ artpec6_crypto_complete_cbc_encrypt(struct crypto_async_request *req);
static void
artpec6_crypto_complete_cbc_decrypt(struct crypto_async_request *req);
static void
+artpec6_crypto_complete_ctr(struct crypto_async_request *req);
+static void
artpec6_crypto_complete_aead(struct crypto_async_request *req);
static void
artpec6_crypto_complete_hash(struct crypto_async_request *req);
@@ -1109,6 +1111,9 @@ static int artpec6_crypto_encrypt(struct skcipher_request *req)
case ARTPEC6_CRYPTO_CIPHER_AES_CBC:
complete = artpec6_crypto_complete_cbc_encrypt;
break;
+ case ARTPEC6_CRYPTO_CIPHER_AES_CTR:
+ complete = artpec6_crypto_complete_ctr;
+ break;
default:
complete = artpec6_crypto_complete_crypto;
break;
@@ -1155,6 +1160,9 @@ static int artpec6_crypto_decrypt(struct skcipher_request *req)
case ARTPEC6_CRYPTO_CIPHER_AES_CBC:
complete = artpec6_crypto_complete_cbc_decrypt;
break;
+ case ARTPEC6_CRYPTO_CIPHER_AES_CTR:
+ complete = artpec6_crypto_complete_ctr;
+ break;
default:
complete = artpec6_crypto_complete_crypto;
break;
@@ -2158,6 +2166,20 @@ static void artpec6_crypto_complete_crypto(struct crypto_async_request *req)
req->complete(req, 0);
}
+static void artpec6_crypto_complete_ctr(struct crypto_async_request *req)
+{
+ struct skcipher_request *cipher_req = container_of(req,
+ struct skcipher_request, base);
+ unsigned int nblks = ALIGN(cipher_req->cryptlen, AES_BLOCK_SIZE) /
+ AES_BLOCK_SIZE;
+ __be32 *iv = (void *)cipher_req->iv;
+ unsigned int counter = be32_to_cpu(iv[3]);
+
+ iv[3] = cpu_to_be32(counter + nblks);
+
+ req->complete(req, 0);
+}
+
static void
artpec6_crypto_complete_cbc_decrypt(struct crypto_async_request *req)
{
--
2.34.1
next prev parent reply other threads:[~2023-01-10 13:51 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 ` Vincent Whitchurch [this message]
2023-01-10 13:50 ` [PATCH 04/12] crypto: axis - fix in-place CBC output IV 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 ` [PATCH 10/12] crypto: axis - fix XTS unaligned block size handling Vincent Whitchurch
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-4-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®