diff --git a/bundle.json b/bundle.json index 9bd5fd42c62e9ea01f18a4d96c3dd9ce3b61e049..8a753813fb6b05c22c75999a7eb73006846a26c1 100644 --- a/bundle.json +++ b/bundle.json @@ -66,7 +66,7 @@ ], "test": [ "//base/security/device_security_level/test:dslm_test", - "//base/security/device_security_level/test/dslm_fuzzer:dslm_fuzz_test" + "//base/security/device_security_level/test/dslm_fuzzer:DslmFuzzTest" ] } } diff --git a/oem_property/common/dslm_credential_utils.c b/oem_property/common/dslm_credential_utils.c index 576cb3ecb01c8781fd57824244ae515ade17ea45..cd1310e674af2d629c6b54bcfcb581106623a6c3 100644 --- a/oem_property/common/dslm_credential_utils.c +++ b/oem_property/common/dslm_credential_utils.c @@ -501,7 +501,7 @@ static void CredentialCbToDslmCredInfo(CredentialCb *credCb, DslmCredInfo *credI (void)GetDataFromJson(json, CRED_KEY_SECURITY_LEVEL, credInfo->securityLevel, CRED_INFO_LEVEL_LEN); if (verified) { - if (sscanf_s(credInfo->securityLevel, "SL%d", &credInfo->credLevel) <= 0) { + if (sscanf_s(credInfo->securityLevel, "SL%u", &credInfo->credLevel) <= 0) { SECURITY_LOG_ERROR("formatting securityLevel string failed"); } } diff --git a/test/dslm_fuzzer/BUILD.gn b/test/dslm_fuzzer/BUILD.gn index 44e536fa1f1d809c89eaf8eabd35306b5a89a0f4..c257bead082788df1b4c37bdc8dd4f1e163eb6d1 100644 --- a/test/dslm_fuzzer/BUILD.gn +++ b/test/dslm_fuzzer/BUILD.gn @@ -14,7 +14,7 @@ import("//build/ohos.gni") import("//build/test.gni") -ohos_fuzztest("dslm_fuzz_test") { +ohos_fuzztest("DslmFuzzTest") { module_out_path = "security/device_security_level" fuzz_config_file = "//base/security/device_security_level/test/dslm_fuzzer" @@ -32,7 +32,7 @@ ohos_fuzztest("dslm_fuzz_test") { "//base/security/device_security_level/services/sa/standard", ] - sources = [ "dlsm_fuzzer.cpp" ] + sources = [ "dslm_fuzzer.cpp" ] deps = [ "//base/security/device_security_level/oem_property/ohos:dslm_service" ] diff --git a/test/dslm_fuzzer/dlsm_fuzzer.cpp b/test/dslm_fuzzer/dslm_fuzzer.cpp similarity index 96% rename from test/dslm_fuzzer/dlsm_fuzzer.cpp rename to test/dslm_fuzzer/dslm_fuzzer.cpp index 66686cffedad0b041072258cc9abcd374eb4950b..4e466d13cc3824a38a3a9535c94eb06b6370794f 100644 --- a/test/dslm_fuzzer/dlsm_fuzzer.cpp +++ b/test/dslm_fuzzer/dslm_fuzzer.cpp @@ -81,7 +81,7 @@ void OnRemoteRequestFuzzer(Parcel &parcel) SECURITY_LOG_INFO("end"); } -void DlsmFuzzTest(const uint8_t *data, size_t size) +void DslmFuzzTest(const uint8_t *data, size_t size) { Parcel parcel; parcel.WriteBuffer(data, size); @@ -100,6 +100,6 @@ void DlsmFuzzTest(const uint8_t *data, size_t size) /* Fuzzer entry point */ extern "C" int32_t LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - OHOS::Security::DeviceSecurityLevel::DlsmFuzzTest(data, size); + OHOS::Security::DeviceSecurityLevel::DslmFuzzTest(data, size); return 0; }