From: Nicolai Stange <nstange@suse.de>
To: Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>
Cc: "Stephan Müller" <smueller@chronox.de>,
"Hannes Reinecke" <hare@suse.de>, "Torsten Duwe" <duwe@suse.de>,
"Zaibo Xu" <xuzaibo@huawei.com>,
"Giovanni Cabiddu" <giovanni.cabiddu@intel.com>,
"David Howells" <dhowells@redhat.com>,
"Jarkko Sakkinen" <jarkko@kernel.org>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
qat-linux@intel.com, keyrings@vger.kernel.org,
"Nicolai Stange" <nstange@suse.de>
Subject: [PATCH 11/18] crypto: dh - introduce support for ephemeral key generation to hpre driver
Date: Wed, 1 Dec 2021 01:48:51 +0100 [thread overview]
Message-ID: <20211201004858.19831-12-nstange@suse.de> (raw)
In-Reply-To: <20211201004858.19831-1-nstange@suse.de>
A previous patch made the dh-generic implementation's ->set_secret() to
generate an ephemeral key in case the input ->key_size is zero, just in
analogy with ecdh. Make the hpre crypto driver's DH implementation to
behave consistently by doing the same.
Signed-off-by: Nicolai Stange <nstange@suse.de>
---
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
index a032c192ef1d..02ca79e263f1 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
@@ -701,11 +701,20 @@ static int hpre_dh_set_secret(struct crypto_kpp *tfm, const void *buf,
{
struct hpre_ctx *ctx = kpp_tfm_ctx(tfm);
struct dh params;
+ char key[CRYPTO_DH_MAX_PRIVKEY_SIZE];
int ret;
if (crypto_dh_decode_key(buf, len, ¶ms) < 0)
return -EINVAL;
+ if (!params.key_size) {
+ ret = crypto_dh_gen_privkey(params.group_id, key,
+ ¶ms.key_size);
+ if (ret)
+ return ret;
+ params.key = key;
+ }
+
/* Free old secret if any */
hpre_dh_clear_ctx(ctx, false);
@@ -716,6 +725,8 @@ static int hpre_dh_set_secret(struct crypto_kpp *tfm, const void *buf,
memcpy(ctx->dh.xa_p + (ctx->key_sz - params.key_size), params.key,
params.key_size);
+ memzero_explicit(key, sizeof(key));
+
return 0;
err_clear_ctx:
--
2.26.2
next prev parent reply other threads:[~2021-12-01 0:51 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 0:48 [PATCH 00/18] crypto: dh - infrastructure for NVM in-band auth and FIPS conformance Nicolai Stange
2021-12-01 0:48 ` [PATCH 01/18] crypto: dh - remove struct dh's ->q member Nicolai Stange
2021-12-01 7:11 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 02/18] crypto: dh - constify struct dh's pointer members Nicolai Stange
2021-12-01 7:13 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 03/18] crypto: dh - optimize domain parameter serialization for well-known groups Nicolai Stange
2021-12-01 7:17 ` Hannes Reinecke
2021-12-09 9:08 ` Nicolai Stange
2021-12-01 0:48 ` [PATCH 04/18] crypto: dh - introduce RFC 7919 safe-prime groups Nicolai Stange
2021-12-01 7:23 ` Hannes Reinecke
2021-12-09 9:10 ` Nicolai Stange
2021-12-01 0:48 ` [PATCH 05/18] crypto: testmgr - add DH RFC 7919 ffdhe2048 test vector Nicolai Stange
2021-12-01 7:24 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 06/18] crypto: dh - introduce RFC 3526 safe-prime groups Nicolai Stange
2021-12-01 7:24 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 07/18] crypto: testmgr - add DH RFC 3526 modp2048 test vector Nicolai Stange
2021-12-01 7:25 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 08/18] crypto: testmgr - run only subset of DH vectors based on config Nicolai Stange
2021-12-01 7:28 ` Hannes Reinecke
2021-12-09 9:18 ` Nicolai Stange
2021-12-01 0:48 ` [PATCH 09/18] crypto: dh - implement private key generation primitive Nicolai Stange
2021-12-01 7:28 ` Hannes Reinecke
2021-12-05 5:52 ` Stephan Müller
2021-12-08 6:20 ` Nicolai Stange
2021-12-08 7:16 ` Stephan Mueller
2021-12-01 0:48 ` [PATCH 10/18] crypto: dh - introduce support for ephemeral key generation to dh-generic Nicolai Stange
2021-12-01 7:29 ` Hannes Reinecke
2021-12-05 6:11 ` Stephan Müller
2021-12-08 6:32 ` Nicolai Stange
2021-12-01 0:48 ` Nicolai Stange [this message]
2021-12-01 7:30 ` [PATCH 11/18] crypto: dh - introduce support for ephemeral key generation to hpre driver Hannes Reinecke
2021-12-05 6:11 ` Stephan Müller
2021-12-01 0:48 ` [PATCH 12/18] crypto: dh - introduce support for ephemeral key generation to qat driver Nicolai Stange
2021-12-01 7:30 ` Hannes Reinecke
2021-12-05 6:11 ` Stephan Müller
2021-12-01 0:48 ` [PATCH 13/18] crypto: testmgr - add DH test vectors for key generation Nicolai Stange
2021-12-01 7:31 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 14/18] lib/mpi: export mpi_rshift Nicolai Stange
2021-12-01 7:32 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 15/18] crypto: dh - store group id in dh-generic's dh_ctx Nicolai Stange
2021-12-01 7:32 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 16/18] crypto: dh - calculate Q from P for the full public key verification Nicolai Stange
2021-12-01 7:33 ` Hannes Reinecke
2021-12-05 6:07 ` Stephan Müller
2021-12-08 6:41 ` Nicolai Stange
2021-12-01 0:48 ` [PATCH 17/18] crypto: dh - try to match domain parameters to a known safe-prime group Nicolai Stange
2021-12-01 7:34 ` Hannes Reinecke
2021-12-01 0:48 ` [PATCH 18/18] crypto: dh - accept only approved safe-prime groups in FIPS mode Nicolai Stange
2021-12-01 7:34 ` Hannes Reinecke
2021-12-09 9:26 ` Nicolai Stange
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=20211201004858.19831-12-nstange@suse.de \
--to=nstange@suse.de \
--cc=davem@davemloft.net \
--cc=dhowells@redhat.com \
--cc=duwe@suse.de \
--cc=giovanni.cabiddu@intel.com \
--cc=hare@suse.de \
--cc=herbert@gondor.apana.org.au \
--cc=jarkko@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=qat-linux@intel.com \
--cc=smueller@chronox.de \
--cc=xuzaibo@huawei.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).