- Acc - mailweb.openeuler.org

[PATCH] sanity_test: replace zip_sva_perf by uadk_tool test --m zip
by Qi Tao 25 Apr '25

25 Apr '25

From: Hao Fang <fanghao11(a)huawei.com> uadk_tool test --m zip supports the most of function tests except for one command --ilist, so the test file size set to 8MB for block mode. The --ilist cmd has been removed because a complex user protocol was constructed only for large file compression in block mode. Signed-off-by: Hao Fang <fanghao11(a)huawei.com> Signed-off-by: Qi Tao <taoqi10(a)huawei.com> --- test/sanity_test.sh | 62 +++++++++++++++++++------------------- uadk_tool/test/comp_main.c | 5 --- 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/test/sanity_test.sh b/test/sanity_test.sh index 591f8e2d..a1f2b234 100755 --- a/test/sanity_test.sh +++ b/test/sanity_test.sh @@ -88,10 +88,10 @@ hw_blk_deflate() case $3 in "gzip") ${RM} -f /tmp/gzip_list.bin - run_cmd zip_sva_perf --in $1 --out $2 --olist /tmp/gzip_list.bin $@ + run_cmd uadk_tool test --m zip --in $1 --out $2 $@ ;; "zlib") - run_cmd zip_sva_perf -z --in $1 --out $2 --olist /tmp/zlib_list.bin $@ + run_cmd uadk_tool test --m zip --alg 1 --in $1 --out $2 $@ ;; *) echo "Unsupported algorithm type: $3" @@ -105,10 +105,10 @@ hw_blk_inflate() { case $3 in "gzip") - run_cmd zip_sva_perf -d --in $1 --out $2 --ilist /tmp/gzip_list.bin $@ + run_cmd uadk_tool test --m zip --inf --in $1 --out $2 $@ ;; "zlib") - run_cmd zip_sva_perf -z -d --in $1 --out $2 --ilist /tmp/zlib_list.bin $@ + run_cmd uadk_tool test --m zip --alg 1 --inf --in $1 --out $2 $@ ;; *) echo "Unsupported algorithm type: $3" @@ -122,10 +122,10 @@ hw_strm_deflate() { case $3 in "gzip") - run_cmd zip_sva_perf -S --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --in $1 --out $2 $@ ;; "zlib") - run_cmd zip_sva_perf -z -S --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --alg 1 --in $1 --out $2 $@ ;; *) echo "Unsupported algorithm type: $3" @@ -139,10 +139,10 @@ hw_strm_inflate() { case $3 in "gzip") - run_cmd zip_sva_perf -S -d --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --inf --in $1 --out $2 $@ ;; "zlib") - run_cmd zip_sva_perf -z -S -d --in $1 --out $2 $@ + run_cmd uadk_tool test --m zip --stream --inf --in $1 --out $2 $@ ;; *) echo "Unsupported algorithm type: $3" @@ -234,12 +234,12 @@ hw_dfl_sw_ifl() prepare_src_file random 1 md5sum origin > ori.md5 - hw_blk_deflate origin /tmp/ori.gz gzip -b 8192 --env + hw_blk_deflate origin /tmp/ori.gz gzip --blksize 8192 --env sw_blk_inflate /tmp/ori.gz origin gzip md5sum -c ori.md5 ${RM} -f /tmp/ori.gz - hw_strm_deflate origin /tmp/ori.gz gzip -b 8192 --env + hw_strm_deflate origin /tmp/ori.gz gzip --blksize 8192 --env sw_strm_inflate /tmp/ori.gz origin gzip md5sum -c ori.md5 @@ -249,7 +249,7 @@ hw_dfl_sw_ifl() md5sum origin > ori.md5 ${RM} -f /tmp/ori.gz - hw_strm_deflate origin /tmp/ori.gz gzip -b 8192 --env + hw_strm_deflate origin /tmp/ori.gz gzip --blksize 8192 --env sw_strm_inflate /tmp/ori.gz origin gzip md5sum -c ori.md5 @@ -259,13 +259,13 @@ hw_dfl_sw_ifl() prepare_src_file $1 md5sum origin > ori.md5 - hw_blk_deflate origin /tmp/ori.gz gzip -b 8192 --env + hw_blk_deflate origin /tmp/ori.gz gzip --blksize 8192 --env sw_blk_inflate /tmp/ori.gz origin gzip md5sum -c ori.md5 # This case fails. ${RM} -f /tmp/ori.gz - hw_strm_deflate origin /tmp/ori.gz gzip -b 8192 --env + hw_strm_deflate origin /tmp/ori.gz gzip --blksize 8192 --env sw_strm_inflate /tmp/ori.gz origin gzip md5sum -c ori.md5 } @@ -282,13 +282,13 @@ sw_dfl_hw_ifl() # Only gzip compress and hardware decompress sw_blk_deflate origin /tmp/ori.gz gzip 8192 - hw_blk_inflate /tmp/ori.gz origin gzip -b 8192 + hw_blk_inflate /tmp/ori.gz origin gzip --blksize 8192 md5sum -c ori.md5 - hw_blk_inflate /tmp/ori.gz origin gzip -b 8192 --env + hw_blk_inflate /tmp/ori.gz origin gzip --blksize 8192 --env md5sum -c ori.md5 sw_strm_deflate origin /tmp/ori.gz gzip 8192 - hw_strm_inflate /tmp/ori.gz origin gzip -b 8192 --env + hw_strm_inflate /tmp/ori.gz origin gzip --blksize 8192 --env md5sum -c ori.md5 # Generate random data with 500MB size @@ -298,7 +298,7 @@ sw_dfl_hw_ifl() ${RM} -f /tmp/ori.gz sw_strm_deflate origin /tmp/ori.gz gzip 8192 - hw_strm_inflate /tmp/ori.gz origin gzip -b 8192 --env + hw_strm_inflate /tmp/ori.gz origin gzip --blksize 8192 --env md5sum -c ori.md5 # Use existed text file. It's not in alignment. @@ -308,11 +308,11 @@ sw_dfl_hw_ifl() md5sum origin > ori.md5 #sw_blk_deflate origin /tmp/ori.gz gzip 8192 - #hw_blk_inflate /tmp/ori.gz origin gzip -b 8192 --env + #hw_blk_inflate /tmp/ori.gz origin gzip --blksize 8192 --env #md5sum -c ori.md5 sw_strm_deflate origin /tmp/ori.gz gzip 8192 - hw_strm_inflate /tmp/ori.gz origin gzip -b 8192 --env + hw_strm_inflate /tmp/ori.gz origin gzip --blksize 8192 --env md5sum -c ori.md5 } @@ -326,13 +326,13 @@ hw_dfl_hw_ifl() prepare_src_file random 1 md5sum origin > ori.md5 - hw_blk_deflate origin /tmp/ori.gz gzip -b 8192 - hw_blk_inflate /tmp/ori.gz origin gzip -b 8192 + hw_blk_deflate origin /tmp/ori.gz gzip --blksize 8192 + hw_blk_inflate /tmp/ori.gz origin gzip --blksize 8192 md5sum -c ori.md5 ${RM} -f /tmp/ori.gz - hw_strm_deflate origin /tmp/ori.gz gzip -b 8192 - hw_strm_inflate /tmp/ori.gz origin gzip -b 8192 + hw_strm_deflate origin /tmp/ori.gz gzip --blksize 8192 + hw_strm_inflate /tmp/ori.gz origin gzip --blksize 8192 md5sum -c ori.md5 # Use existed text file. It's not in alignment. @@ -341,13 +341,13 @@ hw_dfl_hw_ifl() prepare_src_file $1 md5sum origin > ori.md5 - #hw_blk_deflate origin /tmp/ori.gz gzip -b 8192 - #hw_blk_inflate /tmp/ori.gz origin gzip -b 8192 + #hw_blk_deflate origin /tmp/ori.gz gzip --blksize 8192 + #hw_blk_inflate /tmp/ori.gz origin gzip --blksize 8192 #md5sum -c ori.md5 ${RM} -f /tmp/ori.gz - hw_strm_deflate origin /tmp/ori.gz gzip -b 8192 - hw_strm_inflate /tmp/ori.gz origin gzip -b 8192 + hw_strm_deflate origin /tmp/ori.gz gzip --blksize 8192 + hw_strm_inflate /tmp/ori.gz origin gzip --blksize 8192 md5sum -c ori.md5 } @@ -358,17 +358,17 @@ run_zip_test_v2() export WD_COMP_ASYNC_POLL_EN=1 export WD_COMP_ASYNC_POLL_NUM="4@0" # test without environment variables - # limit test file in 64MB + # limit test file in 8MB rm -fr /tmp/syslog - dd if=/var/log/syslog of=/tmp/syslog bs=1M count=16 >& /dev/null + dd if=/var/log/syslog of=/tmp/syslog bs=1M count=8 >& /dev/null sw_dfl_hw_ifl /tmp/syslog hw_dfl_sw_ifl /tmp/syslog WD_COMP_EPOLL_EN=1 hw_dfl_hw_ifl /tmp/syslog WD_COMP_EPOLL_EN=0 hw_dfl_hw_ifl /tmp/syslog # test without environment variables - #run_cmd zip_sva_perf -b 8192 -s 81920 -l 1000 --self + #run_cmd uadk_tool test --m zip --blksize 8192 --size 81920 --loop 1000 --self # test with environment variables - #run_cmd zip_sva_perf -b 8192 -s 81920 -l 1000 --self --env + #run_cmd uadk_tool test --m zip --blksize 8192 --size 81920 --loop 1000 --self --env } # Accept more paraterms diff --git a/uadk_tool/test/comp_main.c b/uadk_tool/test/comp_main.c index 3bdfea62..77d5decc 100644 --- a/uadk_tool/test/comp_main.c +++ b/uadk_tool/test/comp_main.c @@ -674,11 +674,6 @@ int store_file(struct hizip_test_info *info, char *model) size_t sum = 0; ssize_t file_sz = 0; - if (!opts->is_stream) { - COMP_TST_PRT("Invalid, file need stream mode!\n"); - return -EINVAL; - } - p = tdata->out_list; file_sz = write(opts->fd_out, p->addr, p->size); if (file_sz < p->size) -- 2.33.0

