- Acc - lists.linaro.org

[PATCH 1/7] v1/hpre: fix key transfer error issue

by Weili Qian

Currently, the RSA algorithm calls qm_crypto_bin_to_hpre_bin() to transfer the key when sending request. However, the key needs to be transferred only once, repeated transfer may cause data inconsistency with original user's data, resulting in incorrect calculation results. Therefore, after the key is transferred, the 'dsize' is changed to the 'bsize', When 'disze' and 'bsize' are equal, no transfer is performed. Signed-off-by: Weili Qian <qianweili(a)huawei.com> --- v1/drv/hisi_hpre_udrv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/v1/drv/hisi_hpre_udrv.c b/v1/drv/hisi_hpre_udrv.c index 193ba56..0d0c3b4 100644 --- a/v1/drv/hisi_hpre_udrv.c +++ b/v1/drv/hisi_hpre_udrv.c @@ -136,27 +136,32 @@ static int qm_fill_rsa_crt_prikey2(struct wcrypto_rsa_prikey *prikey, wd_dq->bsize, wd_dq->dsize, "rsa crt dq"); if (unlikely(ret)) return ret; + wd_dq->dsize = wd_dq->bsize; ret = qm_crypto_bin_to_hpre_bin(wd_dp->data, (const char *)wd_dp->data, wd_dp->bsize, wd_dp->dsize, "rsa crt dp"); if (unlikely(ret)) return ret; + wd_dp->dsize = wd_dp->bsize; ret = qm_crypto_bin_to_hpre_bin(wd_q->data, (const char *)wd_q->data, wd_q->bsize, wd_q->dsize, "rsa crt q"); if (unlikely(ret)) return ret; + wd_q->dsize = wd_q->bsize; ret = qm_crypto_bin_to_hpre_bin(wd_p->data, (const char *)wd_p->data, wd_p->bsize, wd_p->dsize, "rsa crt p"); if (unlikely(ret)) return ret; + wd_p->dsize = wd_p->bsize; ret = qm_crypto_bin_to_hpre_bin(wd_qinv->data, (const char *)wd_qinv->data, wd_qinv->bsize, wd_qinv->dsize, "rsa crt qinv"); if (unlikely(ret)) return ret; + wd_qinv->dsize = wd_qinv->bsize; *data = wd_dq->data; return (int)(wd_dq->bsize + wd_qinv->bsize + wd_p->bsize + @@ -179,11 +184,13 @@ static int qm_fill_rsa_prikey1(struct wcrypto_rsa_prikey *prikey, void **data) wd_d->bsize, wd_d->dsize, "rsa prikey1 d"); if (unlikely(ret)) return ret; + wd_d->dsize = wd_d->bsize; ret = qm_crypto_bin_to_hpre_bin(wd_n->data, (const char *)wd_n->data, wd_n->bsize, wd_n->dsize, "rsa prikey1 n"); if (unlikely(ret)) return ret; + wd_n->dsize = wd_n->bsize; *data = wd_d->data; return (int)(wd_n->bsize + wd_d->bsize); @@ -200,11 +207,13 @@ static int qm_fill_rsa_pubkey(struct wcrypto_rsa_pubkey *pubkey, void **data) wd_e->bsize, wd_e->dsize, "rsa pubkey e"); if (unlikely(ret)) return ret; + wd_e->dsize = wd_e->dsize; ret = qm_crypto_bin_to_hpre_bin(wd_n->data, (const char *)wd_n->data, wd_n->bsize, wd_n->dsize, "rsa pubkey n"); if (unlikely(ret)) return ret; + wd_n->dsize = wd_n->dsize; *data = wd_e->data; return (int)(wd_n->bsize + wd_e->bsize); -- 2.33.0

1 year, 5 months

1
6
0 0

[PATCH] uadk_cipher: fixup sm4 cfb flags

by Zhiqi Song

