From 569768bc33b61db3bb46c5ba297f6e580e714251 Mon Sep 17 00:00:00 2001
From: Nicolai Stange <nstange@suse.de>
Date: Fri, 19 Nov 2021 10:15:33 +0100
Subject: [PATCH 11/18] crypto: dh - introduce support for ephemeral key
generation to hpre driver
References: jsc#SLE-21132,bsc#1191256
Patch-mainline: Submitted, linux-crypto ML
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>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
drivers/crypto/hisilicon/hpre/hpre_crypto.c | 11 +++++++++++
1 file changed, 11 insertions(+)
--- 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 cry
{
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 cry
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: