From: "Horia Geantă" <horia.geanta@nxp.com>
To: David Gstir <david@sigma-star.at>,
Dan Douglass <dan.douglass@nxp.com>,
"herbert@gondor.apana.org.au" <herbert@gondor.apana.org.au>,
"davem@davemloft.net" <davem@davemloft.net>
Cc: "richard@sigma-star.at" <richard@sigma-star.at>,
"linux-crypto@vger.kernel.org" <linux-crypto@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [RFC PATCH 1/2] crypto: caam - properly set IV after {en,de}crypt
Date: Mon, 19 Jun 2017 10:31:27 +0000 [thread overview]
Message-ID: <VI1PR0401MB2591177E3F43DEFA8AEA3D6D98C40@VI1PR0401MB2591.eurprd04.prod.outlook.com> (raw)
In-Reply-To: 20170602122446.2427-2-david@sigma-star.at
On 6/2/2017 3:25 PM, David Gstir wrote:
> Certain cipher modes like CTS expect the IV (req->info) of
> ablkcipher_request (or equivalently req->iv of skcipher_request) to
> contain the last ciphertext block when the {en,de}crypt operation is done.
> This is currently not the case for the CAAM driver which in turn breaks
> e.g. cts(cbc(aes)) when the CAAM driver is enabled.
>
> This patch fixes the CAAM driver to properly set the IV after the
> {en,de}crypt operation of ablkcipher finishes.
>
> Signed-off-by: David Gstir <david@sigma-star.at>
> ---
> drivers/crypto/caam/caamalg.c | 26 ++++++++++++++++++++++++--
> 1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
> index 398807d1b77e..d13c1aee4427 100644
> --- a/drivers/crypto/caam/caamalg.c
> +++ b/drivers/crypto/caam/caamalg.c
> @@ -882,10 +882,11 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
> {
> struct ablkcipher_request *req = context;
> struct ablkcipher_edesc *edesc;
> -#ifdef DEBUG
> struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req);
> int ivsize = crypto_ablkcipher_ivsize(ablkcipher);
> + int nents;
>
> +#ifdef DEBUG
> dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);
> #endif
>
> @@ -904,6 +905,19 @@ static void ablkcipher_encrypt_done(struct device *jrdev, u32 *desc, u32 err,
> #endif
>
> ablkcipher_unmap(jrdev, edesc, req);
> +
> + if (req->src == req->dst)
> + nents = edesc->src_nents;
> + else
> + nents = edesc->dst_nents;
> +
> + /*
> + * The crypto API expects us to set the IV (req->info) to the last
> + * ciphertext block. This is used e.g. by the CTS mode.
> + */
IIUC, IV update is required only in case of CBC.
Since this callback is used also for CTR, we should avoid the copy:
if ((ctx->cdata.algtype & OP_ALG_AAI_MASK) == OP_ALG_AAI_CBC) ...
> + sg_pcopy_to_buffer(req->dst, nents, req->info, ivsize,
> + req->nbytes - ivsize);
scatterwalk_map_and_copy() should be used instead.
> +
> kfree(edesc);
>
> ablkcipher_request_complete(req, err);
> @@ -914,10 +928,10 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
> {
> struct ablkcipher_request *req = context;
> struct ablkcipher_edesc *edesc;
> -#ifdef DEBUG
> struct crypto_ablkcipher *ablkcipher = crypto_ablkcipher_reqtfm(req);
> int ivsize = crypto_ablkcipher_ivsize(ablkcipher);
>
> +#ifdef DEBUG
> dev_err(jrdev, "%s %d: err 0x%x\n", __func__, __LINE__, err);
> #endif
>
> @@ -935,6 +949,14 @@ static void ablkcipher_decrypt_done(struct device *jrdev, u32 *desc, u32 err,
> #endif
>
> ablkcipher_unmap(jrdev, edesc, req);
> +
> + /*
> + * The crypto API expects us to set the IV (req->info) to the last
> + * ciphertext block.
> + */
> + sg_pcopy_to_buffer(req->src, edesc->src_nents, req->info, ivsize,
> + req->nbytes - ivsize);
> +
> kfree(edesc);
>
> ablkcipher_request_complete(req, err);
>
next prev parent reply other threads:[~2017-06-19 10:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-02 12:24 [RFC PATCH 0/2] crypto: caam - fix cts(cbc(aes)) with CAAM driver David Gstir
2017-06-02 12:24 ` [RFC PATCH 1/2] crypto: caam - properly set IV after {en,de}crypt David Gstir
2017-06-19 10:31 ` Horia Geantă [this message]
2017-06-20 1:28 ` Herbert Xu
2017-06-26 5:40 ` David Gstir
2017-06-26 6:47 ` Herbert Xu
2017-06-28 8:32 ` Horia Geantă
2017-06-28 9:03 ` David Gstir
2017-06-02 12:24 ` [RFC PATCH 2/2] crypto: caam - fix k*alloc if called from own cipher callback David Gstir
2017-06-13 11:53 ` [RFC PATCH 0/2] crypto: caam - fix cts(cbc(aes)) with CAAM driver David Gstir
2017-06-15 14:57 ` Horia Geantă
2017-06-16 7:57 ` Horia Geantă
2017-06-16 7:59 ` Herbert Xu
2017-06-16 21:01 ` Horia Geantă
2017-06-17 9:05 ` David Gstir
2017-06-19 8:44 ` [PATCH 1/2] crypto: caam - fix gfp allocation flags (part I) Horia Geantă
2017-06-19 8:44 ` [PATCH 2/2] crypto: caam - fix gfp allocation flags (part II) Horia Geantă
2017-06-22 9:00 ` Herbert Xu
2017-06-22 9:00 ` [PATCH 1/2] crypto: caam - fix gfp allocation flags (part I) Herbert Xu
2017-06-28 13:27 ` [PATCH] crypto: caam - properly set IV after {en,de}crypt David Gstir
2017-06-28 13:42 ` Horia Geantă
2017-06-29 10:19 ` Horia Geantă
2017-08-14 7:59 ` Gilad Ben-Yossef
2017-09-05 15:33 ` Horia Geantă
2017-09-06 10:14 ` Gilad Ben-Yossef
2017-09-07 10:12 ` Horia Geantă
2017-07-12 10:51 ` 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=VI1PR0401MB2591177E3F43DEFA8AEA3D6D98C40@VI1PR0401MB2591.eurprd04.prod.outlook.com \
--to=horia.geanta@nxp.com \
--cc=dan.douglass@nxp.com \
--cc=davem@davemloft.net \
--cc=david@sigma-star.at \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=richard@sigma-star.at \
/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).