From a4631a8b6b1661e9f140034376293f1c755702c3 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Mon, 18 Dec 2023 19:03:30 +0800 Subject: [PATCH] modify hilog test Signed-off-by: wangyongzhong2 --- frameworks/crypto_operation/key_agreement.c | 2 +- frameworks/js/napi/crypto/src/napi_asy_key_generator.cpp | 2 +- frameworks/js/napi/crypto/src/napi_asy_key_spec_generator.cpp | 2 +- frameworks/js/napi/crypto/src/napi_cipher.cpp | 2 +- frameworks/js/napi/crypto/src/napi_init.cpp | 4 ++-- frameworks/js/napi/crypto/src/napi_kdf.cpp | 2 +- frameworks/js/napi/crypto/src/napi_key_agreement.cpp | 2 +- frameworks/js/napi/crypto/src/napi_mac.cpp | 2 +- frameworks/js/napi/crypto/src/napi_md.cpp | 2 +- frameworks/js/napi/crypto/src/napi_rand.cpp | 1 - frameworks/js/napi/crypto/src/napi_sign.cpp | 2 +- frameworks/js/napi/crypto/src/napi_sym_key_generator.cpp | 2 +- frameworks/js/napi/crypto/src/napi_verify.cpp | 2 +- plugin/openssl_plugin/common/src/openssl_common.c | 2 +- .../key/asy_key_generator/src/ecc_asy_key_generator_openssl.c | 4 +--- test/unittest/src/memory_mock.c | 2 +- test/unittest/src/openssl_adapter_mock.c | 2 +- 17 files changed, 17 insertions(+), 20 deletions(-) diff --git a/frameworks/crypto_operation/key_agreement.c b/frameworks/crypto_operation/key_agreement.c index e8301a9..02d08d1 100644 --- a/frameworks/crypto_operation/key_agreement.c +++ b/frameworks/crypto_operation/key_agreement.c @@ -131,7 +131,7 @@ static HcfResult ParseKeyAgreementParams(const HcfParaConfig *config, void *para } HcfResult ret = HCF_SUCCESS; HcfKeyAgreementParams *paramsObj = (HcfKeyAgreementParams *)params; - LOGI("Set Parameter: %s", config->tag); + LOGD("Set Parameter: %s", config->tag); switch (config->paraType) { case HCF_ALG_TYPE: SetKeyTypeDefault(config->paraValue, paramsObj); diff --git a/frameworks/js/napi/crypto/src/napi_asy_key_generator.cpp b/frameworks/js/napi/crypto/src/napi_asy_key_generator.cpp index 51e182f..3ed13ce 100644 --- a/frameworks/js/napi/crypto/src/napi_asy_key_generator.cpp +++ b/frameworks/js/napi/crypto/src/napi_asy_key_generator.cpp @@ -497,7 +497,7 @@ static napi_value NapiWrapAsyKeyGen(napi_env env, napi_value instance, NapiAsyKe napi_value NapiAsyKeyGenerator::CreateJsAsyKeyGenerator(napi_env env, napi_callback_info info) { - LOGI("Enter CreateJsAsyKeyGenerator..."); + LOGD("Enter CreateJsAsyKeyGenerator..."); size_t expectedArgc = PARAMS_NUM_ONE; size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_asy_key_spec_generator.cpp b/frameworks/js/napi/crypto/src/napi_asy_key_spec_generator.cpp index cfc0b2c..d712d74 100644 --- a/frameworks/js/napi/crypto/src/napi_asy_key_spec_generator.cpp +++ b/frameworks/js/napi/crypto/src/napi_asy_key_spec_generator.cpp @@ -429,7 +429,7 @@ napi_value NapiAsyKeyGeneratorBySpec::AsyKeyGeneratorBySpecConstructor(napi_env napi_value NapiAsyKeyGeneratorBySpec::CreateJsAsyKeyGeneratorBySpec(napi_env env, napi_callback_info info) { - LOGI("Enter CreateJsAsyKeyGeneratorBySpec..."); + LOGD("Enter CreateJsAsyKeyGeneratorBySpec..."); size_t expectedArgc = PARAMS_NUM_ONE; size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_cipher.cpp b/frameworks/js/napi/crypto/src/napi_cipher.cpp index bc6ce86..9c94e46 100644 --- a/frameworks/js/napi/crypto/src/napi_cipher.cpp +++ b/frameworks/js/napi/crypto/src/napi_cipher.cpp @@ -564,7 +564,7 @@ napi_value NapiCipher::CipherConstructor(napi_env env, napi_callback_info info) napi_value NapiCipher::CreateCipher(napi_env env, napi_callback_info info) { - LOGI("Enter CreateCipher..."); + LOGD("Enter CreateCipher..."); size_t expectedArgc = ARGS_SIZE_ONE; size_t argc = ARGS_SIZE_ONE; napi_value argv[ARGS_SIZE_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_init.cpp b/frameworks/js/napi/crypto/src/napi_init.cpp index 8c554a3..e3a47f3 100644 --- a/frameworks/js/napi/crypto/src/napi_init.cpp +++ b/frameworks/js/napi/crypto/src/napi_init.cpp @@ -202,7 +202,7 @@ static void DefineSignSpecItemProperties(napi_env env, napi_value exports) ***********************************************/ static napi_value ModuleExport(napi_env env, napi_value exports) { - LOGI("module init start."); + LOGD("module init start."); DefineCryptoModeProperties(env, exports); DefineResultCodeProperties(env, exports); @@ -231,7 +231,7 @@ static napi_value ModuleExport(napi_env env, napi_value exports) NapiKdf::DefineKdfJSClass(env, exports); NapiECCKeyUtil::DefineNapiECCKeyUtilJSClass(env, exports); NapiDHKeyUtil::DefineNapiDHKeyUtilJSClass(env, exports); - LOGI("module init end."); + LOGD("module init end."); return exports; } diff --git a/frameworks/js/napi/crypto/src/napi_kdf.cpp b/frameworks/js/napi/crypto/src/napi_kdf.cpp index 82be2b6..cce36e3 100644 --- a/frameworks/js/napi/crypto/src/napi_kdf.cpp +++ b/frameworks/js/napi/crypto/src/napi_kdf.cpp @@ -477,7 +477,7 @@ napi_value NapiKdf::KdfConstructor(napi_env env, napi_callback_info info) napi_value NapiKdf::CreateJsKdf(napi_env env, napi_callback_info info) { - LOGI("Enter CreateKdf..."); + LOGD("Enter CreateKdf..."); size_t expectedArgc = ARGS_SIZE_ONE; size_t argc = expectedArgc; napi_value argv[ARGS_SIZE_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_key_agreement.cpp b/frameworks/js/napi/crypto/src/napi_key_agreement.cpp index 7d51cba..bf9e85b 100644 --- a/frameworks/js/napi/crypto/src/napi_key_agreement.cpp +++ b/frameworks/js/napi/crypto/src/napi_key_agreement.cpp @@ -245,7 +245,7 @@ napi_value NapiKeyAgreement::KeyAgreementConstructor(napi_env env, napi_callback napi_value NapiKeyAgreement::CreateJsKeyAgreement(napi_env env, napi_callback_info info) { - LOGI("Enter CreateJsKeyAgreement..."); + LOGD("Enter CreateJsKeyAgreement..."); size_t expectedArgc = PARAMS_NUM_ONE; size_t argc = PARAMS_NUM_ONE; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_mac.cpp b/frameworks/js/napi/crypto/src/napi_mac.cpp index ffe0518..c870560 100644 --- a/frameworks/js/napi/crypto/src/napi_mac.cpp +++ b/frameworks/js/napi/crypto/src/napi_mac.cpp @@ -492,7 +492,7 @@ static napi_value NapiWrapMac(napi_env env, napi_value instance, NapiMac *macNap napi_value NapiMac::CreateMac(napi_env env, napi_callback_info info) { - LOGI("Enter CreateMac..."); + LOGD("Enter CreateMac..."); size_t expectedArgc = ARGS_SIZE_ONE; size_t argc = expectedArgc; napi_value argv[ARGS_SIZE_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_md.cpp b/frameworks/js/napi/crypto/src/napi_md.cpp index 245ca45..522e98b 100644 --- a/frameworks/js/napi/crypto/src/napi_md.cpp +++ b/frameworks/js/napi/crypto/src/napi_md.cpp @@ -385,7 +385,7 @@ static napi_value NapiWrapMd(napi_env env, napi_value instance, NapiMd *mdNapiOb napi_value NapiMd::CreateMd(napi_env env, napi_callback_info info) { - LOGI("Enter CreateMd..."); + LOGD("Enter CreateMd..."); size_t expectedArgc = ARGS_SIZE_ONE; size_t argc = expectedArgc; napi_value argv[ARGS_SIZE_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_rand.cpp b/frameworks/js/napi/crypto/src/napi_rand.cpp index fd39f2f..ae46408 100644 --- a/frameworks/js/napi/crypto/src/napi_rand.cpp +++ b/frameworks/js/napi/crypto/src/napi_rand.cpp @@ -367,7 +367,6 @@ napi_value NapiRand::RandConstructor(napi_env env, napi_callback_info info) napi_value NapiRand::CreateRand(napi_env env, napi_callback_info info) { - LOGI("Enter CreateRand..."); HcfRand *randObj = nullptr; HcfResult res = HcfRandCreate(&randObj); if (res != HCF_SUCCESS) { diff --git a/frameworks/js/napi/crypto/src/napi_sign.cpp b/frameworks/js/napi/crypto/src/napi_sign.cpp index 8ef3f7a..c2c2f2b 100644 --- a/frameworks/js/napi/crypto/src/napi_sign.cpp +++ b/frameworks/js/napi/crypto/src/napi_sign.cpp @@ -594,7 +594,7 @@ static napi_value NapiWrapSign(napi_env env, napi_value instance, NapiSign *napi napi_value NapiSign::CreateJsSign(napi_env env, napi_callback_info info) { - LOGI("Enter CreateJsSign..."); + LOGD("Enter CreateJsSign..."); size_t expectedArgc = PARAMS_NUM_ONE; size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_sym_key_generator.cpp b/frameworks/js/napi/crypto/src/napi_sym_key_generator.cpp index c4679b4..7ff5f77 100644 --- a/frameworks/js/napi/crypto/src/napi_sym_key_generator.cpp +++ b/frameworks/js/napi/crypto/src/napi_sym_key_generator.cpp @@ -369,7 +369,7 @@ napi_value NapiSymKeyGenerator::SymKeyGeneratorConstructor(napi_env env, napi_ca napi_value NapiSymKeyGenerator::CreateSymKeyGenerator(napi_env env, napi_callback_info info) { - LOGI("Enter CreateSymKeyGenerator..."); + LOGD("Enter CreateSymKeyGenerator..."); size_t expectedArgc = ARGS_SIZE_ONE; size_t argc = ARGS_SIZE_ONE; napi_value argv[ARGS_SIZE_ONE] = { nullptr }; diff --git a/frameworks/js/napi/crypto/src/napi_verify.cpp b/frameworks/js/napi/crypto/src/napi_verify.cpp index 51600a3..439739b 100644 --- a/frameworks/js/napi/crypto/src/napi_verify.cpp +++ b/frameworks/js/napi/crypto/src/napi_verify.cpp @@ -621,7 +621,7 @@ static napi_value NapiWrapVerify(napi_env env, napi_value instance, NapiVerify * napi_value NapiVerify::CreateJsVerify(napi_env env, napi_callback_info info) { - LOGI("Enter CreateJsVerify..."); + LOGD("Enter CreateJsVerify..."); size_t expectedArgc = PARAMS_NUM_ONE; size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; diff --git a/plugin/openssl_plugin/common/src/openssl_common.c b/plugin/openssl_plugin/common/src/openssl_common.c index ccb72ef..2582b00 100644 --- a/plugin/openssl_plugin/common/src/openssl_common.c +++ b/plugin/openssl_plugin/common/src/openssl_common.c @@ -371,7 +371,7 @@ int32_t GetRealPrimes(int32_t primesFlag) case HCF_OPENSSL_PRIMES_5: return PRIMES_5; default: - LOGI("set default primes 2"); + LOGD("set default primes 2"); return PRIMES_2; } } diff --git a/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c b/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c index 48ec0d9..d7bf9fd 100644 --- a/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c +++ b/plugin/openssl_plugin/key/asy_key_generator/src/ecc_asy_key_generator_openssl.c @@ -1032,16 +1032,14 @@ static HcfResult GetEccPubKeyEncoded(HcfKey *self, HcfBlob *returnBlob) HcfOpensslEccPubKey *impl = (HcfOpensslEccPubKey *)self; if (impl->curveId != 0) { - LOGE("have a curveId"); + LOGD("have a curveId"); Openssl_EC_KEY_set_asn1_flag(impl->ecKey, OPENSSL_EC_NAMED_CURVE); } else { Openssl_EC_KEY_set_asn1_flag(impl->ecKey, OPENSSL_EC_EXPLICIT_CURVE); } unsigned char *returnData = NULL; - LOGE("Begin trans"); int returnDataLen = Openssl_i2d_EC_PUBKEY(impl->ecKey, &returnData); - LOGE("ECC i2d complete"); if (returnDataLen <= 0) { LOGE("i2d_EC_PUBKEY fail"); HcfPrintOpensslError(); diff --git a/test/unittest/src/memory_mock.c b/test/unittest/src/memory_mock.c index 35f7b2c..50f5d6b 100755 --- a/test/unittest/src/memory_mock.c +++ b/test/unittest/src/memory_mock.c @@ -36,7 +36,7 @@ void *HcfMalloc(uint32_t size, char val) } if (g_isRecordMallocNum) { if (g_mallocNum == g_mallocMockIndex) { - LOGI("mock malloc return NULL."); + LOGD("mock malloc return NULL."); return NULL; } g_mallocNum++; diff --git a/test/unittest/src/openssl_adapter_mock.c b/test/unittest/src/openssl_adapter_mock.c index 7ac1063..67a087d 100644 --- a/test/unittest/src/openssl_adapter_mock.c +++ b/test/unittest/src/openssl_adapter_mock.c @@ -32,7 +32,7 @@ static bool Is_Need_Mock(void) } g_callNum++; if (g_callNum == g_mockIndex) { - LOGI("mock malloc return NULL."); + LOGD("mock malloc return NULL."); return true; } return false; -- Gitee