diff --git a/frameworks/enhance_adapter/include/sec_comp_enhance_adapter.h b/frameworks/enhance_adapter/include/sec_comp_enhance_adapter.h index 33fdf07..c3defd6 100644 --- a/frameworks/enhance_adapter/include/sec_comp_enhance_adapter.h +++ b/frameworks/enhance_adapter/include/sec_comp_enhance_adapter.h @@ -34,7 +34,7 @@ public: virtual SecCompEnhanceCfgBase* UnmarshallEnhanceCfg(Parcel& in) = 0; virtual int32_t SetEnhanceCfg(SecCompEnhanceCfgBase* cfg) = 0; virtual int32_t GetPointerEventEnhanceData(void *data, uint32_t dataLen, - uint8_t** enhanceData, uint32_t& enHancedataLen) = 0; + uint8_t* enhanceData, uint32_t& enHancedataLen) = 0; }; class SecCompEnhanceServiceInterface { @@ -49,7 +49,7 @@ struct SecCompEnhanceAdapter { static int32_t UnmarshallEnhanceCfg(Parcel& in, SecCompEnhanceCfgBase*& result); static int32_t SetEnhanceCfg(SecCompEnhanceCfgBase* cfg); static int32_t GetPointerEventEnhanceData(void *data, uint32_t dataLen, - uint8_t** enhanceData, uint32_t& enHancedataLen); + uint8_t* enhanceData, uint32_t& enHancedataLen); static int32_t EnableInputEnhance(); static int32_t DisableInputEnhance(); diff --git a/frameworks/enhance_adapter/src/sec_comp_enhance_adapter.cpp b/frameworks/enhance_adapter/src/sec_comp_enhance_adapter.cpp index 81dd8cf..57fcdbf 100644 --- a/frameworks/enhance_adapter/src/sec_comp_enhance_adapter.cpp +++ b/frameworks/enhance_adapter/src/sec_comp_enhance_adapter.cpp @@ -103,7 +103,7 @@ int32_t SecCompEnhanceAdapter::SetEnhanceCfg(SecCompEnhanceCfgBase* cfg) } int32_t SecCompEnhanceAdapter::GetPointerEventEnhanceData(void *data, uint32_t dataLen, - uint8_t** enhanceData, uint32_t& enHancedataLen) + uint8_t* enhanceData, uint32_t& enHancedataLen) { if (!isEnhanceInputHandlerInit) { InitEnhanceHandler(SEC_COMP_ENHANCE_INPUT_INTERFACE); diff --git a/interfaces/inner_api/enhance_kits/include/sec_comp_enhance_kit.h b/interfaces/inner_api/enhance_kits/include/sec_comp_enhance_kit.h index 78fdb3b..5c7ee04 100644 --- a/interfaces/inner_api/enhance_kits/include/sec_comp_enhance_kit.h +++ b/interfaces/inner_api/enhance_kits/include/sec_comp_enhance_kit.h @@ -22,7 +22,7 @@ namespace SecurityComponent { struct SecCompEnhanceKit { static int32_t SetEnhanceCfg(SecCompEnhanceCfgBase* cfg); static int32_t GetPointerEventEnhanceData(void *data, uint32_t dataLen, - uint8_t** enhanceData, uint32_t& enHancedataLen); + uint8_t* enhanceData, uint32_t& enHancedataLen); }; } // namespace SecurityComponent } // namespace Security diff --git a/interfaces/inner_api/enhance_kits/src/sec_comp_enhance_kit.cpp b/interfaces/inner_api/enhance_kits/src/sec_comp_enhance_kit.cpp index 99eb415..2a88edb 100644 --- a/interfaces/inner_api/enhance_kits/src/sec_comp_enhance_kit.cpp +++ b/interfaces/inner_api/enhance_kits/src/sec_comp_enhance_kit.cpp @@ -23,7 +23,7 @@ int32_t SecCompEnhanceKit::SetEnhanceCfg(SecCompEnhanceCfgBase* cfg) } int32_t SecCompEnhanceKit::GetPointerEventEnhanceData(void *data, uint32_t dataLen, - uint8_t** enhanceData, uint32_t& enHancedataLen) + uint8_t* enhanceData, uint32_t& enHancedataLen) { return SecCompEnhanceAdapter::GetPointerEventEnhanceData(data, dataLen, enhanceData, enHancedataLen); } diff --git a/interfaces/inner_api/enhance_kits/test/unittest/src/sec_comp_enhance_test.cpp b/interfaces/inner_api/enhance_kits/test/unittest/src/sec_comp_enhance_test.cpp index 49c5649..000aa1d 100644 --- a/interfaces/inner_api/enhance_kits/test/unittest/src/sec_comp_enhance_test.cpp +++ b/interfaces/inner_api/enhance_kits/test/unittest/src/sec_comp_enhance_test.cpp @@ -32,6 +32,7 @@ static const std::string LIB_PATH = "/system/lib/"; #endif static const std::string ENHANCE_INPUT_INTERFACE_LIB = LIB_PATH + "libsec_comp_input_enhance.z.so"; static const std::string ENHANCE_SRV_INTERFACE_LIB = LIB_PATH + "libsec_comp_service_enhance.z.so"; +static constexpr uint32_t MAX_HMAC_SIZE = 64; } // namespace void SecCompEnhanceTest::SetUpTestCase() @@ -90,12 +91,11 @@ HWTEST_F(SecCompEnhanceTest, GetPoniterEventEnhanceData001, TestSize.Level1) uint8_t originData[16] = { 0 }; uint32_t dataLen = 16; uint8_t* enhanceData = nullptr; - uint32_t enHancedataLen = 0; + uint32_t enHancedataLen = MAX_HMAC_SIZE; - int32_t result = SecCompEnhanceKit::GetPointerEventEnhanceData(originData, dataLen, &enhanceData, enHancedataLen); + int32_t result = SecCompEnhanceKit::GetPointerEventEnhanceData(originData, dataLen, enhanceData, enHancedataLen); if (g_inputEnhanceExist) { EXPECT_EQ(result, SC_OK); - EXPECT_EQ(enHancedataLen, static_cast(0)); } else { EXPECT_EQ(result, SC_ENHANCE_ERROR_NOT_EXIST_ENHANCE); }