All of lore.kernel.org
 help / color / mirror / Atom feed
From: Antoine Tenart <antoine.tenart@bootlin.com>
To: herbert@gondor.apana.org.au, davem@davemloft.net
Cc: Antoine Tenart <antoine.tenart@bootlin.com>,
	linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	thomas.petazzoni@bootlin.com, maxime.chevallier@bootlin.com,
	gregory.clement@bootlin.com, miquel.raynal@bootlin.com,
	nadavh@marvell.com, oferh@marvell.com, igall@marvell.com
Subject: [PATCH v2 03/10] crypto: inside-secure - rework the alg type settings in the context
Date: Mon, 14 May 2018 15:10:57 +0200	[thread overview]
Message-ID: <20180514131104.25552-4-antoine.tenart@bootlin.com> (raw)
In-Reply-To: <20180514131104.25552-1-antoine.tenart@bootlin.com>

This patches reworks the way the algorithm type is set in the context,
by using the fact that the decryption algorithms are just a combination
of the algorithm encryption type and CONTEXT_CONTROL_TYPE_NULL_IN.

This will help having simpler code when adding the AEAD support, to
avoid ending up with an endless switch case block.

Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
---
 drivers/crypto/inside-secure/safexcel_cipher.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index 51f88f93ed99..9ed3f2641ef3 100644
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -104,10 +104,13 @@ static int safexcel_context_control(struct safexcel_cipher_ctx *ctx,
 	struct safexcel_crypto_priv *priv = ctx->priv;
 	int ctrl_size;
 
-	if (sreq->direction == SAFEXCEL_ENCRYPT)
-		cdesc->control_data.control0 |= CONTEXT_CONTROL_TYPE_CRYPTO_OUT;
-	else
-		cdesc->control_data.control0 |= CONTEXT_CONTROL_TYPE_CRYPTO_IN;
+	cdesc->control_data.control0 |= CONTEXT_CONTROL_TYPE_CRYPTO_OUT;
+
+	/* The decryption control type is a combination of the encryption type
+	 * and CONTEXT_CONTROL_TYPE_NULL_IN, for all types.
+	 */
+	if (sreq->direction == SAFEXCEL_DECRYPT)
+		cdesc->control_data.control0 |= CONTEXT_CONTROL_TYPE_NULL_IN;
 
 	cdesc->control_data.control0 |= CONTEXT_CONTROL_KEY_EN;
 	cdesc->control_data.control1 |= ctx->mode;
-- 
2.17.0

  parent reply	other threads:[~2018-05-14 13:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-14 13:10 [PATCH v2 00/10] crypto: inside-secure - AEAD support Antoine Tenart
2018-05-14 13:10 ` [PATCH v2 01/10] crypto: inside-secure - remove VLAs Antoine Tenart
2018-05-14 13:10 ` [PATCH v2 02/10] crypto: inside-secure - rework cipher functions for future AEAD support Antoine Tenart
2018-05-14 13:10 ` Antoine Tenart [this message]
2018-05-14 13:10 ` [PATCH v2 04/10] crypto: inside-secure - make the context control size dynamic Antoine Tenart
2018-05-14 13:10 ` [PATCH v2 05/10] crypto: inside-secure - make the key and context size computation dynamic Antoine Tenart
2018-05-14 13:11 ` [PATCH v2 06/10] crypto: inside-secure - fix the hash then encrypt/decrypt types Antoine Tenart
2018-05-14 13:11 ` [PATCH v2 07/10] crypto: inside-secure - improve error reporting Antoine Tenart
2018-05-14 13:11 ` [PATCH v2 08/10] crypto: inside-secure - authenc(hmac(sha256),cbc(aes)) support Antoine Tenart
2018-05-14 13:11 ` [PATCH v2 09/10] crypto: inside-secure - authenc(hmac(sha224),cbc(aes)) support Antoine Tenart
2018-05-14 13:11 ` [PATCH v2 10/10] crypto: inside-secure - authenc(hmac(sha1),cbc(aes)) support Antoine Tenart
2018-05-26 16:26 ` [PATCH v2 00/10] crypto: inside-secure - AEAD support 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=20180514131104.25552-4-antoine.tenart@bootlin.com \
    --to=antoine.tenart@bootlin.com \
    --cc=davem@davemloft.net \
    --cc=gregory.clement@bootlin.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=igall@marvell.com \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxime.chevallier@bootlin.com \
    --cc=miquel.raynal@bootlin.com \
    --cc=nadavh@marvell.com \
    --cc=oferh@marvell.com \
    --cc=thomas.petazzoni@bootlin.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.