The flags of sm4 cfb should be EVP_CIPH_CFB_MODE, so fix it. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- src/uadk_cipher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uadk_cipher.c b/src/uadk_cipher.c index 9392e04..736a8af 100644 --- a/src/uadk_cipher.c +++ b/src/uadk_cipher.c @@ -931,7 +931,7 @@ EVP_CIPHER *uadk_create_cipher_meth(int nid) cipher = uadk_sm4_ofb128; break; case NID_sm4_cfb128: - UADK_CIPHER_DESCR(sm4_cfb128, 1, 16, 16, EVP_CIPH_OFB_MODE); + UADK_CIPHER_DESCR(sm4_cfb128, 1, 16, 16, EVP_CIPH_CFB_MODE); cipher = uadk_sm4_cfb128; break; case NID_sm4_ctr: -- 2.30.0

1 year, 5 months

1
0
0 0

[PATCH 00/17] uadk_engine: some bugfix and cleanup

by Zhiqi Song

This patchset contains some bugfix and cleanup. Hao Fang (6): uadk_engine: cipher/digest: fixes for priv address check uadk_engine: ec: add BN_new memory check uadk_engine: rsa: fix mem leak for from_buf uadk_engine: uadk_rsa: fix to free from_buffer uadk_engine: uask_async: fix thread_attr res leak uadk_engine: async: fix add async send timeout Qi Tao (3): cipher: uadk_e_bind_ciphers function is optimized cipher: UADK_CIPHER_DESCR is optimized uadk_engine/v1: fix g_sec_ciphers_info[] error Weili Qian (2): uadk_engine: add device initialization status sm2: fixup switching soft sm2 decrypt problem Zhiqi Song (6): ecc: optimize sm2 sign check function digest: fix the address of async op uadk_engine: fixup resource management issues ecc: add check of siglen v1/pkey: add check of qlist v1/pkey: fix uninitialized variable src/uadk.h | 5 + src/uadk_aead.c | 39 ++++-- src/uadk_async.c | 14 +- src/uadk_async.h | 1 + src/uadk_cipher.c | 170 ++++++++---------------- src/uadk_cipher_adapter.c | 38 +++--- src/uadk_dh.c | 150 +++++++++++++-------- src/uadk_digest.c | 59 +++++++-- src/uadk_ec.c | 69 ++++++---- src/uadk_ecx.c | 8 +- src/uadk_pkey.c | 113 ++++++++++------ src/uadk_rsa.c | 218 +++++++++++++++++++------------ src/uadk_sm2.c | 42 +++--- src/v1/alg/ciphers/sec_ciphers.c | 2 +- src/v1/alg/pkey/hpre_rsa.c | 13 +- src/v1/alg/pkey/hpre_wd.c | 9 +- 16 files changed, 553 insertions(+), 397 deletions(-) -- 2.33.0

1 year, 5 months

2
18
0 0

[PATCH 01/10] uadk/v1/drv: hisi_zip_udrv - fix unmap buffer for lz77_zstd stream mode

by Yang Shen

In uadk v1, the library will alloc a ctx_buffer used for storing stream information. On hisilicon platform, the hardware will output some data to this buffer. So the ctx_buffer should be map to PA/IOVA. But here the lz77_zstd forgot to unmap this buffer on error branch. What's more, if the user use the wd_bmm ops, the unmap is a void function. Signed-off-by: Yang Shen <shenyang39(a)huawei.com> --- v1/drv/hisi_zip_udrv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/v1/drv/hisi_zip_udrv.c b/v1/drv/hisi_zip_udrv.c index f820b7f..470acb9 100644 --- a/v1/drv/hisi_zip_udrv.c +++ b/v1/drv/hisi_zip_udrv.c @@ -512,6 +512,9 @@ static int fill_zip_addr_lz77_zstd(void *ssqe, unmap_phy_seq: drv_iova_unmap(q, zstd_out->literal, (void *)phy_lit, zstd_out->lit_sz); unmap_phy_lit: + if (msg->stream_mode == WCRYPTO_COMP_STATEFUL) + drv_iova_unmap(q, msg->ctx_buf, (void *)addr.ctxbuf_addr - CTX_BUFFER_OFFSET, + MAX_CTX_RSV_SIZE); drv_iova_unmap(q, msg->src, (void *)addr.source_addr, msg->in_size); return -WD_ENOMEM; } -- 2.33.0

