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 06/10] crypto: inside-secure - fix the hash then encrypt/decrypt types
Date: Mon, 14 May 2018 15:11:00 +0200 [thread overview]
Message-ID: <20180514131104.25552-7-antoine.tenart@bootlin.com> (raw)
In-Reply-To: <20180514131104.25552-1-antoine.tenart@bootlin.com>
This commit fixes the CONTEXT_CONTROL_TYPE_HASH_ENCRYPT_OUT and
CONTEXT_CONTROL_TYPE_HASH_DECRYPT_OUT types by assigning the right
value, and by renaming CONTEXT_CONTROL_TYPE_HASH_DECRYPT_OUT to
CONTEXT_CONTROL_TYPE_HASH_DECRYPT_IN.
This is not submitted as a fix for older kernel versions as these two
defines weren't used back then.
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
---
drivers/crypto/inside-secure/safexcel.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/inside-secure/safexcel.h b/drivers/crypto/inside-secure/safexcel.h
index afdd099b2c1a..eec75dfcdad7 100644
--- a/drivers/crypto/inside-secure/safexcel.h
+++ b/drivers/crypto/inside-secure/safexcel.h
@@ -295,8 +295,8 @@ struct safexcel_context_record {
#define CONTEXT_CONTROL_TYPE_CRYPTO_IN 0x5
#define CONTEXT_CONTROL_TYPE_ENCRYPT_HASH_OUT 0x6
#define CONTEXT_CONTROL_TYPE_DECRYPT_HASH_IN 0x7
-#define CONTEXT_CONTROL_TYPE_HASH_ENCRYPT_OUT 0x14
-#define CONTEXT_CONTROL_TYPE_HASH_DECRYPT_OUT 0x15
+#define CONTEXT_CONTROL_TYPE_HASH_ENCRYPT_OUT 0xe
+#define CONTEXT_CONTROL_TYPE_HASH_DECRYPT_IN 0xf
#define CONTEXT_CONTROL_RESTART_HASH BIT(4)
#define CONTEXT_CONTROL_NO_FINISH_HASH BIT(5)
#define CONTEXT_CONTROL_SIZE(n) ((n) << 8)
--
2.17.0
next prev parent reply other threads:[~2018-05-14 13:17 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 ` [PATCH v2 03/10] crypto: inside-secure - rework the alg type settings in the context Antoine Tenart
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 ` Antoine Tenart [this message]
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-7-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 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).