From: Thara Gopinath <thara.gopinath@linaro.org>
To: herbert@gondor.apana.org.au, davem@davemloft.net,
bjorn.andersson@linaro.org
Cc: ebiggers@google.com, ardb@kernel.org, sivaprak@codeaurora.org,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v7 04/11] crypto: qce: skcipher: Return unsupported if any three keys are same for DES3 algorithms
Date: Thu, 11 Feb 2021 15:01:21 -0500 [thread overview]
Message-ID: <20210211200128.2886388-5-thara.gopinath@linaro.org> (raw)
In-Reply-To: <20210211200128.2886388-1-thara.gopinath@linaro.org>
Return unsupported if any three keys are same for DES3 algorithms
since CE does not support this and the operation causes the engine to
hang.
Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
---
v6->v7:
- Fixed sparse warning in patch 4 as pointed out by Herbert Xu.
This means the checking if any two keys are same for triple
des algorithms has been reverted back to using conditional OR
instead of using bitwise OR.
drivers/crypto/qce/skcipher.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/crypto/qce/skcipher.c b/drivers/crypto/qce/skcipher.c
index 12955dcd53dd..8aeb741ca5a3 100644
--- a/drivers/crypto/qce/skcipher.c
+++ b/drivers/crypto/qce/skcipher.c
@@ -221,12 +221,27 @@ static int qce_des3_setkey(struct crypto_skcipher *ablk, const u8 *key,
unsigned int keylen)
{
struct qce_cipher_ctx *ctx = crypto_skcipher_ctx(ablk);
+ u32 _key[6];
int err;
err = verify_skcipher_des3_key(ablk, key);
if (err)
return err;
+ /*
+ * The crypto engine does not support any two keys
+ * being the same for triple des algorithms. The
+ * verify_skcipher_des3_key does not check for all the
+ * below conditions. Return -ENOKEY in case any two keys
+ * are the same. Revisit to see if a fallback cipher
+ * is needed to handle this condition.
+ */
+ memcpy(_key, key, DES3_EDE_KEY_SIZE);
+ if (!((_key[0] ^ _key[2]) | (_key[1] ^ _key[3])) ||
+ !((_key[2] ^ _key[4]) | (_key[3] ^ _key[5])) ||
+ !((_key[0] ^ _key[4]) | (_key[1] ^ _key[5])))
+ return -ENOKEY;
+
ctx->enc_keylen = keylen;
memcpy(ctx->enc_key, key, keylen);
return 0;
--
2.25.1
next prev parent reply other threads:[~2021-02-11 20:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-11 20:01 [PATCH v7 00/11] Regression fixes/clean ups in the Qualcomm crypto engine driver Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 01/11] crypto: qce: sha: Restore/save ahash state with custom struct in export/import Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 02/11] crypto: qce: sha: Hold back a block of data to be transferred as part of final Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 03/11] crypto: qce: skcipher: Return unsupported if key1 and key 2 are same for AES XTS algorithm Thara Gopinath
2021-02-11 20:01 ` Thara Gopinath [this message]
2021-02-11 20:01 ` [PATCH v7 05/11] crypto: qce: skcipher: Return error for zero length messages Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 06/11] crypto: qce: skcipher: Return error for non-blocksize data(ECB/CBC algorithms) Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 07/11] crypto: qce: skcipher: Set ivsize to 0 for ecb(aes) Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 08/11] crypto: qce: skcipher: Improve the conditions for requesting AES fallback cipher Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 09/11] crypto: qce: common: Set data unit size to message length for AES XTS transformation Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 10/11] crypto: qce: Remover src_tbl from qce_cipher_reqctx Thara Gopinath
2021-02-11 20:01 ` [PATCH v7 11/11] crypto: qce: Remove totallen and offset in qce_start Thara Gopinath
2021-02-24 22:33 ` [PATCH v7 00/11] Regression fixes/clean ups in the Qualcomm crypto engine driver Thara Gopinath
2021-03-04 6:42 ` 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=20210211200128.2886388-5-thara.gopinath@linaro.org \
--to=thara.gopinath@linaro.org \
--cc=ardb@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=davem@davemloft.net \
--cc=ebiggers@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sivaprak@codeaurora.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;
as well as URLs for NNTP newsgroup(s).