1 0

[PATCH 01/29] uadk: fix for aead soft compute
by Qi Tao 24 Apr '25

24 Apr '25

From: Wenkai Lin <linwenkai6(a)hisilicon.com> When soft computing is required, an invalid BD is used to ensure the integrity of the sending and receiving process, it is more efficient. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> Signed-off-by: Qi Tao <taoqi10(a)huawei.com> --- drv/hisi_sec.c | 49 ++++++++++++------------------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index 7f4ae109..5990565a 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -54,6 +54,8 @@ #define SEC_AI_GEN_OFFSET_V3 2 #define SEC_SEQ_OFFSET_V3 6 #define SEC_AUTH_MASK_V3 0xFFFFFFFC +#define SEC_BD3_IVLD_OFFSET 0x4 +#define SEC_BD2_IVLD_OFFSET 0x7 #define SEC_SGL_MODE_MASK_V3 0x4800 #define SEC_PBUFF_MODE_MASK_V3 0x800 @@ -2440,7 +2442,7 @@ static int gcm_do_soft_mac(struct wd_aead_msg *msg) msg->result = WD_SUCCESS; - return WD_SOFT_COMPUTING; + return WD_SUCCESS; } static int fill_stream_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) @@ -2460,6 +2462,8 @@ static int fill_stream_bd2(struct wd_aead_msg *msg, struct hisi_sec_sqe *sqe) if (msg->cmode == WD_CIPHER_GCM) { gcm_auth_ivin(msg); ret = gcm_do_soft_mac(msg); + /* Make the bd invalid to avoid recalculation of the data. */ + sqe->iv_tls_ld = 0x1 << SEC_BD2_IVLD_OFFSET; } break; default: @@ -2577,12 +2581,8 @@ static int hisi_sec_aead_send(struct wd_alg_driver *drv, handle_t ctx, void *wd_ fill_aead_bd2_addr(msg, &sqe); ret = fill_stream_bd2(msg, &sqe); - if (ret == WD_SOFT_COMPUTING) { - ret = 0; - goto put_sgl; - } else if (unlikely(ret)) { + if (unlikely(ret)) goto put_sgl; - } hisi_set_msg_id(h_qp, &msg->tag); sqe.type2.tag = (__u16)msg->tag; @@ -2661,24 +2661,6 @@ static void parse_aead_bd2(struct hisi_qp *qp, struct hisi_sec_sqe *sqe, dump_sec_msg(temp_msg, "aead"); } -static bool soft_compute_check(struct hisi_qp *qp, struct wd_aead_msg *msg) -{ - /* Asynchronous mode does not use the sent message, so ignores it */ - if (qp->q_info.qp_mode == CTX_MODE_ASYNC) - return false; - /* - * For aead gcm stream mode, due to some hardware limitations, - * the final message was not sent to hardware if the qm is - * not higher than v3 version or the input length of the - * message is 0, the software calculation has been executed. - */ - if (msg->msg_state == AEAD_MSG_END && msg->cmode == WD_CIPHER_GCM && - (qp->q_info.hw_type <= HISI_QM_API_VER3_BASE || !msg->in_bytes)) - return true; - - return false; -} - static int hisi_sec_aead_recv(struct wd_alg_driver *drv, handle_t ctx, void *wd_msg) { handle_t h_qp = (handle_t)wd_ctx_get_priv(ctx); @@ -2687,9 +2669,6 @@ static int hisi_sec_aead_recv(struct wd_alg_driver *drv, handle_t ctx, void *wd_ __u16 count = 0; int ret; - if (soft_compute_check((struct hisi_qp *)h_qp, recv_msg)) - return 0; - ret = hisi_qm_recv(h_qp, &sqe, 1, &count); if (ret < 0) return ret; @@ -2886,10 +2865,13 @@ static int fill_stream_bd3(handle_t h_qp, struct wd_aead_msg *msg, struct hisi_s if (msg->cmode == WD_CIPHER_GCM) { gcm_auth_ivin(msg); /* Due to hardware limitations, software compute is required. */ - if (qp->q_info.hw_type <= HISI_QM_API_VER3_BASE || !msg->in_bytes) + if (qp->q_info.hw_type <= HISI_QM_API_VER3_BASE || !msg->in_bytes) { ret = gcm_do_soft_mac(msg); - else + /* Make the bd invalid to avoid recalculation of the data. */ + sqe->bd_param |= 0x1 << SEC_BD3_IVLD_OFFSET; + } else { fill_gcm_final_bd3(msg, sqe); + } } break; default: @@ -2982,12 +2964,8 @@ static int hisi_sec_aead_send_v3(struct wd_alg_driver *drv, handle_t ctx, void * fill_aead_bd3_addr(msg, &sqe); ret = fill_stream_bd3(h_qp, msg, &sqe); - if (ret == WD_SOFT_COMPUTING) { - ret = 0; - goto put_sgl; - } else if (unlikely(ret)) { + if (unlikely(ret)) goto put_sgl; - } hisi_set_msg_id(h_qp, &msg->tag); sqe.tag = msg->tag; @@ -3059,9 +3037,6 @@ static int hisi_sec_aead_recv_v3(struct wd_alg_driver *drv, handle_t ctx, void * __u16 count = 0; int ret; - if (soft_compute_check((struct hisi_qp *)h_qp, recv_msg)) - return 0; - ret = hisi_qm_recv(h_qp, &sqe, 1, &count); if (ret < 0) return ret; -- 2.33.0