1 year, 5 months

1
9
0 0

[PATCH 00/33] uadk tool adds new testing function

by Longfang Liu

Update the testing function of uadk tool. Add test function of init2. Add TRNG test function Kai Ye (3): uadk_tool - support aead algorithm decrypto perf testing uadk_tool - support dual sec engine device testing uadk: support some uadk dfx stronger feature Longfang Liu (8): uadk_tool: Optimize sec's sva benchmark code uadk_tool: Optimize sec's no-sva benchmark code uadk_tool: Optimize sec's software benchmark code uadk_tool: add latency test function for uadk_tools uadk_tool: modify the clean code issue uadk/tools: Update test function for init2 uadk/sec: added init2 performance test uadk/comp: added init2 test function for comp Qi Tao (4): uadk_tool: fix the memory leak problem uadk_tool: fix error writing data to uninitialized memory uadk_tool: initialize the return value 'ret' of the function add secure compilation option Weili Qian (10): uadk_tool: delete redundant memset zero uadk_tool: fix possible memory leak in <alg>_uadk_async_run uadk_tool: fix the called function interface uadk_tool: release memory after all tasks are complete uadk_tool: fix hpre test code issues uadk_tool: Support performance test for TRNG. uadk_tool: added init2 test function for hpre uadk_tool: use marco to replace numbers uadk/tool: initialize cparams to zero uadk_tool: added sm4-xts GB test Wenkai Lin (3): uadk_tool/v1 - support aead algorithm decrypto perf testing uadk_tool/v1: fix sec benchmark problem uadk/tools: fix for uadk tool sec aead async mode Yang Shen (4): uadk/tools - support new parameters for compression uadk/tools - misc fixes for uadk compress performance uadk/tools - fix lz77_zstd performance test for nosva mode uadk/tools - fix for uadk compression stream performance Zhiqi Song (1): uadk_tool: support test case for aes cbc cts mode uadk_tool/Makefile.am | 7 +- uadk_tool/benchmark/hpre_protocol_data.h | 77 +- uadk_tool/benchmark/hpre_uadk_benchmark.c | 364 ++++-- uadk_tool/benchmark/hpre_wd_benchmark.c | 98 +- uadk_tool/benchmark/sec_soft_benchmark.c | 887 ++++++++++----- uadk_tool/benchmark/sec_uadk_benchmark.c | 1236 +++++++++++++++------ uadk_tool/benchmark/sec_wd_benchmark.c | 1217 +++++++++++++------- uadk_tool/benchmark/trng_wd_benchmark.c | 324 ++++++ uadk_tool/benchmark/trng_wd_benchmark.h | 7 + uadk_tool/benchmark/uadk_benchmark.c | 280 ++++- uadk_tool/benchmark/uadk_benchmark.h | 43 +- uadk_tool/benchmark/zip_uadk_benchmark.c | 299 +++-- uadk_tool/benchmark/zip_wd_benchmark.c | 335 +++--- uadk_tool/test/test_sec.c | 136 ++- 14 files changed, 3732 insertions(+), 1578 deletions(-) create mode 100644 uadk_tool/benchmark/trng_wd_benchmark.c create mode 100644 uadk_tool/benchmark/trng_wd_benchmark.h -- 2.33.0

1 year, 5 months

1
33
0 0

[PATCH 0/4] uadk: add new mode for cipher and digest

by Weili Qian

Add new mode for cipher and digest Weili Qian (4): uadk/cipher: support sm4-xts GB standard. uadk/v1/cipher: support sm4-xts GB standard uadk/v1/digest: support new AES mode algs uadk/v1: fix long hash state issue drv/hisi_sec.c | 8 ++- include/wd_cipher.h | 3 + v1/drv/hisi_sec_udrv.c | 146 ++++++++++++++++++++++++++++++----------- v1/wd_cipher.c | 3 +- v1/wd_cipher.h | 5 ++ v1/wd_digest.c | 69 +++++++++++++++++-- v1/wd_digest.h | 24 +++++-- v1/wd_util.c | 2 +- wd_alg.c | 3 + wd_cipher.c | 9 +-- 10 files changed, 216 insertions(+), 56 deletions(-) -- 2.33.0

