From f74664e90d70bfd980293610442c2ffb95b0bcac Mon Sep 17 00:00:00 2001 From: junyi233 Date: Mon, 8 Jan 2024 15:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: junyi233 --- .../test/unittest/src/hap_byte_buffer_test.cpp | 10 +++++----- .../test/unittest/src/ticket_verify_test.cpp | 8 ++++---- .../test/unittest/src/trusted_root_ca_test.cpp | 6 +++--- .../test/unittest/src/trusted_ticket_test.cpp | 6 +++--- interfaces/innerkits/appverify_lite/src/app_verify.c | 4 ++-- .../innerkits/appverify_lite/src/app_verify_hap.c | 12 +++++------- 6 files changed, 22 insertions(+), 24 deletions(-) diff --git a/interfaces/innerkits/appverify/test/unittest/src/hap_byte_buffer_test.cpp b/interfaces/innerkits/appverify/test/unittest/src/hap_byte_buffer_test.cpp index d2b7852..04d9600 100644 --- a/interfaces/innerkits/appverify/test/unittest/src/hap_byte_buffer_test.cpp +++ b/interfaces/innerkits/appverify/test/unittest/src/hap_byte_buffer_test.cpp @@ -57,7 +57,7 @@ void HapByteBufferTest::TearDown() * @tc.desc: The static function will return an object of HapByteBuffer; * @tc.type: FUNC */ -HWTEST_F (HapByteBufferTest, HapByteBuffer001, TestSize.Level1) +HWTEST_F(HapByteBufferTest, HapByteBuffer001, TestSize.Level1) { /* * @tc.steps: step1. Run HapByteBuffer(buffer1). @@ -86,7 +86,7 @@ HWTEST_F (HapByteBufferTest, HapByteBuffer001, TestSize.Level1) * @tc.desc: The static function will return data from HapByteBuffer's buffer * @tc.type: FUNC */ -HWTEST_F (HapByteBufferTest, GetIntAndPutOperation001, TestSize.Level1) +HWTEST_F(HapByteBufferTest, GetIntAndPutOperation001, TestSize.Level1) { /* * @tc.steps: step1. Create an empty buffer and get data from it. @@ -150,7 +150,7 @@ HWTEST_F (HapByteBufferTest, GetIntAndPutOperation001, TestSize.Level1) * @tc.desc: The static function will get an object after slice and detect it is right; * @tc.type: FUNC */ -HWTEST_F (HapByteBufferTest, Slice001, TestSize.Level1) +HWTEST_F(HapByteBufferTest, Slice001, TestSize.Level1) { /* * @tc.steps: step1. Set a fixed length buffer. @@ -190,7 +190,7 @@ HWTEST_F (HapByteBufferTest, Slice001, TestSize.Level1) * @tc.desc: The static function will return two object whether is equal. * @tc.type: FUNC */ -HWTEST_F (HapByteBufferTest, IsEqual001, TestSize.Level1) +HWTEST_F(HapByteBufferTest, IsEqual001, TestSize.Level1) { /* * @tc.steps: step1. Create a buffer, and compare it with itself. @@ -225,7 +225,7 @@ HWTEST_F (HapByteBufferTest, IsEqual001, TestSize.Level1) * @tc.desc: The static function will return whether the value in buffer is equal to a string. * @tc.type: FUNC */ -HWTEST_F (HapByteBufferTest, IsEqual002, TestSize.Level1) +HWTEST_F(HapByteBufferTest, IsEqual002, TestSize.Level1) { /* * @tc.steps: step1. Create a buffer and string, and compare. diff --git a/interfaces/innerkits/appverify/test/unittest/src/ticket_verify_test.cpp b/interfaces/innerkits/appverify/test/unittest/src/ticket_verify_test.cpp index 1c314d1..a8dcc86 100644 --- a/interfaces/innerkits/appverify/test/unittest/src/ticket_verify_test.cpp +++ b/interfaces/innerkits/appverify/test/unittest/src/ticket_verify_test.cpp @@ -62,7 +62,7 @@ void TicketVerifyTest::TearDown() * @tc.desc: The static function will return an object of TicketVerify; * @tc.type: FUNC */ -HWTEST_F (TicketVerifyTest, CheckTicketSource001, TestSize.Level1) +HWTEST_F(TicketVerifyTest, CheckTicketSource001, TestSize.Level1) { ProvisionInfo profileInfo; profileInfo.bundleInfo.bundleName = OVER_MAX_PATH_SIZE; @@ -75,7 +75,7 @@ HWTEST_F (TicketVerifyTest, CheckTicketSource001, TestSize.Level1) * @tc.desc: The static function will return an object of TicketVerify; * @tc.type: FUNC */ -HWTEST_F (TicketVerifyTest, CheckTicketSource002, TestSize.Level1) +HWTEST_F(TicketVerifyTest, CheckTicketSource002, TestSize.Level1) { ProvisionInfo profileInfo; profileInfo.bundleInfo.bundleName = BUNDLE_NAME; @@ -88,7 +88,7 @@ HWTEST_F (TicketVerifyTest, CheckTicketSource002, TestSize.Level1) * @tc.desc: The static function will return an object of TicketVerify; * @tc.type: FUNC */ -HWTEST_F (TicketVerifyTest, CheckTicketSource003, TestSize.Level1) +HWTEST_F(TicketVerifyTest, CheckTicketSource003, TestSize.Level1) { ProvisionInfo profileInfo; profileInfo.bundleInfo.bundleName = VERIFY_TEST; @@ -101,7 +101,7 @@ HWTEST_F (TicketVerifyTest, CheckTicketSource003, TestSize.Level1) * @tc.desc: The static function will return an object of TicketVerify; * @tc.type: FUNC */ -HWTEST_F (TicketVerifyTest, CheckTicketSource004, TestSize.Level1) +HWTEST_F(TicketVerifyTest, CheckTicketSource004, TestSize.Level1) { ProvisionInfo profileInfo; profileInfo.bundleInfo.bundleName = VERIFY_ERR; diff --git a/interfaces/innerkits/appverify/test/unittest/src/trusted_root_ca_test.cpp b/interfaces/innerkits/appverify/test/unittest/src/trusted_root_ca_test.cpp index 4cdaf34..81e1c3c 100644 --- a/interfaces/innerkits/appverify/test/unittest/src/trusted_root_ca_test.cpp +++ b/interfaces/innerkits/appverify/test/unittest/src/trusted_root_ca_test.cpp @@ -56,7 +56,7 @@ void TrustedRootCaTest::TearDown() * @tc.desc: The static function will return true; * @tc.type: FUNC */ -HWTEST_F (TrustedRootCaTest, CreatTrustedRootCA001, TestSize.Level1) +HWTEST_F(TrustedRootCaTest, CreatTrustedRootCA001, TestSize.Level1) { /* * @tc.steps: step1. run init and recovery. @@ -80,7 +80,7 @@ HWTEST_F (TrustedRootCaTest, CreatTrustedRootCA001, TestSize.Level1) * @tc.desc: The static function will return object of matched cert; * @tc.type: FUNC */ -HWTEST_F (TrustedRootCaTest, FindMatchedRootTest001, TestSize.Level1) +HWTEST_F(TrustedRootCaTest, FindMatchedRootTest001, TestSize.Level1) { /* * @tc.steps: step1. input nullptr. @@ -114,7 +114,7 @@ HWTEST_F (TrustedRootCaTest, FindMatchedRootTest001, TestSize.Level1) * @tc.desc: The static function will return false; * @tc.type: FUNC */ -HWTEST_F (TrustedRootCaTest, GetTrustedRootCAFromJsonTest001, TestSize.Level1) +HWTEST_F(TrustedRootCaTest, GetTrustedRootCAFromJsonTest001, TestSize.Level1) { /* * @tc.steps: step1. use an error filePath as input. diff --git a/interfaces/innerkits/appverify/test/unittest/src/trusted_ticket_test.cpp b/interfaces/innerkits/appverify/test/unittest/src/trusted_ticket_test.cpp index 1fec850..8593327 100644 --- a/interfaces/innerkits/appverify/test/unittest/src/trusted_ticket_test.cpp +++ b/interfaces/innerkits/appverify/test/unittest/src/trusted_ticket_test.cpp @@ -55,7 +55,7 @@ void TrustedTicketTest::TearDown() * @tc.desc: The static function will return true; * @tc.type: FUNC */ -HWTEST_F (TrustedTicketTest, CreatTrustedTicketCA001, TestSize.Level1) +HWTEST_F(TrustedTicketTest, CreatTrustedTicketCA001, TestSize.Level1) { /* * @tc.steps: step1. run init and recovery. @@ -72,7 +72,7 @@ HWTEST_F (TrustedTicketTest, CreatTrustedTicketCA001, TestSize.Level1) * @tc.desc: The static function will return object of matched cert; * @tc.type: FUNC */ -HWTEST_F (TrustedTicketTest, IsTrustedSourceTest001, TestSize.Level1) +HWTEST_F(TrustedTicketTest, IsTrustedSourceTest001, TestSize.Level1) { /* * @tc.steps: step1. input nullptr. @@ -112,7 +112,7 @@ HWTEST_F (TrustedTicketTest, IsTrustedSourceTest001, TestSize.Level1) ASSERT_TRUE(trustedticketsource.IsTrustedSource(certSubject, certIssuer, 2).matchState == DO_NOT_MATCH); } -HWTEST_F (TrustedTicketTest, IsTrustedSourceTest002, TestSize.Level1) +HWTEST_F(TrustedTicketTest, IsTrustedSourceTest002, TestSize.Level1) { /* * @tc.steps: step1. input invalid certsubject. diff --git a/interfaces/innerkits/appverify_lite/src/app_verify.c b/interfaces/innerkits/appverify_lite/src/app_verify.c index 3e5ca18..f84a6f6 100644 --- a/interfaces/innerkits/appverify_lite/src/app_verify.c +++ b/interfaces/innerkits/appverify_lite/src/app_verify.c @@ -249,7 +249,7 @@ int32_t GetHashUnitLen(int32_t hashAlg) } static int32_t CalcCmpContHash(const Pkcs7 *pkcs7, const SignerInfo *signer, - mbedtls_md_type_t algType, unsigned char *hash, size_t *hashLen) + mbedtls_md_type_t algType, unsigned char *hash, size_t *hashLen) { int32_t rc; unsigned char *input = NULL; @@ -286,7 +286,7 @@ static int32_t CalcCmpContHash(const Pkcs7 *pkcs7, const SignerInfo *signer, } static int32_t CalcDigest(const Pkcs7 *pkcs7, const SignerInfo *signer, - mbedtls_md_type_t algType, unsigned char *hash, size_t *hashLen) + mbedtls_md_type_t algType, unsigned char *hash, size_t *hashLen) { int32_t rc; unsigned char *input = NULL; diff --git a/interfaces/innerkits/appverify_lite/src/app_verify_hap.c b/interfaces/innerkits/appverify_lite/src/app_verify_hap.c index 8c85400..e39a534 100644 --- a/interfaces/innerkits/appverify_lite/src/app_verify_hap.c +++ b/interfaces/innerkits/appverify_lite/src/app_verify_hap.c @@ -42,18 +42,17 @@ int32_t GetDigestAlgorithmId(uint32_t signAlgorithm) static int32_t ComputeBlockHash(const char *block, int32_t blockLen, int32_t alg, const HapBuf *result, int32_t *offset) { - int32_t ret, readLen, rawBufLen; const mbedtls_md_info_t *mdInfo = mbedtls_md_info_from_type((mbedtls_md_type_t)alg); P_NULL_RETURN_WTTH_LOG(mdInfo); int32_t pos = 0; - rawBufLen = blockLen; + int32_t rawBufLen = blockLen; mbedtls_md_context_t *mdCtx = APPV_MALLOC(sizeof(mbedtls_md_context_t)); P_NULL_RETURN_WTTH_LOG(mdCtx); LOG_INFO("alg: %d wholelen: %d", alg, rawBufLen); while (rawBufLen > 0) { mbedtls_md_init(mdCtx); - readLen = (rawBufLen > HASH_BLOB_LEN) ? HASH_BLOB_LEN : rawBufLen; - ret = mbedtls_md_setup(mdCtx, mdInfo, 0); + int32_t readLen = (rawBufLen > HASH_BLOB_LEN) ? HASH_BLOB_LEN : rawBufLen; + int32_t ret = mbedtls_md_setup(mdCtx, mdInfo, 0); P_ERR_GOTO_WTTH_LOG(ret); size_t hlen = mbedtls_md_get_size(mdInfo); if (hlen == 0 || hlen > MAX_HASH_SIZE) { @@ -111,7 +110,6 @@ static int32_t GetChunkSumCount(int32_t fileSize, int32_t coreDirectorySize, int static int32_t ComputeDigestsWithOptionalBlock(const int32_t digestAlgorithm, int32_t fp, const SignatureInfo *signInfo, const HapBuf *chunkDigest, const HapBuf *fianlDigest) { - int32_t ret, readLen; int32_t rst = V_ERR; char *rawBuf = NULL; unsigned char* outbuf = NULL; @@ -125,14 +123,14 @@ static int32_t ComputeDigestsWithOptionalBlock(const int32_t digestAlgorithm, in mbedtls_md_context_t *mdCtx = APPV_MALLOC(sizeof(mbedtls_md_context_t)); P_NULL_RETURN_WTTH_LOG(mdCtx); mbedtls_md_init(mdCtx); - ret = mbedtls_md_setup(mdCtx, mdInfo, 0); + int32_t ret = mbedtls_md_setup(mdCtx, mdInfo, 0); int32_t rawLen = 0; BlockHead blockHead = {0}; P_ERR_GOTO_WTTH_LOG(ret); ret = mbedtls_md_starts(mdCtx); P_ERR_GOTO_WTTH_LOG(ret); - readLen = chunkDigest->len; + int32_t readLen = chunkDigest->len; LOG_INFO("readLen %d", readLen); ret = mbedtls_md_update(mdCtx, chunkDigest->buffer, readLen); P_ERR_GOTO_WTTH_LOG(ret); -- Gitee