- Acc - mailweb.openeuler.org

[PATCH v4 0/5] Add dynamic driver loading function
by Longfang Liu 16 Dec '22

16 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 293 +++++++++++--------- wd_sched.c | 181 ++++++++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1448 insertions(+), 179 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

2 6

[PATCH v4 0/5] Add dynamic driver loading function
by Longfang Liu 16 Dec '22

16 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 293 +++++++++++--------- wd_sched.c | 105 +++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1372 insertions(+), 179 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 5

[PATCH v4 0/5] Add dynamic driver loading function
by Longfang Liu 16 Dec '22

16 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v3 -> v4: - Remove the template instance code of cipher. - Split the scheduler code into a separate patch. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading Longfang Liu (5): uadk: Add driver dynamic loading function uadk: update scheduler for dynamic loading uadk: improve the dynamic loading public framework uadk: added ability to query supported algorithms uadk/zip: Adapt the zip module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- include/drv/wd_comp_drv.h | 27 -- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + wd.c | 56 +++- wd_alg.c | 265 ++++++++++++++++++ wd_comp.c | 293 +++++++++++--------- wd_sched.c | 181 ++++++++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++++- 14 files changed, 1448 insertions(+), 179 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

2 6

[PATCH v2 0/2] support zlibwrapper for uadk compression
by Yang Shen 15 Dec '22

15 Dec '22

Add a set of zlibwrapper interfaces for users to fit uadk interfaces quickly. Changelog: v1->v2: - Fix fork dead lock problem. Yang Shen (2): uadk/comp - support reset session zlibwrapper: add zlibwrapper to adapt for zlib interface Makefile.am | 2 +- include/wd_comp.h | 9 +- libwd_comp.map | 11 ++ wd_comp.c | 15 ++ wd_zlibwrapper.c | 343 ++++++++++++++++++++++++++++++++++++++++++++++ wd_zlibwrapper.h | 112 +++++++++++++++ 6 files changed, 490 insertions(+), 2 deletions(-) create mode 100644 wd_zlibwrapper.c create mode 100644 wd_zlibwrapper.h -- 2.24.0

1 2

[PATCH] uadk: fix initialization failed in child process
by Yang Shen 15 Dec '22

15 Dec '22