1 28

[PATCH 00/17] uadk_provider: add switching software computation function
by Qi Tao 21 Apr '25

21 Apr '25

From: JiangShui Yang <yangjiangshui(a)h-partners.com> Chenghai Huang (4): uadk_provider: fix a memory leak issue in BIO_meth uadk_provider: add hmac alg for uadk_provider in openssl3.0 uadk_provider: add soft mac switching function for uadk_provider uadk_engine: fix a digest software switching issue in update Junchong Pan (1): uadk_engine - fix print format Qi Tao (2): uadk_provider: fix async packet reception timeout error uadk_prov: sec support switching to soft calculation Wenkai Lin (2): digest: fix for digest soft work digest: fix for digest soft init Zhiqi Song (1): uadk_provider: fix atomic compare parameter lizhi (7): uadk_provider: support switching to software in init uadk_provider/dh: add dh switching software computation function uadk_provider/rsa: add rsa switching software computation function uadk_provider/sm2: add sm2 switching software computation function uadk_provider/ecx: add x448 and x25519 switching software computation function uadk_provider/ecdsa: add ecdsa switching software computation function uadk_provider/ecdh: add ecdh switching software computation function src/Makefile.am | 3 +- src/uadk_async.h | 1 + src/uadk_digest.c | 108 ++-- src/uadk_ec.c | 2 +- src/uadk_prov.h | 11 + src/uadk_prov_aead.c | 340 ++++++++--- src/uadk_prov_cipher.c | 93 +++- src/uadk_prov_dh.c | 88 ++- src/uadk_prov_digest.c | 220 +++++--- src/uadk_prov_ec_kmgmt.c | 27 +- src/uadk_prov_ecdh_exch.c | 61 +- src/uadk_prov_ecdsa.c | 69 ++- src/uadk_prov_ecx.c | 242 +++++--- src/uadk_prov_hmac.c | 1115 +++++++++++++++++++++++++++++++++++++ src/uadk_prov_init.c | 171 ++++-- src/uadk_prov_pkey.c | 30 +- src/uadk_prov_pkey.h | 6 + src/uadk_prov_rsa.c | 182 +++--- src/uadk_prov_sm2.c | 241 +++++++- 19 files changed, 2526 insertions(+), 484 deletions(-) create mode 100644 src/uadk_prov_hmac.c -- 2.33.0

1 17

2025/4/16 AccLIb SIG 双周例会 11:00 - 12:00
by openEuler conference 15 Apr '25

15 Apr '25

您好！ sig-AccLib 邀请您参加 2025-04-16 11:00 召开的Zoom会议会议主题：2025/4/16 AccLIb SIG 双周例会 11:00 - 12:00 会议内容：会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet 会议链接：https://us06web.zoom.us/j/85069156271?pwd=tWrjUA5saZVqZ4PxRJX7XMjqZv4GNa.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 更多资讯尽在：https://www.openeuler.org/zh/ Hello! sig-AccLib invites you to attend the Zoom conference will be held at 2025-04-16 11:00, The subject of the conference is 2025/4/16 AccLIb SIG 双周例会 11:00 - 12:00 Summary: 会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet You can join the meeting at https://us06web.zoom.us/j/85069156271?pwd=tWrjUA5saZVqZ4PxRJX7XMjqZv4GNa.1 Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings More information: https://www.openeuler.org/en/

1 0

2025/4/2 AccLIb SIG 双周例会 11:00 - 12:00
by openEuler conference 01 Apr '25

01 Apr '25

您好！ sig-AccLib 邀请您参加 2025-04-02 11:00 召开的Zoom会议会议主题：2025/4/2 AccLIb SIG 双周例会 11:00 - 12:00 会议内容：会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet 会议链接：https://us06web.zoom.us/j/89619281074?pwd=U8YN8vo04bS9kKqwQntJjtamrbUeYY.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 更多资讯尽在：https://www.openeuler.org/zh/ Hello! sig-AccLib invites you to attend the Zoom conference will be held at 2025-04-02 11:00, The subject of the conference is 2025/4/2 AccLIb SIG 双周例会 11:00 - 12:00 Summary: 会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet You can join the meeting at https://us06web.zoom.us/j/89619281074?pwd=U8YN8vo04bS9kKqwQntJjtamrbUeYY.1 Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings More information: https://www.openeuler.org/en/

1 0

[PATCH 1/3] tests/qtest: Allow DSDT acpi tables to change
by Zhou Wang 31 Mar '25

31 Mar '25

From: caijian <caijian11(a)h-partners.com> List all DSDT files and allow them to change. Signed-of-by: caijian <caijian11(a)h-partners.com> --- tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..e4a94bb8bd 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,7 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/microvm/DSDT.pcie", +"tests/data/acpi/virt/DSDT", +"tests/data/acpi/virt/DSDT.acpihmatvirt", +"tests/data/acpi/virt/DSDT.memhp", +"tests/data/acpi/virt/DSDT.pxb", +"tests/data/acpi/virt/DSDT.topology", -- 2.43.0

1 5

【2025/3/19 AccLIb SIG 双周例会 11:00 - 12:00】
by openEuler conference 18 Mar '25

18 Mar '25

您好！ sig-AccLib 邀请您参加 2025-03-19 11:00 召开的Zoom会议会议主题：【2025/3/19 AccLIb SIG 双周例会 11:00 - 12:00】会议内容：会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet 会议链接：https://us06web.zoom.us/j/83002354706?pwd=X0OBGbq6auYKYZcvtSXaJqLNODbCfs.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 更多资讯尽在：https://www.openeuler.org/zh/ Hello! sig-AccLib invites you to attend the Zoom conference will be held at 2025-03-19 11:00, The subject of the conference is 【2025/3/19 AccLIb SIG 双周例会 11:00 - 12:00】 Summary: 会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet You can join the meeting at https://us06web.zoom.us/j/83002354706?pwd=X0OBGbq6auYKYZcvtSXaJqLNODbCfs.1 Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings More information: https://www.openeuler.org/en/

