summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Vandersmissen <git@jvdsn.com>2024-03-28 11:24:30 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2024-04-05 15:46:33 +0800
commitb394204099d987b4dc55d97c6febf1ec1f52e08e (patch)
tree340cb9c2438017317ecc3766950071d0bbe3c5bb
parent9a2290c47819f922a4fd37b7160eec73014b7288 (diff)
downloadlinux-crypto-b394204099d987b4dc55d97c6febf1ec1f52e08e.tar.gz
linux-crypto-b394204099d987b4dc55d97c6febf1ec1f52e08e.zip
crypto: ecdh - explicitly zeroize private_key
private_key is overwritten with the key parameter passed in by the caller (if present), or alternatively a newly generated private key. However, it is possible that the caller provides a key (or the newly generated key) which is shorter than the previous key. In that scenario, some key material from the previous key would not be overwritten. The easiest solution is to explicitly zeroize the entire private_key array first. Note that this patch slightly changes the behavior of this function: previously, if the ecc_gen_privkey failed, the old private_key would remain. Now, the private_key is always zeroized. This behavior is consistent with the case where params.key is set and ecc_is_key_valid fails. Signed-off-by: Joachim Vandersmissen <git@jvdsn.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/ecdh.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 80afee32..3049f147 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -33,6 +33,8 @@ static int ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
params.key_size > sizeof(u64) * ctx->ndigits)
return -EINVAL;
+ memset(ctx->private_key, 0, sizeof(ctx->private_key));
+
if (!params.key || !params.key_size)
return ecc_gen_privkey(ctx->curve_id, ctx->ndigits,
ctx->private_key);