Commit 233e7505 authored by Roman Smirnov's avatar Roman Smirnov Committed by Herbert Xu
Browse files

crypto: ecc - remove checks in crypto_ecdh_shared_secret() and ecc_make_pub_key() 



With the current state of the code, ecc_get_curve() cannot return
NULL in crypto_ecdh_shared_secret() and ecc_make_pub_key(). This is
conditioned by the fact that they are only called from ecdh_compute_value(),
which implements the kpp_alg::{generate_public_key,compute_shared_secret}()
methods. Also ecdh implements the kpp_alg::init() method, which is called
before the other methods and sets ecdh_ctx::curve_id to a valid value.

Signed-off-by: default avatarRoman Smirnov <r.smirnov@omp.ru>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4ad27a8b

crypto/ecc.c

+2 −2
Original line number Diff line number Diff line
@@ -1520,7 +1520,7 @@ int ecc_make_pub_key(unsigned int curve_id, unsigned int ndigits, 
	u64 priv[ECC_MAX_DIGITS];

	const struct ecc_curve *curve = ecc_get_curve(curve_id);



	if (!private_key || !curve || ndigits > ARRAY_SIZE(priv)) {

	if (!private_key || ndigits > ARRAY_SIZE(priv)) {

		ret = -EINVAL;

		goto out;

	}
@@ -1622,7 +1622,7 @@ int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits, 
	unsigned int nbytes;

	const struct ecc_curve *curve = ecc_get_curve(curve_id);



	if (!private_key || !public_key || !curve ||

	if (!private_key || !public_key ||

	    ndigits > ARRAY_SIZE(priv) || ndigits > ARRAY_SIZE(rand_z)) {

		ret = -EINVAL;

		goto out;