diff --git a/test/fuzztest/keycontrol_fuzzer/keycontrol_fuzzer.cpp b/test/fuzztest/keycontrol_fuzzer/keycontrol_fuzzer.cpp index 9afb1468..85e243dc 100644 --- a/test/fuzztest/keycontrol_fuzzer/keycontrol_fuzzer.cpp +++ b/test/fuzztest/keycontrol_fuzzer/keycontrol_fuzzer.cpp @@ -19,20 +19,11 @@ #include namespace OHOS { -#ifdef SUPPORT_FSCRYPT_V2 bool SysparamDynamicFuzzTest(const uint8_t *data, size_t size) { if ((data == nullptr) || (size <= 0)) { return false; } - struct fscrypt_add_key_arg fscryptaddkeyarg; - struct fscrypt_add_key_arg *fscryptaddkeyarg2 = &fscryptaddkeyarg; - struct fscrypt_remove_key_arg fscryptremovekeyarg; - struct fscrypt_remove_key_arg *fscryptremovekeyarg2 = &fscryptremovekeyarg; - struct fscrypt_get_key_status_arg fscryptgetkeystatusarg; - struct fscrypt_get_key_status_arg *fscryptgetkeystatusarg2 = &fscryptgetkeystatusarg; - struct fscrypt_get_policy_ex_arg fscryptgetpolicyexarg; - struct fscrypt_get_policy_ex_arg *fscryptgetpolicyexarg2 = &fscryptgetpolicyexarg; struct fscrypt_policy fscryptpolicy; struct fscrypt_policy *fscryptpolicy2 = &fscryptpolicy; struct fscrypt_key fsKey1; @@ -47,10 +38,20 @@ bool SysparamDynamicFuzzTest(const uint8_t *data, size_t size) KeyCtrlAddKeyEx(character2, character2, fsKey, state); KeyCtrlSearch(state, character2, character2, state); KeyCtrlUnlink(state, state); +#ifdef SUPPORT_FSCRYPT_V2 + struct fscrypt_add_key_arg fscryptaddkeyarg; + struct fscrypt_add_key_arg *fscryptaddkeyarg2 = &fscryptaddkeyarg; + struct fscrypt_remove_key_arg fscryptremovekeyarg; + struct fscrypt_remove_key_arg *fscryptremovekeyarg2 = &fscryptremovekeyarg; + struct fscrypt_get_key_status_arg fscryptgetkeystatusarg; + struct fscrypt_get_key_status_arg *fscryptgetkeystatusarg2 = &fscryptgetkeystatusarg; + struct fscrypt_get_policy_ex_arg fscryptgetpolicyexarg; + struct fscrypt_get_policy_ex_arg *fscryptgetpolicyexarg2 = &fscryptgetpolicyexarg; KeyCtrlInstallKey(character2, fscryptaddkeyarg2); KeyCtrlRemoveKey(character2, fscryptremovekeyarg2); KeyCtrlGetKeyStatus(character2, fscryptgetkeystatusarg2); KeyCtrlGetPolicyEx(character2, fscryptgetpolicyexarg2); +#endif KeyCtrlSetPolicy(character2, policy); KeyCtrlGetPolicy(character2, fscryptpolicy2); KeyCtrlGetFscryptVersion(character2); @@ -58,16 +59,6 @@ bool SysparamDynamicFuzzTest(const uint8_t *data, size_t size) KeyCtrlHasFscryptSyspara(); return true; } -#else -bool SysparamDynamicFuzzTest(const uint8_t *data, size_t size) -{ - if ((data == nullptr) || (size <= 0)) { - return false; - } - - return true; -} -#endif } // namespace OHOS /* Fuzzer entry point */