Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f44df15 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Herbert Xu
Browse files

crypto: ecdh - make ecdh_shared_secret unique 



There is another ecdh_shared_secret in net/bluetooth/ecc.c

Fixes: 3c4b2390 ("crypto: ecdh - Add ECDH software support")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 52140993

crypto/ecc.c

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits, 
	return ret;

}



int ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,

int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,

		       const u8 *private_key, unsigned int private_key_len,

		       const u8 *public_key, unsigned int public_key_len,

		       u8 *secret, unsigned int secret_len)

crypto/ecc.h

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits, 
		      u8 *public_key, unsigned int public_key_len);



/**

 * ecdh_shared_secret() - Compute a shared secret

 * crypto_ecdh_shared_secret() - Compute a shared secret

 *

 * @curve_id:		id representing the curve to use

 * @private_key:	private key of part A
@@ -70,13 +70,13 @@ int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits, 
 * @secret:		buffer for storing the calculated shared secret

 * @secret_len:		length of the secret buffer

 *

 * Note: It is recommended that you hash the result of ecdh_shared_secret

 * Note: It is recommended that you hash the result of crypto_ecdh_shared_secret

 * before using it for symmetric encryption or HMAC.

 *

 * Returns 0 if the shared secret was generated successfully, a negative value

 * if an error occurred.

 */

int ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,

int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,

		       const u8 *private_key, unsigned int private_key_len,

		       const u8 *public_key, unsigned int public_key_len,

		       u8 *secret, unsigned int secret_len);

crypto/ecdh.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int ecdh_compute_value(struct kpp_request *req) 
		if (copied != 2 * nbytes)

			return -EINVAL;



		ret = ecdh_shared_secret(ctx->curve_id, ctx->ndigits,

		ret = crypto_ecdh_shared_secret(ctx->curve_id, ctx->ndigits,

					 (const u8 *)ctx->private_key, nbytes,

					 (const u8 *)ctx->public_key, 2 * nbytes,

					 (u8 *)ctx->shared_secret, nbytes);