Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "VTS: Restore 2nd-IMEI tests"

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-06 05:58:35 +00:00
committed by Gerrit Code Review
parent d0d17b1c8c 728336ffa3
commit a3bc09e02a
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
security/keymint/aidl/vts/functional/AttestKeyTest.cpp
View File

@@ -1019,12 +1019,8 @@ TEST_P(AttestKeyTest, EcdsaAttestationMismatchID) {
.Authorization(TAG_ATTESTATION_ID_MANUFACTURER, "malformed-manufacturer")
.Authorization(TAG_ATTESTATION_ID_MODEL, "malicious-model");
// TODO(b/262255219): Remove this condition when StrongBox supports 2nd IMEI attestation.
if (SecLevel() != SecurityLevel::STRONGBOX) {
if (isSecondImeiIdAttestationRequired()) {
attestation_id_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI,
"invalid-second-imei");
}
if (isSecondImeiIdAttestationRequired()) {
attestation_id_tags.Authorization(TAG_ATTESTATION_ID_SECOND_IMEI, "invalid-second-imei");
}
vector<uint8_t> key_blob;
vector<KeyCharacteristics> key_characteristics;
@@ -1061,11 +1057,6 @@ TEST_P(AttestKeyTest, SecondIMEIAttestationIDSuccess) {
GTEST_SKIP() << "Test not applicable under GSI";
}
// TODO(b/262255219): Remove this condition when StrongBox supports 2nd IMEI attestation.
if (SecLevel() == SecurityLevel::STRONGBOX) {
GTEST_SKIP() << "Test not applicable for SecurityLevel::STRONGBOX";
}
// Skip the test if there is no second IMEI exists.
string second_imei = get_imei(1);
if (second_imei.empty() || second_imei.compare("null") == 0) {
@@ -1144,11 +1135,6 @@ TEST_P(AttestKeyTest, MultipleIMEIAttestationIDSuccess) {
GTEST_SKIP() << "Test not applicable under GSI";
}
// TODO(b/262255219): Remove this condition when StrongBox supports 2nd IMEI attestation.
if (SecLevel() == SecurityLevel::STRONGBOX) {
GTEST_SKIP() << "Test not applicable for SecurityLevel::STRONGBOX";
}
// Skip the test if there is no first IMEI exists.
string imei = get_imei(0);
if (imei.empty() || imei.compare("null") == 0) {

7
security/keymint/aidl/vts/functional/KeyMintTest.cpp
View File

@@ -3118,9 +3118,6 @@ TEST_P(SigningOperationsTest, RsaPaddingNoneDoesNotAllowOther) {
* presented.
*/
TEST_P(SigningOperationsTest, NoUserConfirmation) {
if (SecLevel() == SecurityLevel::STRONGBOX) {
GTEST_SKIP() << "Test not applicable to StrongBox device";
}
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(1024, 65537)
.Digest(Digest::NONE)
@@ -7825,10 +7822,6 @@ TEST_P(UsageCountLimitTest, TestLimitUseRsa) {
* in hardware.
*/
TEST_P(UsageCountLimitTest, TestSingleUseKeyAndRollbackResistance) {
if (SecLevel() == SecurityLevel::STRONGBOX) {
GTEST_SKIP() << "Test not applicable to StrongBox device";
}
auto error = GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(2048, 65537)
.Digest(Digest::NONE)