From 6c4ed632dcf43ebaa30cfa2ddb1ac76c25e127f4 Mon Sep 17 00:00:00 2001 From: liuziwei Date: Tue, 22 Oct 2024 10:03:16 +0800 Subject: [PATCH 1/3] fix code Signed-off-by: liuziwei Change-Id: I78dfa5876a38cdf4a443d7d7e17a0fce27d393a2 --- .../huks_standard/huks_engine/main/core_dependency/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn b/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn index 17aff7be..5a9502d4 100644 --- a/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn +++ b/services/huks_standard/huks_engine/main/core_dependency/BUILD.gn @@ -56,7 +56,7 @@ ohos_static_library("libhuks_core_hal_api_static") { ] if (huks_enable_hdi_in_standard && !enable_hks_mock) { defines = [ "HKS_CORE_ENABLE_HDI_DRIVER" ] - external_deps += [ "drivers_interface_user_auth:libuser_auth_proxy_2.0" ] + external_deps += [ "drivers_interface_user_auth:libuser_auth_proxy_2.1" ] } else { if (enable_hks_mock) { deps += [ "//base/security/huks/services/huks_standard/huks_service/main/systemapi_mock:libhuks_service_systemapi_mock_static" ] -- Gitee From aff9993945547bbc64fa8f949009ec729fe466e0 Mon Sep 17 00:00:00 2001 From: liuziwei Date: Wed, 20 Nov 2024 18:42:43 +0800 Subject: [PATCH 2/3] fix Signed-off-by: liuziwei Change-Id: Ifa7aaeca14cf00ba983bb1a3faa4bdf7a846d895 --- .../main/core_dependency/src/hks_core_useriam_wrap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp b/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp index aca5dc44..924fabf9 100755 --- a/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp +++ b/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp @@ -25,7 +25,7 @@ #ifdef HKS_SUPPORT_USER_AUTH_ACCESS_CONTROL #ifdef HKS_CORE_ENABLE_HDI_DRIVER -#include "v2_0/user_auth_types.h" +#include "v2_1/user_auth_types.h" using AuthType = OHOS::HDI::UserAuth::V2_0::AuthType; -- Gitee From 6f81179b60e86383ab5ce4eba8ab05a5035d1362 Mon Sep 17 00:00:00 2001 From: liuziwei Date: Thu, 21 Nov 2024 15:56:22 +0800 Subject: [PATCH 3/3] fix Signed-off-by: liuziwei Change-Id: I942556f13e383d4e4d0721665be94661b7896133 --- interfaces/inner_api/huks_standard/main/include/hks_type_enum.h | 2 +- .../main/core_dependency/src/hks_core_useriam_wrap.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/inner_api/huks_standard/main/include/hks_type_enum.h b/interfaces/inner_api/huks_standard/main/include/hks_type_enum.h index c9329891..3bedfabf 100644 --- a/interfaces/inner_api/huks_standard/main/include/hks_type_enum.h +++ b/interfaces/inner_api/huks_standard/main/include/hks_type_enum.h @@ -429,7 +429,7 @@ enum HksSendType { /** * @brief hks user auth type - * @see `enum AuthType` in `drivers/interface/user_auth/v2_0/UserAuthTypes.idl` + * @see `enum AuthType` in `drivers/interface/user_auth/v2_1/UserAuthTypes.idl` */ enum HksUserAuthType { HKS_USER_AUTH_TYPE_FINGERPRINT = 1 << 0, diff --git a/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp b/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp index 924fabf9..a9fcdd94 100755 --- a/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp +++ b/services/huks_standard/huks_engine/main/core_dependency/src/hks_core_useriam_wrap.cpp @@ -27,7 +27,7 @@ #ifdef HKS_CORE_ENABLE_HDI_DRIVER #include "v2_1/user_auth_types.h" -using AuthType = OHOS::HDI::UserAuth::V2_0::AuthType; +using AuthType = OHOS::HDI::UserAuth::V2_1::AuthType; static int32_t ConvertToHksAuthType(AuthType authType, enum HksUserAuthType *hksAuthType) { -- Gitee