Skip to content

Commit c5e9068

Browse files
jallisonciqPlaidCat
authored andcommitted
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> Back-port of upstream commit: 73e5984 Signed-off-by: Jeremy Allison <jallison@ciq.com>
1 parent f1516f0 commit c5e9068

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

crypto/ecdh.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ static int ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
5454
ctx->curve_id = params.curve_id;
5555
ctx->ndigits = ndigits;
5656

57+
memset(ctx->private_key, 0, sizeof(ctx->private_key));
58+
5759
if (!params.key || !params.key_size)
5860
return ecc_gen_privkey(ctx->curve_id, ctx->ndigits,
5961
ctx->private_key);

0 commit comments

Comments
 (0)