1 0

2025/3/5 AccLIb SIG 双周例会 11:00 - 12:00
by openEuler conference 04 Mar '25

04 Mar '25

您好！ sig-AccLib 邀请您参加 2025-03-05 11:00 召开的Zoom会议会议主题：2025/3/5 AccLIb SIG 双周例会 11:00 - 12:00 会议内容：会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meetings 会议链接：https://us06web.zoom.us/j/86433360382?pwd=sHbExElIDMtdjFUNtt2A4ZfbFqTssp.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 更多资讯尽在：https://www.openeuler.org/zh/ Hello! sig-AccLib invites you to attend the Zoom conference will be held at 2025-03-05 11:00, The subject of the conference is 2025/3/5 AccLIb SIG 双周例会 11:00 - 12:00 Summary: 会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meetings You can join the meeting at https://us06web.zoom.us/j/86433360382?pwd=sHbExElIDMtdjFUNtt2A4ZfbFqTssp.1 Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings More information: https://www.openeuler.org/en/

1 0

2025/2/19 AccLIb SIG 双周例会 11:00 - 12:00
by openEuler conference 18 Feb '25

18 Feb '25

您好！ sig-AccLib 邀请您参加 2025-02-19 11:00 召开的Zoom会议会议主题：2025/2/19 AccLIb SIG 双周例会 11:00 - 12:00 会议内容：会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet 会议链接：https://us06web.zoom.us/j/84927213524?pwd=QpZ05fkCFtfN0j2vRR0JN5jUsXaR7l.1 会议纪要：https://etherpad.openeuler.org/p/sig-AccLib-meetings 更多资讯尽在：https://www.openeuler.org/zh/ Hello! sig-AccLib invites you to attend the Zoom conference will be held at 2025-02-19 11:00, The subject of the conference is 2025/2/19 AccLIb SIG 双周例会 11:00 - 12:00 Summary: 会议链接：linaro-org.zoom.us/j/91879279131 会议纪要：etherpad.openeuler.org/p/sig-AccLib-meet You can join the meeting at https://us06web.zoom.us/j/84927213524?pwd=QpZ05fkCFtfN0j2vRR0JN5jUsXaR7l.1 Add topics at https://etherpad.openeuler.org/p/sig-AccLib-meetings More information: https://www.openeuler.org/en/

1 0

[PATCH] digest: fix for digest soft init
by Qi Tao 05 Feb '25

05 Feb '25

