openharmony/filemanagement_storage_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_storage_service synced 2024-11-26 16:53:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1546 单框架适应双框架安全加固修改

Browse Source 
Merge pull request !1546 from zhaoshuyuan/master
This commit is contained in:
openharmony_ci 2024-11-22 14:15:43 +00:00 committed by Gitee
commit e3647cd62d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/storage_daemon/crypto/src/key_manager.cpp
View File

@ -46,6 +46,7 @@ namespace OHOS {
namespace StorageDaemon {
const UserAuth NULL_KEY_AUTH = {};
const std::string DEFAULT_NEED_RESTORE_VERSION = "1";
const std::string DEFAULT_NEED_RESTORE_UPDATE_VERSION = "3";
constexpr const char *UECE_PATH = "/dev/fbex_uece";
std::shared_ptr<BaseKey> KeyManager::GetBaseKey(const std::string& dir)
@ -352,7 +353,7 @@ bool KeyManager::IsNeedClearKeyFile(std::string file)
return false;
}
if (version != DEFAULT_NEED_RESTORE_VERSION) {
if (version != DEFAULT_NEED_RESTORE_VERSION && version != DEFAULT_NEED_RESTORE_UPDATE_VERSION) {
LOGE("need to clear, file is %{private}s, version is %{public}s.", file.c_str(), version.c_str());
return true;
}