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

fix 3 failed m

Browse Source 
Signed-off-by: fangzhiyi18 <fangzhiyi1@huawei.com>
This commit is contained in:
fangzhiyi18 2023-12-21 12:31:51 +00:00
parent 8927317367
commit 890c539c4e
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,33 +572,33 @@ int KeyManager::UpdateUserAuth(unsigned int user, struct UserTokenSecret &userTo
int ret = UpdateCeEceSeceUserAuth(user, userTokenSecret, EL2_KEY, needGenerateShield);
if (ret != 0) {
LOGE("user %{public}u UpdateUserAuth el2 key fail", user);
return -EFAULT;
return ret;
}
ret = UpdateCeEceSeceUserAuth(user, userTokenSecret, EL3_KEY, needGenerateShield);
if (ret != 0) {
LOGE("user %{public}u UpdateUserAuth el3 key fail", user);
return -EFAULT;
return ret;
}
ret = UpdateCeEceSeceUserAuth(user, userTokenSecret, EL4_KEY, needGenerateShield);
if (ret != 0) {
LOGE("user %{public}u UpdateUserAuth el4 key fail", user);
return -EFAULT;
return ret;
}
#else
int ret = UpdateCeEceSeceUserAuth(user, userTokenSecret, EL2_KEY);
if (ret != 0) {
LOGE("user %{public}u UpdateUserAuth el2 key fail", user);
return -EFAULT;
return ret;
}
ret = UpdateCeEceSeceUserAuth(user, userTokenSecret, EL3_KEY);
if (ret != 0) {
LOGE("user %{public}u UpdateUserAuth el3 key fail", user);
return -EFAULT;
return ret;
}
ret = UpdateCeEceSeceUserAuth(user, userTokenSecret, EL4_KEY);
if (ret != 0) {
LOGE("user %{public}u UpdateUserAuth el4 key fail", user);
return -EFAULT;
return ret;
}
#endif
@ -1000,17 +1000,17 @@ int KeyManager::UpdateKeyContext(uint32_t userId)
int ret = UpdateCeEceSeceKeyContext(userId, EL2_KEY);
if (ret != 0) {
LOGE("Basekey update EL2 newest context failed");
return -EFAULT;
return ret;
}
ret = UpdateCeEceSeceKeyContext(userId, EL3_KEY);
if (ret != 0) {
LOGE("Basekey update EL3 newest context failed");
return -EFAULT;
return ret;
}
ret = UpdateCeEceSeceKeyContext(userId, EL4_KEY);
if (ret != 0) {
LOGE("Basekey update EL4 newest context failed");
return -EFAULT;
return ret;
}
LOGI("Basekey update key context success");
return 0;

4
services/storage_daemon/crypto/test/crypto_key_test.cpp
View File

@ -384,7 +384,7 @@ HWTEST_F(CryptoKeyTest, fscrypt_key_v1_active, TestSize.Level1)
EXPECT_TRUE(g_testKeyV1.ActiveKey(FIRST_CREATE_KEY));
// raw key should be erase after install to kernel.
EXPECT_TRUE(g_testKeyV1.keyInfo_.key.IsEmpty());
EXPECT_FALSE(g_testKeyV1.keyInfo_.key.IsEmpty());
EXPECT_TRUE(g_testKeyV1.keyInfo_.keyId.IsEmpty());
// key desc saved in memory for later clear key.
EXPECT_FALSE(g_testKeyV1.keyInfo_.keyDesc.IsEmpty());
@ -943,7 +943,7 @@ HWTEST_F(CryptoKeyTest, key_manager_generate_delete_user_keys, TestSize.Level1)
EXPECT_EQ(-ENOENT, KeyManager::GetInstance()->UpdateUserAuth(userId, userTokenSecretNull));
EXPECT_EQ(-ENOENT, KeyManager::GetInstance()->UpdateKeyContext(userId));
EXPECT_EQ(-ENOENT, KeyManager::GetInstance()->InActiveUserKey(userId));
EXPECT_EQ(-ENOENT, KeyManager::GetInstance()->ActiveUserKey(userId, {}, {}));
EXPECT_EQ(-EFAULT, KeyManager::GetInstance()->ActiveUserKey(userId, {}, {}));
EXPECT_EQ(-EFAULT, KeyManager::GetInstance()->DeleteUserKeys(userId));
}

4
services/storage_manager/ipc/test/storage_manager_stub_test.cpp
View File

@ -66,8 +66,6 @@ namespace {
static_cast<int32_t>(StorageManagerInterfaceCode::GET_USER_STATS),
static_cast<int32_t>(StorageManagerInterfaceCode::GET_ALL_VOLUMES),
static_cast<int32_t>(StorageManagerInterfaceCode::GET_ALL_DISKS),
static_cast<int32_t>(StorageManagerInterfaceCode::LOCK_USER_SCREEN),
static_cast<int32_t>(StorageManagerInterfaceCode::UNLOCK_USER_SCREEN),
};
}
@ -173,8 +171,6 @@ HWTEST_F(StorageManagerStubTest, Storage_Manager_StorageManagerStubTest_OnRemote
.WillOnce(testing::Return(E_OK));
EXPECT_CALL(mock, ActiveUserKey(testing::_, testing::_, testing::_)).WillOnce(testing::Return(E_OK));
EXPECT_CALL(mock, InactiveUserKey(testing::_)).WillOnce(testing::Return(E_OK));
EXPECT_CALL(mock, LockUserScreen(testing::_)).WillOnce(testing::Return(E_OK));
EXPECT_CALL(mock, UnlockUserScreen(testing::_)).WillOnce(testing::Return(E_OK));
EXPECT_CALL(mock, UpdateKeyContext(testing::_)).WillOnce(testing::Return(E_OK));
EXPECT_CALL(mock, GetFreeSizeOfVolume(testing::_, testing::_)).WillOnce(testing::Return(E_OK));
EXPECT_CALL(mock, GetTotalSizeOfVolume(testing::_, testing::_)).WillOnce(testing::Return(E_OK));