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

Commit ced6a586 authored Nov 05, 2017 by Eric Biggers Committed by Herbert Xu Nov 10, 2017

crypto: dh - Remove pointless checks for NULL 'p' and 'g'



Neither 'p' nor 'g' can be NULL, as they were unpacked using
crypto_dh_decode_key().  And it makes no sense for them to be optional.
So remove the NULL checks that were copy-and-pasted into both modules.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 5829cc8d

crypto/dh.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -53,9 +53,6 @@ static int dh_check_params_length(unsigned int p_len)

	static int dh_set_params(struct dh_ctx ctx, struct dh params)		static int dh_set_params(struct dh_ctx ctx, struct dh params)
	{		{
	if (unlikely(!params->p \|\| !params->g))
	return -EINVAL;

	if (dh_check_params_length(params->p_size << 3))		if (dh_check_params_length(params->p_size << 3))
	return -EINVAL;		return -EINVAL;

drivers/crypto/qat/qat_common/qat_asym_algs.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -443,9 +443,6 @@ static int qat_dh_set_params(struct qat_dh_ctx ctx, struct dh params)
	struct qat_crypto_instance *inst = ctx->inst;		struct qat_crypto_instance *inst = ctx->inst;
	struct device *dev = &GET_DEV(inst->accel_dev);		struct device *dev = &GET_DEV(inst->accel_dev);

	if (unlikely(!params->p \|\| !params->g))
	return -EINVAL;

	if (qat_dh_check_params_length(params->p_size << 3))		if (qat_dh_check_params_length(params->p_size << 3))
	return -EINVAL;		return -EINVAL;