From: "Herbert Xu" <herbert@gondor.apana.org.au>
To: Ard Biesheuvel <ardb@kernel.org>,
Stephan Mueller <smueller@chronox.de>,
Linux Crypto Mailing List <linux-crypto@vger.kernel.org>,
Eric Biggers <ebiggers@kernel.org>
Subject: [v3 PATCH 17/31] crypto: ctr - Allow rfc3686 to be chained
Date: Tue, 28 Jul 2020 17:19:17 +1000 [thread overview]
Message-ID: <E1k0JtN-0006Qt-8G@fornost.hmeau.com> (raw)
In-Reply-To: 20200728071746.GA22352@gondor.apana.org.au
As it stands rfc3686 cannot do chaining. That is, it has to handle
each request as a whole. This patch adds support for chaining when
the CRYPTO_TFM_REQ_MORE flag is set.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
crypto/ctr.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/crypto/ctr.c b/crypto/ctr.c
index c39fcffba27f5..eccfab07f2fbb 100644
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -5,7 +5,6 @@
* (C) Copyright IBM Corp. 2007 - Joy Latten <latten@us.ibm.com>
*/
-#include <crypto/algapi.h>
#include <crypto/ctr.h>
#include <crypto/internal/skcipher.h>
#include <linux/err.h>
@@ -21,7 +20,8 @@ struct crypto_rfc3686_ctx {
struct crypto_rfc3686_req_ctx {
u8 iv[CTR_RFC3686_BLOCK_SIZE];
- struct skcipher_request subreq CRYPTO_MINALIGN_ATTR;
+ bool init;
+ struct skcipher_request subreq;
};
static void crypto_ctr_crypt_final(struct skcipher_walk *walk,
@@ -197,6 +197,9 @@ static int crypto_rfc3686_crypt(struct skcipher_request *req)
struct skcipher_request *subreq = &rctx->subreq;
u8 *iv = rctx->iv;
+ if (rctx->init)
+ goto skip_init;
+
/* set up counter block */
memcpy(iv, ctx->nonce, CTR_RFC3686_NONCE_SIZE);
memcpy(iv + CTR_RFC3686_NONCE_SIZE, req->iv, CTR_RFC3686_IV_SIZE);
@@ -205,6 +208,9 @@ static int crypto_rfc3686_crypt(struct skcipher_request *req)
*(__be32 *)(iv + CTR_RFC3686_NONCE_SIZE + CTR_RFC3686_IV_SIZE) =
cpu_to_be32(1);
+skip_init:
+ rctx->init = req->base.flags & CRYPTO_TFM_REQ_MORE;
+
skcipher_request_set_tfm(subreq, child);
skcipher_request_set_callback(subreq, req->base.flags,
req->base.complete, req->base.data);
next prev parent reply other threads:[~2020-07-28 7:19 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 7:17 [v3 PATCH 0/31] crypto: skcipher - Add support for no chaining and partial chaining Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 1/31] crypto: skcipher - Add final chunk size field for chaining Herbert Xu
2020-07-28 17:15 ` Eric Biggers
2020-07-28 17:22 ` Herbert Xu
2020-07-28 17:26 ` Ard Biesheuvel
2020-07-28 17:30 ` Herbert Xu
2020-07-28 17:46 ` Ard Biesheuvel
2020-07-28 22:12 ` Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 2/31] crypto: algif_skcipher - Add support for final_chunksize Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 3/31] crypto: cts - Add support for chaining Herbert Xu
2020-07-28 11:05 ` Ard Biesheuvel
2020-07-28 11:53 ` Herbert Xu
2020-07-28 11:59 ` Ard Biesheuvel
2020-07-28 12:03 ` Herbert Xu
2020-07-28 12:08 ` Ard Biesheuvel
2020-07-28 12:19 ` Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 4/31] crypto: arm64/aes-glue - Add support for chaining CTS Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 5/31] crypto: nitrox " Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 6/31] crypto: ccree " Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 7/31] crypto: skcipher - Add alg reqsize field Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 8/31] crypto: skcipher - Initialise requests to zero Herbert Xu
2020-07-28 17:10 ` Eric Biggers
2020-07-29 3:38 ` Herbert Xu
2020-07-28 7:18 ` [v3 PATCH 9/31] crypto: cryptd - Add support for chaining Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 10/31] crypto: chacha-generic " Herbert Xu
2020-08-10 15:20 ` Horia Geantă
2020-08-11 0:57 ` Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 11/31] crypto: arm/chacha " Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 12/31] crypto: arm64/chacha " Herbert Xu
2020-07-29 6:16 ` Ard Biesheuvel
2020-07-29 6:28 ` Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 13/31] crypto: mips/chacha " Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 14/31] crypto: x86/chacha " Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 15/31] crypto: inside-secure - Set final_chunksize on chacha Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 16/31] crypto: caam/qi2 " Herbert Xu
2020-08-10 15:24 ` Horia Geantă
2020-07-28 7:19 ` Herbert Xu [this message]
2020-07-28 7:19 ` [v3 PATCH 18/31] crypto: crypto4xx - Remove rfc3686 implementation Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 19/31] crypto: caam - Remove rfc3686 implementations Herbert Xu
2020-08-10 16:47 ` Horia Geantă
2020-08-11 0:59 ` Herbert Xu
2020-08-11 7:32 ` Horia Geantă
2020-08-11 7:34 ` Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 20/31] crypto: nitrox - Set final_chunksize on rfc3686 Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 21/31] crypto: ccp - Remove rfc3686 implementation Herbert Xu
2020-08-06 19:16 ` John Allen
2020-07-28 7:19 ` [v3 PATCH 22/31] crypto: chelsio " Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 23/31] crypto: inside-secure - Set final_chunksize on rfc3686 Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 24/31] crypto: ixp4xx - Remove rfc3686 implementation Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 25/31] crypto: nx - Set final_chunksize on rfc3686 Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 26/31] crypto: essiv - Set final_chunksize Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 27/31] crypto: simd - Add support for chaining Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 28/31] crypto: arm64/essiv - Set final_chunksize Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 29/31] crypto: ccree - Set final_chunksize on essiv Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 30/31] crypto: kw - Set final_chunksize Herbert Xu
2020-07-28 7:19 ` [v3 PATCH 31/31] crypto: salsa20-generic - dd support for chaining Herbert Xu
2020-07-28 17:19 ` [v3 PATCH 0/31] crypto: skcipher - Add support for no chaining and partial chaining Eric Biggers
2020-07-29 3:40 ` Herbert Xu
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=E1k0JtN-0006Qt-8G@fornost.hmeau.com \
--to=herbert@gondor.apana.org.au \
--cc=ardb@kernel.org \
--cc=ebiggers@kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=smueller@chronox.de \
/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;
as well as URLs for NNTP newsgroup(s).