openharmony/third_party_openhitls
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_openhitls.git synced 2026-07-01 10:05:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix the order of errors and keys in the crypto module.

Browse Source 
Co-authored-by: jchx<chenqi180@huawei.com>

# message auto-generated for no-merge-commit merge:
!972 merge fix into main

fix the order of errors and keys in the crypto module.

Created-by: jchx
Commit-by: jchx
Merged-by: liwei3013
Description: <!--  Thanks for sending a pull request!  Here are some tips for you:

1) If this is your first time, please read our contributor guidelines: https://gitcode.com/openHiTLS/openhitls/wiki/FAQ-社区需求贡献流程.md

-->

**What does this PR do / why do we need it**:

**Self-checklist**:（**请自检，在[ ]内打上x**）

+ - [ ] **测试**：PR中的代码是否已有UT/ST测试用例进行充分的覆盖，新增测试用例是否随本PR一并上库或已经上库
+ - [ ] **接口**：是否涉及对外接口变更，相应变更已得到接口评审组织的通过，API对应的注释信息已经刷新正确
+ - [ ] **文档**：是否涉及官网文档修改，如果涉及请及时提交资料到Doc仓

<!-- **Special notes for your reviewers**: -->
<!-- + - [ ] 是否导致无法前向兼容 -->
<!-- + - [ ] 是否涉及依赖的三方库变更 -->

See merge request: openHiTLS/openhitls!972

Signed-off-by: Dongjianwei001 <dongjianwei1@huawei.com>
This commit is contained in:
jchx
2025-12-31 16:24:32 +08:00
committed by Dongjianwei001
parent 25ea6ecc4e
commit b8261230b7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/crypto/crypt_errno.h
+2 -2
View File
@@ -629,7 +629,7 @@ enum CRYPT_ERROR {
CRYPT_CMVP_ERR_DRBG_SELFTEST, /**< Drbg selftest error in CMVP selftest. */
CRYPT_CMVP_ERR_PKEY_SELFTEST, /**< Pkey selftest error in CMVP selftest. */
CRYPT_FRODOKEM_CTRL_NOT_SUPPORT = 0x013C0001,
CRYPT_FRODOKEM_CTRL_NOT_SUPPORT = 0x013D0001,
CRYPT_FRODOKEM_CTRL_INIT_REPEATED,
CRYPT_FRODOKEM_KEYINFO_NOT_SET,
CRYPT_FRODOKEM_BUFLEN_NOT_ENOUGH,
@@ -640,7 +640,7 @@ enum CRYPT_ERROR {
CRYPT_FRODOKEM_ENCRYPT_FAIL,
CRYPT_FRODOKEM_KEY_REPEATED_SET,
CRYPT_MCELIECE_CTRL_NOT_SUPPORT = 0x013D0001,
CRYPT_MCELIECE_CTRL_NOT_SUPPORT = 0x013E0001,
CRYPT_MCELIECE_CTRL_INIT_REPEATED,
CRYPT_MCELIECE_KEYINFO_NOT_SET,
CRYPT_MCELIECE_BUFLEN_NOT_ENOUGH,
include/crypto/crypt_params_key.h
+3 -3
View File
@@ -157,7 +157,7 @@ extern "C" {
#define CRYPT_PARAM_MD_BLOCK_SIZE (CRYPT_PARAM_MD_BASE + 2)
#define CRYPT_PARAM_MD_ATTR (CRYPT_PARAM_MD_BASE + 3)
#define CRYPT_PARAM_XMSS_BASE 1900
#define CRYPT_PARAM_XMSS_BASE 1950
#define CRYPT_PARAM_XMSS_PRV_INDEX (CRYPT_PARAM_XMSS_BASE + 1)
#define CRYPT_PARAM_XMSS_PRV_SEED (CRYPT_PARAM_XMSS_BASE + 2)
#define CRYPT_PARAM_XMSS_PRV_PRF (CRYPT_PARAM_XMSS_BASE + 3)
@@ -165,11 +165,11 @@ extern "C" {
#define CRYPT_PARAM_XMSS_PUB_ROOT (CRYPT_PARAM_XMSS_BASE + 5)
#define CRYPT_PARAM_XMSS_XDR_TYPE (CRYPT_PARAM_XMSS_BASE + 6)
#define CRYPT_PARAM_FRODOKEM_BASE 1950
#define CRYPT_PARAM_FRODOKEM_BASE 2000
#define CRYPT_PARAM_FRODOKEM_PRVKEY (CRYPT_PARAM_FRODOKEM_BASE + 1)
#define CRYPT_PARAM_FRODOKEM_PUBKEY (CRYPT_PARAM_FRODOKEM_BASE + 2)
#define CRYPT_PARAM_MCELIECE_BASE 2000
#define CRYPT_PARAM_MCELIECE_BASE 2050
#define CRYPT_PARAM_MCELIECE_PRVKEY (CRYPT_PARAM_MCELIECE_BASE + 1)
#define CRYPT_PARAM_MCELIECE_PUBKEY (CRYPT_PARAM_MCELIECE_BASE + 2)