From 12a3baa406fb204d7cb8d7aebeff66426dc566b1 Mon Sep 17 00:00:00 2001 From: wuXin Date: Thu, 4 Jan 2024 02:36:05 +0000 Subject: [PATCH 1/6] update security/huks/include/native_huks_api.h. Signed-off-by: wuXin --- security/huks/include/native_huks_api.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index 867a4756b..fa21548bb 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -13,6 +13,11 @@ * limitations under the License. */ +/** + * @file + * @kit Universal Keystore Kit + */ + #ifndef NATIVE_HUKS_API_H #define NATIVE_HUKS_API_H -- Gitee From 515b1f8cde3f97a714551fc99d508189a229cd5c Mon Sep 17 00:00:00 2001 From: wuXin Date: Thu, 4 Jan 2024 02:36:21 +0000 Subject: [PATCH 2/6] update security/huks/include/native_huks_param.h. Signed-off-by: wuXin --- security/huks/include/native_huks_param.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/security/huks/include/native_huks_param.h b/security/huks/include/native_huks_param.h index 2da107aa9..fe4b59aa4 100644 --- a/security/huks/include/native_huks_param.h +++ b/security/huks/include/native_huks_param.h @@ -13,6 +13,11 @@ * limitations under the License. */ + /** + * @file + * @kit Universal Keystore Kit + */ + #ifndef NATIVE_HUKS_PARAM_H #define NATIVE_HUKS_PARAM_H -- Gitee From 827bc4c50849fc07370f01cdd6b51d3787d17051 Mon Sep 17 00:00:00 2001 From: wuXin Date: Thu, 4 Jan 2024 02:36:40 +0000 Subject: [PATCH 3/6] update security/huks/include/native_huks_type.h. Signed-off-by: wuXin --- security/huks/include/native_huks_type.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/security/huks/include/native_huks_type.h b/security/huks/include/native_huks_type.h index 5c261751e..f4c03a85b 100644 --- a/security/huks/include/native_huks_type.h +++ b/security/huks/include/native_huks_type.h @@ -13,6 +13,11 @@ * limitations under the License. */ + /** + * @file + * @kit Universal Keystore Kit + */ + #ifndef NATIVE_OH_HUKS_TYPE_H #define NATIVE_OH_HUKS_TYPE_H -- Gitee From 9b26ac4a6a0902ad47840f4ea98d9f871be1e5dc Mon Sep 17 00:00:00 2001 From: WuXinTao Date: Thu, 4 Jan 2024 11:59:07 +0800 Subject: [PATCH 4/6] add code for HUKS kit Signed-off-by: wuxintao --- security/huks/include/native_huks_api.h | 9 ++++++++- security/huks/include/native_huks_param.h | 8 +++----- security/huks/include/native_huks_type.h | 10 ++++++++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index fa21548bb..0ee354f54 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -14,8 +14,15 @@ */ /** - * @file + * @file native_huks_api.h + * + * @brief Defines the Universal Keystore Kit APIs. + * + * include "huks/includenative_huks_type.h" + * @library libneural_network_runtime.so * @kit Universal Keystore Kit + * @since 9 + * @version 1.0 */ #ifndef NATIVE_HUKS_API_H diff --git a/security/huks/include/native_huks_param.h b/security/huks/include/native_huks_param.h index fe4b59aa4..c6624ee75 100644 --- a/security/huks/include/native_huks_param.h +++ b/security/huks/include/native_huks_param.h @@ -13,11 +13,6 @@ * limitations under the License. */ - /** - * @file - * @kit Universal Keystore Kit - */ - #ifndef NATIVE_HUKS_PARAM_H #define NATIVE_HUKS_PARAM_H @@ -32,6 +27,9 @@ * They can also be used to obtain parameters, copy parameter sets, and check parameter validity. * * @syscap SystemCapability.Security.Huks + * include "huks/include/native_huks_type.h" + * @library libhuks_ndk.so + * @kit Universal Keystore Kit * @since 9 * @version 1.0 */ diff --git a/security/huks/include/native_huks_type.h b/security/huks/include/native_huks_type.h index f4c03a85b..a34069f29 100644 --- a/security/huks/include/native_huks_type.h +++ b/security/huks/include/native_huks_type.h @@ -13,9 +13,15 @@ * limitations under the License. */ - /** - * @file +/** + * @file native_huks_type.h + * + * @brief Defines the structure and enumeration. + * + * @library libhuks_ndk.so * @kit Universal Keystore Kit + * @since 9 + * @version 1.0 */ #ifndef NATIVE_OH_HUKS_TYPE_H -- Gitee From aacb92cb42122d1e8788fdb189ff2eea38ff5f44 Mon Sep 17 00:00:00 2001 From: WuXinTao Date: Thu, 4 Jan 2024 12:57:19 +0800 Subject: [PATCH 5/6] add code for fix3 Signed-off-by: wuxintao --- security/huks/include/native_huks_api.h | 17 ++++------------- security/huks/include/native_huks_param.h | 6 +++--- security/huks/include/native_huks_type.h | 15 +++------------ 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index 0ee354f54..e86bfd495 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -13,18 +13,6 @@ * limitations under the License. */ -/** - * @file native_huks_api.h - * - * @brief Defines the Universal Keystore Kit APIs. - * - * include "huks/includenative_huks_type.h" - * @library libneural_network_runtime.so - * @kit Universal Keystore Kit - * @since 9 - * @version 1.0 - */ - #ifndef NATIVE_HUKS_API_H #define NATIVE_HUKS_API_H @@ -44,8 +32,11 @@ /** * @file native_huks_api.h * - * @brief Declares the APIs used to access the HUKS. + * @brief Defines the Universal Keystore Kit APIs. * + * include "huks/includenative_huks_type.h" + * @library libhuks_ndk.so + * @kit Universal Keystore Kit * @since 9 * @version 1.0 */ diff --git a/security/huks/include/native_huks_param.h b/security/huks/include/native_huks_param.h index c6624ee75..b8b988168 100644 --- a/security/huks/include/native_huks_param.h +++ b/security/huks/include/native_huks_param.h @@ -27,9 +27,6 @@ * They can also be used to obtain parameters, copy parameter sets, and check parameter validity. * * @syscap SystemCapability.Security.Huks - * include "huks/include/native_huks_type.h" - * @library libhuks_ndk.so - * @kit Universal Keystore Kit * @since 9 * @version 1.0 */ @@ -39,6 +36,9 @@ * * @brief Provides APIs for constructing, using, and destroying parameter sets. * + * include "huks/include/native_huks_type.h" + * @library libhuks_ndk.so + * @kit Universal Keystore Kit * @since 9 * @version 1.0 */ diff --git a/security/huks/include/native_huks_type.h b/security/huks/include/native_huks_type.h index a34069f29..635e914ea 100644 --- a/security/huks/include/native_huks_type.h +++ b/security/huks/include/native_huks_type.h @@ -13,17 +13,6 @@ * limitations under the License. */ -/** - * @file native_huks_type.h - * - * @brief Defines the structure and enumeration. - * - * @library libhuks_ndk.so - * @kit Universal Keystore Kit - * @since 9 - * @version 1.0 - */ - #ifndef NATIVE_OH_HUKS_TYPE_H #define NATIVE_OH_HUKS_TYPE_H @@ -42,8 +31,10 @@ /** * @file native_huks_type.h * - * @brief Defines the enumerated variables, structures, and macros used in the HUKS APIs. + * @brief Defines the structure and enumeration. * + * @library libhuks_ndk.so + * @kit Universal Keystore Kit * @since 9 * @version 1.0 */ -- Gitee From 05cf248058861ebb37d87c540688640c375d841b Mon Sep 17 00:00:00 2001 From: WuXinTao Date: Thu, 4 Jan 2024 14:18:10 +0800 Subject: [PATCH 6/6] add code for fix 5 Signed-off-by: wuxintao --- security/huks/include/native_huks_api.h | 3 +-- security/huks/include/native_huks_param.h | 1 - security/huks/include/native_huks_type.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/security/huks/include/native_huks_api.h b/security/huks/include/native_huks_api.h index e86bfd495..47ed4b47c 100644 --- a/security/huks/include/native_huks_api.h +++ b/security/huks/include/native_huks_api.h @@ -34,8 +34,7 @@ * * @brief Defines the Universal Keystore Kit APIs. * - * include "huks/includenative_huks_type.h" - * @library libhuks_ndk.so + * include "huks/include/native_huks_type.h" * @kit Universal Keystore Kit * @since 9 * @version 1.0 diff --git a/security/huks/include/native_huks_param.h b/security/huks/include/native_huks_param.h index b8b988168..0ed7c147c 100644 --- a/security/huks/include/native_huks_param.h +++ b/security/huks/include/native_huks_param.h @@ -37,7 +37,6 @@ * @brief Provides APIs for constructing, using, and destroying parameter sets. * * include "huks/include/native_huks_type.h" - * @library libhuks_ndk.so * @kit Universal Keystore Kit * @since 9 * @version 1.0 diff --git a/security/huks/include/native_huks_type.h b/security/huks/include/native_huks_type.h index 635e914ea..c015432c8 100644 --- a/security/huks/include/native_huks_type.h +++ b/security/huks/include/native_huks_type.h @@ -33,7 +33,6 @@ * * @brief Defines the structure and enumeration. * - * @library libhuks_ndk.so * @kit Universal Keystore Kit * @since 9 * @version 1.0 -- Gitee