Commit aa2a50d4 authored by Zhiqi Song's avatar Zhiqi Song Committed by Zheng Zengkai
Browse files

crypto: hisilicon/hpre - optimize registration of ecdh 

mainline inclusion
from mainline-v6.1-rc1
commit b1be70a8
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5T7AD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b1be70a8c983a5bd12d88181b75d0f550086cb44



----------------------------------------------------------------------

Use table to store the different ecdh curve configuration,
making the registration of ecdh clearer and expansion more
convenient.

Signed-off-by: default avatarZhiqi Song <songzhiqi1@huawei.com>
Signed-off-by: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJiangshui Yang <yangjiangshui@h-partners.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 309a99d7

drivers/crypto/hisilicon/hpre/hpre_crypto.c

+63 −73
Original line number Diff line number Diff line
@@ -2008,7 +2008,8 @@ static struct kpp_alg dh = { 
	},

};



static struct kpp_alg ecdh_nist_p192 = {

static struct kpp_alg ecdh_curves[] = {

	{

		.set_secret = hpre_ecdh_set_secret,

		.generate_public_key = hpre_ecdh_compute_value,

		.compute_shared_secret = hpre_ecdh_compute_value,
@@ -2023,9 +2024,7 @@ static struct kpp_alg ecdh_nist_p192 = { 
			.cra_driver_name = "hpre-ecdh-nist-p192",

			.cra_module = THIS_MODULE,

		},

};



static struct kpp_alg ecdh_nist_p256 = {

	}, {

		.set_secret = hpre_ecdh_set_secret,

		.generate_public_key = hpre_ecdh_compute_value,

		.compute_shared_secret = hpre_ecdh_compute_value,
@@ -2040,9 +2039,7 @@ static struct kpp_alg ecdh_nist_p256 = { 
			.cra_driver_name = "hpre-ecdh-nist-p256",

			.cra_module = THIS_MODULE,

		},

};



static struct kpp_alg ecdh_nist_p384 = {

	}, {

		.set_secret = hpre_ecdh_set_secret,

		.generate_public_key = hpre_ecdh_compute_value,

		.compute_shared_secret = hpre_ecdh_compute_value,
@@ -2057,6 +2054,7 @@ static struct kpp_alg ecdh_nist_p384 = { 
			.cra_driver_name = "hpre-ecdh-nist-p384",

			.cra_module = THIS_MODULE,

		},

	}

};



static struct kpp_alg curve25519_alg = {
@@ -2123,46 +2121,38 @@ static void hpre_unregister_dh(struct hisi_qm *qm) 


static int hpre_register_ecdh(struct hisi_qm *qm)

{

	int ret;

	int ret, i;



	if (!hpre_check_alg_support(qm, HPRE_DRV_ECDH_MASK_CAP))

		return 0;



	ret = crypto_register_kpp(&ecdh_nist_p192);

	if (ret) {

		dev_err(&qm->pdev->dev, "failed to register ecdh_nist_p192 (%d)!\n", ret);

		return ret;

	}



	ret = crypto_register_kpp(&ecdh_nist_p256);

	for (i = 0; i < ARRAY_SIZE(ecdh_curves); i++) {

		ret = crypto_register_kpp(&ecdh_curves[i]);

		if (ret) {

		dev_err(&qm->pdev->dev, "failed to register ecdh_nist_p256 (%d)!\n", ret);

		goto unregister_ecdh_p192;

			dev_err(&qm->pdev->dev, "failed to register %s (%d)!\n",

				ecdh_curves[i].base.cra_name, ret);

			goto unreg_kpp;

		}



	ret = crypto_register_kpp(&ecdh_nist_p384);

	if (ret) {

		dev_err(&qm->pdev->dev, "failed to register ecdh_nist_p384 (%d)!\n", ret);

		goto unregister_ecdh_p256;

	}



	return 0;



unregister_ecdh_p256:

	crypto_unregister_kpp(&ecdh_nist_p256);

unregister_ecdh_p192:

	crypto_unregister_kpp(&ecdh_nist_p192);

unreg_kpp:

	for (--i; i >= 0; --i)

		crypto_unregister_kpp(&ecdh_curves[i]);



	return ret;

}



static void hpre_unregister_ecdh(struct hisi_qm *qm)

{

	int i;



	if (!hpre_check_alg_support(qm, HPRE_DRV_ECDH_MASK_CAP))

		return;



	crypto_unregister_kpp(&ecdh_nist_p384);

	crypto_unregister_kpp(&ecdh_nist_p256);

	crypto_unregister_kpp(&ecdh_nist_p192);

	for (i = ARRAY_SIZE(ecdh_curves) - 1; i >= 0; --i)

		crypto_unregister_kpp(&ecdh_curves[i]);

}



static int hpre_register_x25519(struct hisi_qm *qm)