1 year, 6 months

1
4
0 0

[PATCH 01/11 v2] uadk_engine: cleanup code style of async functions

by Zhiqi Song

Cleanup the return value and judgment code style of async mode functions. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- src/uadk_async.c | 132 +++++++++++++++++++++++------------------------ src/uadk_async.h | 3 ++ 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/src/uadk_async.c b/src/uadk_async.c index 9251238..3462d67 100644 --- a/src/uadk_async.c +++ b/src/uadk_async.c @@ -48,67 +48,65 @@ static void async_fd_cleanup(ASYNC_WAIT_CTX *ctx, const void *key, int async_setup_async_event_notification(struct async_op *op) { ASYNC_WAIT_CTX *waitctx; + void *custom = NULL; OSSL_ASYNC_FD efd; - void *custom; memset(op, 0, sizeof(struct async_op)); + op->job = ASYNC_get_current_job(); - if (op->job == NULL) - return 1; + if (!op->job) + return DO_SYNC; waitctx = ASYNC_get_wait_ctx(op->job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; - if (ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, - &efd, &custom) == 0) { + if (!ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom)) { efd = eventfd(0, EFD_NONBLOCK); if (efd == -1) - return 0; + return UADK_E_FAIL; - if (ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_uadk_id, efd, - custom, async_fd_cleanup) == 0) { + if (!ASYNC_WAIT_CTX_set_wait_fd(waitctx, engine_uadk_id, efd, + custom, async_fd_cleanup)) { async_fd_cleanup(waitctx, engine_uadk_id, efd, NULL); - return 0; + return UADK_E_FAIL; } } - return 1; + return UADK_E_SUCCESS; } int async_clear_async_event_notification(void) { - ASYNC_JOB *job; ASYNC_WAIT_CTX *waitctx; + void *custom = NULL; OSSL_ASYNC_FD efd; size_t num_add_fds; size_t num_del_fds; - void *custom = NULL; + ASYNC_JOB *job; job = ASYNC_get_current_job(); - if (job == NULL) - return 0; + if (!job) + return UADK_E_FAIL; waitctx = ASYNC_get_wait_ctx(job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; - if (ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &num_add_fds, - NULL, &num_del_fds) == 0) - return 0; + if (!ASYNC_WAIT_CTX_get_changed_fds(waitctx, NULL, &num_add_fds, NULL, &num_del_fds)) + return UADK_E_FAIL; if (num_add_fds > 0) { - if (ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, - &efd, &custom) == 0) - return 0; + if (!ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom)) + return UADK_E_FAIL; async_fd_cleanup(waitctx, engine_uadk_id, efd, NULL); - if (ASYNC_WAIT_CTX_clear_fd(waitctx, engine_uadk_id) == 0) - return 0; + if (!ASYNC_WAIT_CTX_clear_fd(waitctx, engine_uadk_id)) + return UADK_E_FAIL; } - return 1; + return UADK_E_SUCCESS; } static void async_poll_task_free(void) @@ -120,11 +118,11 @@ static void async_poll_task_free(void) uadk_e_set_async_poll_state(DISABLE_ASYNC_POLLING); error = pthread_mutex_lock(&poll_queue.async_task_mutex); - if (error != 0) + if (error) return; task = poll_queue.head; - if (task != NULL) + if (task) OPENSSL_free(task); poll_queue.head = NULL; @@ -143,13 +141,13 @@ static int async_get_poll_task(int *id) while (!poll_queue.status[idx]) { idx = (idx + 1) % ASYNC_QUEUE_TASK_NUM; if (cnt++ == ASYNC_QUEUE_TASK_NUM) - return 0; + return UADK_E_FAIL; } *id = idx; poll_queue.rid = (idx + 1) % ASYNC_QUEUE_TASK_NUM; - return 1; + return UADK_E_SUCCESS; } static struct async_poll_task *async_get_queue_task(void) @@ -158,11 +156,11 @@ static struct async_poll_task *async_get_queue_task(void) struct async_poll_task *task_queue; int idx, ret; - if (pthread_mutex_lock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_lock(&poll_queue.async_task_mutex)) return NULL; ret = async_get_poll_task(&idx); - if (!ret) + if (ret == UADK_E_FAIL) goto err; task_queue = poll_queue.head; @@ -170,10 +168,10 @@ static struct async_poll_task *async_get_queue_task(void) poll_queue.is_recv = 0; err: - if (pthread_mutex_unlock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_unlock(&poll_queue.async_task_mutex)) return NULL; - if (cur_task && cur_task->op == NULL) + if (cur_task && !cur_task->op) return NULL; return cur_task; @@ -181,7 +179,7 @@ err: void async_free_poll_task(int id, bool is_cb) { - if (pthread_mutex_lock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_lock(&poll_queue.async_task_mutex)) return; poll_queue.status[id] = 0; @@ -189,7 +187,7 @@ void async_free_poll_task(int id, bool is_cb) if (is_cb) poll_queue.is_recv = 1; - if (pthread_mutex_unlock(&poll_queue.async_task_mutex) != 0) + if (pthread_mutex_unlock(&poll_queue.async_task_mutex)) return; (void)sem_post(&poll_queue.empty_sem); @@ -202,17 +200,17 @@ int async_get_free_task(int *id) int idx, ret; int cnt = 0; - if (sem_wait(&poll_queue.empty_sem) != 0) - return 0; + if (sem_wait(&poll_queue.empty_sem)) + return UADK_E_FAIL; - if (pthread_mutex_lock(&poll_queue.async_task_mutex) != 0) - return 0; + if (pthread_mutex_lock(&poll_queue.async_task_mutex)) + return UADK_E_FAIL; idx = poll_queue.sid; while (poll_queue.status[idx]) { idx = (idx + 1) % ASYNC_QUEUE_TASK_NUM; if (cnt++ == ASYNC_QUEUE_TASK_NUM) { - ret = 0; + ret = UADK_E_FAIL; goto out; } } @@ -223,16 +221,16 @@ int async_get_free_task(int *id) task_queue = poll_queue.head; task = &task_queue[idx]; if (!task) { - ret = 0; + ret = UADK_E_FAIL; goto out; } task->op = NULL; - ret = 1; + ret = UADK_E_SUCCESS; out: - if (pthread_mutex_unlock(&poll_queue.async_task_mutex) != 0) - return 0; + if (pthread_mutex_unlock(&poll_queue.async_task_mutex)) + return UADK_E_FAIL; return ret; } @@ -246,7 +244,7 @@ static int async_add_poll_task(void *ctx, struct async_op *op, enum task_type ty task_queue = poll_queue.head; task = &task_queue[id]; if (!task) - return 0; + return UADK_E_FAIL; task->ctx = ctx; task->type = type; @@ -254,9 +252,9 @@ static int async_add_poll_task(void *ctx, struct async_op *op, enum task_type ty ret = sem_post(&poll_queue.full_sem); if (ret) - return 0; + return UADK_E_FAIL; - return 1; + return UADK_E_SUCCESS; } int async_pause_job(void *ctx, struct async_op *op, enum task_type type, int id) @@ -268,19 +266,19 @@ int async_pause_job(void *ctx, struct async_op *op, enum task_type type, int id) int ret; ret = async_add_poll_task(ctx, op, type, id); - if (ret == 0) + if (ret == UADK_E_FAIL) return ret; waitctx = ASYNC_get_wait_ctx((ASYNC_JOB *)op->job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; do { - if (ASYNC_pause_job() == 0) - return 0; + if (!ASYNC_pause_job()) + return UADK_E_FAIL; ret = ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom); - if (ret <= 0) + if (ret == UADK_E_FAIL) continue; if (read(efd, &buf, sizeof(uint64_t)) == -1) { @@ -298,13 +296,13 @@ int async_wake_job(ASYNC_JOB *job) { ASYNC_WAIT_CTX *waitctx; OSSL_ASYNC_FD efd; - void *custom; uint64_t buf = 1; + void *custom; int ret; waitctx = ASYNC_get_wait_ctx(job); - if (waitctx == NULL) - return 0; + if (!waitctx) + return UADK_E_FAIL; ret = ASYNC_WAIT_CTX_get_fd(waitctx, engine_uadk_id, &efd, &custom); if (ret > 0) { @@ -332,7 +330,7 @@ static void *async_poll_process_func(void *args) int ret, idx; while (uadk_e_get_async_poll_state()) { - if (sem_wait(&poll_queue.full_sem) != 0) { + if (sem_wait(&poll_queue.full_sem)) { if (errno == EINTR) { /* sem_wait is interrupted by interrupt, continue */ continue; @@ -340,7 +338,7 @@ static void *async_poll_process_func(void *args) } task = async_get_queue_task(); - if (task == NULL) { + if (!task) { (void)sem_post(&poll_queue.full_sem); usleep(1); continue; @@ -368,19 +366,19 @@ int async_module_init(void) memset(&poll_queue, 0, sizeof(struct async_poll_queue)); if (pthread_mutex_init(&(poll_queue.async_task_mutex), NULL) < 0) - return 0; + return UADK_E_FAIL; poll_queue.head = malloc(sizeof(struct async_poll_task) * ASYNC_QUEUE_TASK_NUM); - if (poll_queue.head == NULL) - return 0; + if (!poll_queue.head) + return UADK_E_FAIL; memset(poll_queue.head, 0, sizeof(struct async_poll_task) * ASYNC_QUEUE_TASK_NUM); - if (sem_init(&poll_queue.empty_sem, 0, ASYNC_QUEUE_TASK_NUM) != 0) + if (sem_init(&poll_queue.empty_sem, 0, ASYNC_QUEUE_TASK_NUM)) goto err; - if (sem_init(&poll_queue.full_sem, 0, 0) != 0) + if (sem_init(&poll_queue.full_sem, 0, 0)) goto err; uadk_e_set_async_poll_state(ENABLE_ASYNC_POLLING); @@ -393,9 +391,9 @@ int async_module_init(void) poll_queue.thread_id = thread_id; OPENSSL_atexit(async_poll_task_free); - return 1; + return UADK_E_SUCCESS; err: async_poll_task_free(); - return 0; + return UADK_E_FAIL; } diff --git a/src/uadk_async.h b/src/uadk_async.h index 7e75951..8c26777 100644 --- a/src/uadk_async.h +++ b/src/uadk_async.h @@ -22,6 +22,9 @@ #include <openssl/async.h> #define ASYNC_QUEUE_TASK_NUM 1024 +#define UADK_E_SUCCESS 1 +#define UADK_E_FAIL 0 +#define DO_SYNC 1 struct async_op { ASYNC_JOB *job; -- 2.30.0

1 year, 6 months

1
0
0 0

[PATCH] uadk/cipher: cleaup judgement sequence

by Zhiqi Song

Modify the jugement sequence in aes_sm4_len_check(), prioritize the conditions that must be met. Signed-off-by: Zhiqi Song <songzhiqi1(a)huawei.com> --- drv/hisi_sec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c index 5eaa1a1..f8e5cfa 100644 --- a/drv/hisi_sec.c +++ b/drv/hisi_sec.c @@ -892,18 +892,18 @@ static void parse_cipher_bd2(struct hisi_qp *qp, struct hisi_sec_sqe *sqe, static int aes_sm4_len_check(struct wd_cipher_msg *msg) { - if ((msg->mode == WD_CIPHER_CBC_CS1 || + if (msg->alg == WD_CIPHER_AES && + msg->in_bytes <= AES_BLOCK_SIZE && + (msg->mode == WD_CIPHER_CBC_CS1 || msg->mode == WD_CIPHER_CBC_CS2 || - msg->mode == WD_CIPHER_CBC_CS3) && - msg->alg == WD_CIPHER_AES && - msg->in_bytes <= AES_BLOCK_SIZE) { + msg->mode == WD_CIPHER_CBC_CS3)) { WD_ERR("failed to check input bytes of AES_CBC_CS_X, size = %u\n", msg->in_bytes); return -WD_EINVAL; } - if ((msg->mode == WD_CIPHER_CBC || msg->mode == WD_CIPHER_ECB) && - msg->in_bytes & (AES_BLOCK_SIZE - 1)) { + if ((msg->in_bytes & (AES_BLOCK_SIZE - 1)) && + (msg->mode == WD_CIPHER_CBC || msg->mode == WD_CIPHER_ECB)) { WD_ERR("failed to check input bytes of AES or SM4, size = %u\n", msg->in_bytes); return -WD_EINVAL; -- 2.30.0

1 year, 7 months

1
0
0 0

[PATCH 0/8] Support cipher new features in uadk v1

by Zhiqi Song

Support AES-CBC CTS mode in uadk v1. Support user self-defined data in uadk v1. Sync and add test code for new features. Longfang Liu (5): uadk_tool: Optimize sec's sva benchmark code uadk_tool: Optimize sec's software benchmark code uadk_tool: Optimize sec's no-sva benchmark code uadk_tool: add latency test function for uadk_tools uadk_tool: Update test function for init2 Zhiqi Song (3): uadk/v1/cipher: support aes-cbc cts mode uadk_tool: support test case for aes cbc cts mode uadk/v1/cipher: support user self-defined data functions uadk_tool/benchmark/hpre_uadk_benchmark.c | 3 + uadk_tool/benchmark/hpre_wd_benchmark.c | 3 + uadk_tool/benchmark/sec_soft_benchmark.c | 794 +++++++++++------ uadk_tool/benchmark/sec_uadk_benchmark.c | 734 ++++++++++------ uadk_tool/benchmark/sec_wd_benchmark.c | 989 +++++++++++++--------- uadk_tool/benchmark/uadk_benchmark.c | 158 +++- uadk_tool/benchmark/uadk_benchmark.h | 35 +- uadk_tool/benchmark/zip_uadk_benchmark.c | 12 +- uadk_tool/benchmark/zip_wd_benchmark.c | 12 +- v1/drv/hisi_sec_udrv.c | 253 +++++- v1/drv/hisi_sec_udrv.h | 6 + v1/wd_cipher.c | 7 +- v1/wd_cipher.h | 4 + 13 files changed, 2037 insertions(+), 973 deletions(-) -- 2.33.0

1 year, 7 months

1
8
0 0

[PATCH 00/10] Some bugfix and cleanup of uadk_engine

by Zhiqi Song

Fixup async mode bug and remove redundant code. Zhiqi Song (10): uadk_engine: cleanup code style of async functions digest: fix the definition of async cb param cipher: fix the definition of async cb param dh: fix the definition of async cb param ecc: fix the definition of async cb param rsa: fix the definition of async cb param uadk_engine: remove redundant param of async ecc: fixup switching soft sm2 decrypt problem ecc: optimize sm2 sign check function digest: fix the address of async op src/uadk_async.c | 140 ++++++++++++++++++++++++---------------------- src/uadk_async.h | 5 +- src/uadk_cipher.c | 39 ++++++++----- src/uadk_dh.c | 100 +++++++++++++++++++++------------ src/uadk_digest.c | 50 +++++++++++------ src/uadk_pkey.c | 99 ++++++++++++++++++++------------ src/uadk_rsa.c | 82 +++++++++++++++++---------- src/uadk_sm2.c | 42 +++++++++++--- 8 files changed, 349 insertions(+), 208 deletions(-) -- 2.33.0

1 year, 7 months

1
10
0 0

2025

2024

2023

2022

Acc