From: Wenkai Lin <linwenkai6(a)hisilicon.com> Ensure that soft_ctx is initialized before invoking software calculation and reduces repeated judgments for digest soft init. Signed-off-by: Wenkai Lin <linwenkai6(a)hisilicon.com> --- src/uadk_digest.c | 83 ++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/src/uadk_digest.c b/src/uadk_digest.c index ed68ee2..f7882e4 100644 --- a/src/uadk_digest.c +++ b/src/uadk_digest.c @@ -189,70 +189,56 @@ static EVP_MD *uadk_sha512; static int uadk_e_digests_soft_md(struct digest_priv_ctx *priv) { - int app_datasize = 0; + int app_datasize; - if (priv->soft_md) + if (priv->soft_md && priv->soft_ctx) return 1; switch (priv->e_nid) { - case NID_sm3: - priv->soft_md = EVP_sm3(); - break; case NID_md5: priv->soft_md = EVP_md5(); + /* OpenSSL 3.0 has no app_datasize, need set manually + * check crypto/evp/legacy_md5.c: md5_md as example + */ + app_datasize = EVP_MD_meth_get_app_datasize(priv->soft_md); + if (!app_datasize) + app_datasize = sizeof(EVP_MD *) + sizeof(MD5_CTX); + break; + case NID_sm3: + priv->soft_md = EVP_sm3(); + app_datasize = EVP_MD_meth_get_app_datasize(priv->soft_md); + if (!app_datasize) + app_datasize = sizeof(EVP_MD *) + sizeof(SM3_CTX); break; case NID_sha1: priv->soft_md = EVP_sha1(); + app_datasize = EVP_MD_meth_get_app_datasize(priv->soft_md); + if (!app_datasize) + app_datasize = sizeof(EVP_MD *) + sizeof(SHA_CTX); break; case NID_sha224: - priv->soft_md = EVP_sha224(); - break; case NID_sha256: - priv->soft_md = EVP_sha256(); + if (priv->e_nid == NID_sha224) + priv->soft_md = EVP_sha224(); + else + priv->soft_md = EVP_sha256(); + app_datasize = EVP_MD_meth_get_app_datasize(priv->soft_md); + if (!app_datasize) + app_datasize = sizeof(EVP_MD *) + sizeof(SHA256_CTX); break; case NID_sha384: - priv->soft_md = EVP_sha384(); - break; case NID_sha512: - priv->soft_md = EVP_sha512(); + if (priv->e_nid == NID_sha384) + priv->soft_md = EVP_sha384(); + else + priv->soft_md = EVP_sha512(); + app_datasize = EVP_MD_meth_get_app_datasize(priv->soft_md); + if (!app_datasize) + app_datasize = sizeof(EVP_MD *) + sizeof(SHA512_CTX); break; default: - break; - } - - if (unlikely(priv->soft_md == NULL)) + fprintf(stderr, "digest nid %d is invalid.\n", priv->e_nid); return 0; - - app_datasize = EVP_MD_meth_get_app_datasize(priv->soft_md); - if (app_datasize == 0) { - /* OpenSSL 3.0 has no app_datasize, need set manually - * check crypto/evp/legacy_md5.c: md5_md as example - */ - switch (priv->e_nid) { - case NID_sm3: - app_datasize = sizeof(EVP_MD *) + sizeof(SM3_CTX); - break; - case NID_md5: - app_datasize = sizeof(EVP_MD *) + sizeof(MD5_CTX); - break; - case NID_sha1: - app_datasize = sizeof(EVP_MD *) + sizeof(SHA_CTX); - break; - case NID_sha224: - app_datasize = sizeof(EVP_MD *) + sizeof(SHA256_CTX); - break; - case NID_sha256: - app_datasize = sizeof(EVP_MD *) + sizeof(SHA256_CTX); - break; - case NID_sha384: - app_datasize = sizeof(EVP_MD *) + sizeof(SHA512_CTX); - break; - case NID_sha512: - app_datasize = sizeof(EVP_MD *) + sizeof(SHA512_CTX); - break; - default: - break; - } } if (priv->soft_ctx == NULL) { @@ -262,8 +248,10 @@ static int uadk_e_digests_soft_md(struct digest_priv_ctx *priv) return 0; ctx->md_data = OPENSSL_malloc(app_datasize); - if (ctx->md_data == NULL) + if (ctx->md_data == NULL) { + EVP_MD_CTX_free(ctx); return 0; + } priv->soft_ctx = ctx; priv->app_datasize = app_datasize; @@ -1015,6 +1003,7 @@ static int uadk_e_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) } if (t->soft_ctx) { + t->soft_md = NULL; t->soft_ctx = NULL; ret = digest_soft_init(t); if (!ret) -- 2.33.0

1 0