openharmony/filemanagement_storage_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_storage_service synced 2024-11-23 15:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改升级场景导致的app的el4目录访问异常 -- fix compile error and conflict

Browse Source 
Signed-off-by: 宁竞莜 <ningjingyou@huawei.com>
This commit is contained in:
宁竞莜 2024-10-18 12:03:28 +08:00
parent d91df16968
commit 36578eb41c
1 changed files with 1 additions and 2 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

@ -1841,7 +1841,6 @@ int KeyManager::TryToFixUserCeEceSeceKey(unsigned int userId,
} }
UserAuth auth = { .token = token, .secret = secret, .secureUid = secureUid }; UserAuth auth = { .token = token, .secret = secret, .secureUid = secureUid };
UserTokenSecret userTokenSecret = { .token = token, .oldSecret = {}, .newSecret = secret, .secureUid = secureUid }; UserTokenSecret userTokenSecret = { .token = token, .oldSecret = {}, .newSecret = secret, .secureUid = secureUid };
};
#ifdef USER_CRYPTO_MIGRATE_KEY #ifdef USER_CRYPTO_MIGRATE_KEY
if (!UpdateCeEceSeceKey(userId, userTokenSecret, keyType, false) != E_OK) { if (!UpdateCeEceSeceKey(userId, userTokenSecret, keyType, false) != E_OK) {
@ -1875,7 +1874,7 @@ int KeyManager::TryToFixUeceKey(unsigned int userId,
LOGE("Pin code is exist, get secure uid."); LOGE("Pin code is exist, get secure uid.");
} }
UserAuth auth = { .token=token, .secret=secret, .secureUid = secureUid }; UserAuth auth = { .token=token, .secret=secret, .secureUid = secureUid };
UserTokenSecret tokenSecret = { .token = token, .oldSecret = {"!"}, .newSecret = secret, .secureUid = secureUid}; UserTokenSecret tokenSecret = { .token = token, .oldSecret = {'!'}, .newSecret = secret, .secureUid = secureUid};
if (UpdateESecret(userId, tokenSecret) != E_OK) { if (UpdateESecret(userId, tokenSecret) != E_OK) {
LOGE("try to fix elx key failed !"); LOGE("try to fix elx key failed !");