The initialization status may be set in child process when the parent process has called the wd_alg_init. So need to register the callback for child process to clear the status. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- wd_aead.c | 7 +++++++ wd_cipher.c | 7 +++++++ wd_comp.c | 9 +++++++++ wd_dh.c | 7 +++++++ wd_digest.c | 7 +++++++ wd_ecc.c | 7 +++++++ wd_rsa.c | 7 +++++++ 7 files changed, 51 insertions(+) diff --git a/wd_aead.c b/wd_aead.c index 471cb65..7f0347c 100644 --- a/wd_aead.c +++ b/wd_aead.c @@ -389,12 +389,19 @@ static int wd_aead_param_check(struct wd_aead_sess *sess, return 0; } +static void wd_aead_clear_status() +{ + wd_alg_clear_init(&wd_aead_setting.status); +} + int wd_aead_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_aead_clear_status); + flag = wd_alg_try_init(&wd_aead_setting.status); if (!flag) return 0; diff --git a/wd_cipher.c b/wd_cipher.c index b627c0d..2eabb43 100644 --- a/wd_cipher.c +++ b/wd_cipher.c @@ -228,12 +228,19 @@ void wd_cipher_free_sess(handle_t h_sess) free(sess); } +static void wd_cipher_clear_status() +{ + wd_alg_clear_init(&wd_cipher_setting.status); +} + int wd_cipher_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_cipher_clear_status); + flag = wd_alg_try_init(&wd_cipher_setting.status); if (!flag) return 0; diff --git a/wd_comp.c b/wd_comp.c index b9c39f1..0e89304 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -94,6 +94,11 @@ void wd_comp_set_driver(struct wd_comp_driver *drv) wd_comp_setting.driver = drv; } +static void wd_comp_clear_status() +{ + wd_alg_clear_init(&wd_comp_setting.status); +} + static int wd_comp_init_nolock(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; @@ -187,6 +192,8 @@ int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) bool flag; int ret; + pthread_atfork(NULL, NULL, wd_comp_clear_status); + flag = wd_alg_try_init(&wd_comp_setting.status); if (!flag) return 0; @@ -214,6 +221,8 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par bool flag; int ret; + pthread_atfork(NULL, NULL, wd_comp_clear_status); + flag = wd_alg_try_init(&wd_comp_setting.status); if (!flag) return 0; diff --git a/wd_dh.c b/wd_dh.c index 74dbca0..7a96253 100644 --- a/wd_dh.c +++ b/wd_dh.c @@ -74,12 +74,19 @@ void wd_dh_set_driver(struct wd_dh_driver *drv) wd_dh_setting.driver = drv; } +static void wd_dh_clear_status() +{ + wd_alg_clear_init(&wd_dh_setting.status); +} + int wd_dh_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_dh_clear_status); + flag = wd_alg_try_init(&wd_dh_setting.status); if (!flag) return 0; diff --git a/wd_digest.c b/wd_digest.c index ceecb6a..04ac142 100644 --- a/wd_digest.c +++ b/wd_digest.c @@ -183,12 +183,19 @@ void wd_digest_free_sess(handle_t h_sess) free(sess); } +static void wd_digest_clear_status() +{ + wd_alg_clear_init(&wd_digest_setting.status); +} + int wd_digest_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_digest_clear_status); + flag = wd_alg_try_init(&wd_digest_setting.status); if (!flag) return 0; diff --git a/wd_ecc.c b/wd_ecc.c index 7fd632e..7b5654a 100644 --- a/wd_ecc.c +++ b/wd_ecc.c @@ -130,12 +130,19 @@ void wd_ecc_set_driver(struct wd_ecc_driver *drv) wd_ecc_setting.driver = drv; } +static void wd_ecc_clear_status() +{ + wd_alg_clear_init(&wd_ecc_setting.status); +} + int wd_ecc_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_ecc_clear_status); + flag = wd_alg_try_init(&wd_ecc_setting.status); if (!flag) return 0; diff --git a/wd_rsa.c b/wd_rsa.c index a3b856a..288b86f 100644 --- a/wd_rsa.c +++ b/wd_rsa.c @@ -115,12 +115,19 @@ void wd_rsa_set_driver(struct wd_rsa_driver *drv) wd_rsa_setting.driver = drv; } +static void wd_rsa_clear_status() +{ + wd_alg_clear_init(&wd_rsa_setting.status); +} + int wd_rsa_init(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; bool flag; int ret; + pthread_atfork(NULL, NULL, wd_rsa_clear_status); + flag = wd_alg_try_init(&wd_rsa_setting.status); if (!flag) return 0; -- 2.24.0

1 0

[PATCH] uadk/comp: remove init_state2
by Yang Shen 15 Dec '22

15 Dec '22

Remove the useless state2 in wd_comp_config to make code clear. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- wd_comp.c | 63 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/wd_comp.c b/wd_comp.c index cd938d9..b9c39f1 100644 --- a/wd_comp.c +++ b/wd_comp.c @@ -94,28 +94,23 @@ void wd_comp_set_driver(struct wd_comp_driver *drv) wd_comp_setting.driver = drv; } -int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) +static int wd_comp_init_nolock(struct wd_ctx_config *config, struct wd_sched *sched) { void *priv; - bool flag; int ret; - flag = wd_alg_try_init(&wd_comp_setting.status); - if (!flag) - return 0; - ret = wd_init_param_check(config, sched); if (ret) - goto out_clear_init; + return ret; ret = wd_set_epoll_en("WD_COMP_EPOLL_EN", &wd_comp_setting.config.epoll_en); if (ret < 0) - goto out_clear_init; + return ret; ret = wd_init_ctx_config(&wd_comp_setting.config, config); if (ret < 0) - goto out_clear_init; + return ret; ret = wd_init_sched(&wd_comp_setting.sched, sched); if (ret < 0) @@ -154,8 +149,6 @@ int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) goto out_free_priv; } - wd_alg_set_init(&wd_comp_setting.status); - return 0; out_free_priv: @@ -167,12 +160,10 @@ out_clear_sched: wd_clear_sched(&wd_comp_setting.sched); out_clear_ctx_config: wd_clear_ctx_config(&wd_comp_setting.config); -out_clear_init: - wd_alg_clear_init(&wd_comp_setting.status); return ret; } -void wd_comp_uninit(void) +static void wd_comp_uninit_nolock(void) { void *priv = wd_comp_setting.priv; @@ -189,23 +180,41 @@ void wd_comp_uninit(void) /* unset config, sched, driver */ wd_clear_sched(&wd_comp_setting.sched); wd_clear_ctx_config(&wd_comp_setting.config); - - wd_alg_clear_init(&wd_comp_setting.status); } -int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_params *ctx_params) +int wd_comp_init(struct wd_ctx_config *config, struct wd_sched *sched) { - enum wd_status status; bool flag; int ret; - wd_alg_get_init(&wd_comp_setting.status, &status); - if (status == WD_INIT) { - WD_INFO("UADK comp has been initialized with wd_comp_init()!\n"); + flag = wd_alg_try_init(&wd_comp_setting.status); + if (!flag) return 0; + + ret = wd_comp_init_nolock(config, sched); + if (ret) { + wd_alg_clear_init(&wd_comp_setting.status); + goto out; } - flag = wd_alg_try_init(&wd_comp_setting.status2); + wd_alg_set_init(&wd_comp_setting.status); + +out: + return ret; +} + +void wd_comp_uninit(void) +{ + wd_comp_uninit_nolock(); + wd_alg_clear_init(&wd_comp_setting.status); +} + +int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_params *ctx_params) +{ + bool flag; + int ret; + + flag = wd_alg_try_init(&wd_comp_setting.status); if (!flag) return 0; @@ -234,11 +243,11 @@ int wd_comp_init2_(char *alg, __u32 sched_type, int task_type, struct wd_ctx_par if (ret) goto out_freesched; - ret = wd_comp_init(&wd_comp_ctx, wd_comp_sched); + ret = wd_comp_init_nolock(&wd_comp_ctx, wd_comp_sched); if (ret) goto out_freesched; - wd_alg_set_init(&wd_comp_setting.status2); + wd_alg_set_init(&wd_comp_setting.status); return 0; @@ -246,7 +255,7 @@ out_freesched: wd_sched_rr_release(wd_comp_sched); out_uninit: - wd_alg_clear_init(&wd_comp_setting.status2); + wd_alg_clear_init(&wd_comp_setting.status); return ret; } @@ -255,7 +264,7 @@ void wd_comp_uninit2(void) { int i; - wd_comp_uninit(); + wd_comp_uninit_nolock(); for (i = 0; i < wd_comp_ctx.ctx_num; i++) if (wd_comp_ctx.ctxs[i].ctx) { @@ -264,7 +273,7 @@ void wd_comp_uninit2(void) } wd_sched_rr_release(wd_comp_sched); - wd_alg_clear_init(&wd_comp_setting.status2); + wd_alg_clear_init(&wd_comp_setting.status); } struct wd_comp_msg *wd_comp_get_msg(__u32 idx, __u32 tag) -- 2.24.0

1 0

[PATCH v3 0/5] Add dynamic driver loading function
by liulongfang 15 Dec '22

15 Dec '22

Update the current driver adaptation and usage method, from fixed use of Hisilicon device driver to automatic registration of the driver according to the algorithm. When the algorithm API layer uses the driver, it is no longer bound to the fixed device driver, but dynamically obtained and stored according to the algorithm query to use. Update the driver and API layer of the zip and sec module, keep the function of the init interface unchanged, update the implementation of the init2 interface and match the dynamic loading function. Changes v2 -> v3: - Add dynamic library file search function - Fix some memory handling issues Changes v1 -> v2: - Fixed the compatibility method with the previous library file loading liulongfang (5): uadk: Add driver dynamic loading function uadk: added ability to query supported algorithms uadk: improve the dynamic loading public framework uadk/zip: Adapt the zip module to the dynamic loading framework uadk/sec: adapt the sec module to the dynamic loading framework Makefile.am | 4 +- drv/hisi_comp.c | 59 +++- drv/hisi_sec.c | 102 +++++-- include/drv/wd_aead_drv.h | 2 +- include/drv/wd_cipher_drv.h | 26 -- include/drv/wd_comp_drv.h | 27 -- include/drv/wd_digest_drv.h | 2 +- include/wd.h | 12 + include/wd_alg.h | 95 +++++++ include/wd_alg_common.h | 11 + include/wd_sched.h | 6 +- include/wd_util.h | 63 ++++- libwd.map | 8 + libwd_crypto.map | 3 + wd.c | 56 +++- wd_alg.c | 265 +++++++++++++++++ wd_cipher.c | 305 +++++++++++++++----- wd_comp.c | 293 ++++++++++--------- wd_sched.c | 105 ++++++- wd_util.c | 547 +++++++++++++++++++++++++++++++++++- 20 files changed, 1697 insertions(+), 294 deletions(-) create mode 100644 include/wd_alg.h create mode 100644 wd_alg.c -- 2.33.0

1 5

[PATCH] uadk/ecc: bugfix incorrect parameter length
by Zhiqi Song 14 Dec '22

14 Dec '22

When check whether a 'struct wd_dtb' type variable is all zero, the length of the data should be the value of 'bsize'. Directly using 'dsize' may truncate the data in some cases and cause erroneous judgement. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- drv/hisi_hpre.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drv/hisi_hpre.c b/drv/hisi_hpre.c index aec2f57..9da2bd7 100644 --- a/drv/hisi_hpre.c +++ b/drv/hisi_hpre.c @@ -1056,11 +1056,16 @@ static void ecc_get_io_len(__u32 atype, __u32 hsz, size_t *ilen, } } -static bool is_all_zero(struct wd_dtb *e, struct wd_ecc_msg *msg) +static bool is_all_zero(struct wd_dtb *e) { int i; - for (i = 0; i < e->dsize && i < msg->key_bytes; i++) { + if (!e || !e->data) { + WD_ERR("invalid: e or e->data is NULL\n"); + return true; + } + + for (i = 0; i < e->bsize; i++) { if (e->data[i]) return false; } @@ -1096,12 +1101,12 @@ static int ecc_prepare_sign_in(struct wd_ecc_msg *msg, return -WD_EINVAL; } hw_msg->sm2_ksel = 1; - } else if (is_all_zero(k, msg)) { + } else if (is_all_zero(k)) { WD_ERR("invalid: ecc sign in k all zero!\n"); return -WD_EINVAL; } - if (is_all_zero(e, msg)) { + if (is_all_zero(e)) { WD_ERR("invalid: ecc sign in e all zero!\n"); return -WD_EINVAL; } @@ -1143,7 +1148,7 @@ static int ecc_prepare_verf_in(struct wd_ecc_msg *msg, s = &vin->s; r = &vin->r; - if (is_all_zero(e, msg)) { + if (is_all_zero(e)) { WD_ERR("invalid: ecc verf in e all zero!\n"); return -WD_EINVAL; } @@ -1284,7 +1289,7 @@ static int u_is_in_p(struct wd_ecc_msg *msg) return -WD_EINVAL; } - if (is_all_zero(&pbk->x, msg)) { + if (is_all_zero(&pbk->x)) { WD_ERR("invalid: ux is zero!\n"); return -WD_EINVAL; } -- 2.30.0

1 0

[PATCH] uadk/v1/ecc: bugfix incorrect parameter length
by Zhiqi Song 14 Dec '22

14 Dec '22

In 'struct wd_dtb', the member 'bsize' indicates the whole buffer size of the data, the member 'dsize' indicates the valid size of the data. The 'bsize' is generally greater than or equal to 'dsize'. In some cases, the data will be filled with zero, the value of 'dsize' will not be updated, so directly using 'dsize' may truncate the data and cause erroneous judgement. The solution is when check whether a 'struct wd_dtb' type variable is all zero, if 'bsize' is larger than 'dsize', the length of the data should be the value of 'bsize'. And the key size value is redundant. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- v1/drv/hisi_hpre_udrv.c | 19 +++++++++---------- v1/wd_ecc.c | 14 +++++++------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/v1/drv/hisi_hpre_udrv.c b/v1/drv/hisi_hpre_udrv.c index 00ceec2..0eba2d6 100644 --- a/v1/drv/hisi_hpre_udrv.c +++ b/v1/drv/hisi_hpre_udrv.c @@ -1106,22 +1106,21 @@ static void correct_random(struct wd_dtb *k) k->data[lens] = 0; } -static bool is_all_zero(struct wd_dtb *e, struct wcrypto_ecc_msg *msg, - const char *p_name) +static bool is_all_zero(struct wd_dtb *e, const char *p_name) { int i; if (!e || !e->data) { - WD_ERR("%s: e or data NULL!\n", p_name); + WD_ERR("invalid: %s is NULL!\n", p_name); return true; } - for (i = 0; i < e->dsize && i < msg->key_bytes; i++) { + for (i = 0; i < e->bsize; i++) { if (e->data[i]) return false; } - WD_ERR("error: %s all zero!\n", p_name); + WD_ERR("invalid: %s all zero!\n", p_name); return true; } @@ -1144,15 +1143,15 @@ static int ecc_prepare_sign_in(struct wcrypto_ecc_msg *msg, e = &in->dgst; if (!in->k_set) { if (msg->op_type != WCRYPTO_SM2_SIGN) { - WD_ERR("random k not set!\n"); + WD_ERR("invalid: random k not set!\n"); return -WD_EINVAL; } hw_msg->sm2_ksel = 1; - } else if (is_all_zero(k, msg, "ecc sgn k")) { + } else if (is_all_zero(k, "ecc sgn k")) { return -WD_EINVAL; } - if (is_all_zero(e, msg, "ecc sgn e")) + if (is_all_zero(e, "ecc sgn e")) return -WD_EINVAL; ret = qm_crypto_bin_to_hpre_bin(e->data, (const char *)e->data, @@ -1192,7 +1191,7 @@ static int ecc_prepare_verf_in(struct wcrypto_ecc_msg *msg, void **data) s = &vin->s; r = &vin->r; - if (is_all_zero(e, msg, "ecc vrf e")) + if (is_all_zero(e, "ecc vrf e")) return -WD_EINVAL; ret = qm_crypto_bin_to_hpre_bin(e->data, (const char *)e->data, @@ -1274,7 +1273,7 @@ static int ecc_prepare_sm2_enc_in(struct wcrypto_ecc_msg *msg, int ret; if (ein->k_set) { - if (is_all_zero(k, msg, "sm2 enc k")) + if (is_all_zero(k, "sm2 enc k")) return -WD_EINVAL; ret = qm_crypto_bin_to_hpre_bin(k->data, (const char *)k->data, diff --git a/v1/wd_ecc.c b/v1/wd_ecc.c index e108051..e6b771a 100644 --- a/v1/wd_ecc.c +++ b/v1/wd_ecc.c @@ -544,6 +544,7 @@ static struct wcrypto_ecc_in *create_ecc_sign_in(struct wcrypto_ecc_ctx *ctx, { if (is_dgst) return create_ecc_in(ctx, ECC_SIGN_IN_PARAM_NUM); + return create_sm2_sign_in(ctx, m_len); } @@ -1489,7 +1490,6 @@ static int ecc_request_init(struct wcrypto_ecc_msg *req, if (req->op_type == WCRYPTO_ECXDH_GEN_KEY || req->op_type == WCRYPTO_SM2_KG) { struct wcrypto_ecc_point *g = NULL; - wcrypto_get_ecc_prikey_params((void *)key, NULL, NULL, NULL, NULL, &g, NULL); req->in = (void *)g; @@ -1715,11 +1715,11 @@ static bool less_than_latter(struct wd_dtb *d, struct wd_dtb *n) return ret < 0; } -static bool is_all_zero(struct wd_dtb *p, struct wcrypto_ecc_ctx *ctx) +static bool is_all_zero(struct wd_dtb *p) { int i; - for (i = 0; i < p->dsize && i < ctx->key_size; i++) { + for (i = 0; i < p->bsize; i++) { if (p->data[i]) return false; } @@ -1733,7 +1733,7 @@ static bool check_k_param(struct wd_dtb *k, struct wcrypto_ecc_ctx *ctx) int ret; if (unlikely(!k->data)) { - WD_ERR("error: k->data NULL!\n"); + WD_ERR("invalid: k->data NULL!\n"); return false; } @@ -1744,12 +1744,12 @@ static bool check_k_param(struct wd_dtb *k, struct wcrypto_ecc_ctx *ctx) } if (unlikely(!less_than_latter(k, &cv->n))) { - WD_ERR("error: k >= n\n"); + WD_ERR("invalid: k >= n!\n"); return false; } - if (unlikely(is_all_zero(k, ctx))) { - WD_ERR("error: k all zero\n"); + if (unlikely(is_all_zero(k))) { + WD_ERR("invalid: k all zero!\n"); return false; } -- 2.30.0

1 0

[PATCH] uadk/ecc: cleanup sm2 dec out code
by Zhiqi Song 14 Dec '22

14 Dec '22

Delete incorrect comments and use variable name that meet the algorithm criteria. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- drv/hisi_hpre.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drv/hisi_hpre.c b/drv/hisi_hpre.c index 877b2a5..aec2f57 100644 --- a/drv/hisi_hpre.c +++ b/drv/hisi_hpre.c @@ -2190,11 +2190,11 @@ static int sm2_convert_dec_out(struct wd_ecc_msg *src, struct wd_sm2_dec_out *dout = &out->param.dout; struct wd_ecc_in *in = (void *)src->req.src; struct wd_sm2_dec_in *din = &in->param.din; + char buff[MAX_HASH_LENS] = {0}; struct wd_ecc_dh_out *dh_out; __u32 ksz = dst->key_bytes; struct wd_ecc_point x2y2; - struct wd_dtb tmp = {0}; - char buff[64] = {0}; + struct wd_dtb u = {0}; int ret; /* @@ -2210,8 +2210,6 @@ static int sm2_convert_dec_out(struct wd_ecc_msg *src, x2y2.x.dsize = ksz; x2y2.y.dsize = ksz; - tmp.data = buff; - /* t = KDF(x2 || y2, klen) */ ret = sm2_kdf(&dout->plaintext, &x2y2, din->c2.dsize, &src->hash); if (unlikely(ret)) { @@ -2219,20 +2217,21 @@ static int sm2_convert_dec_out(struct wd_ecc_msg *src, return ret; } - /* M' = C2 XOR t */ + /* M' = c2 XOR t */ sm2_xor(&dout->plaintext, &din->c2); - /* u = hash(x2 || M' || y2), save u to din->c2 */ - ret = sm2_hash(&tmp, &x2y2, &dout->plaintext, &src->hash); + /* u = hash(x2 || M' || y2) */ + u.data = buff; + ret = sm2_hash(&u, &x2y2, &dout->plaintext, &src->hash); if (unlikely(ret)) { WD_ERR("failed to compute c3, ret = %d!\n", ret); return ret; } - /* u == c3 */ - ret = is_equal(&tmp, &din->c3); + /* Judge whether u == c3 */ + ret = is_equal(&u, &din->c3); if (ret) - WD_ERR("failed to decode sm2, u != C3!\n"); + WD_ERR("failed to decode sm2, u != c3!\n"); return ret; } -- 2.30.0

1 0