tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "VTS: Restore 2nd-IMEI tests" am: a3bc09e02a am: d0c6ea094d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2517335

Change-Id: I4ed13ab8e6181c5dff6122bb94b48054fdbdf6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-06 06:35:17 +00:00 committed by Automerger Merge Worker
commit d1d3192505
2 changed files with 2 additions and 23 deletions
Show stats 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_MANUFACTURER, "malformed-manufacturer")
.Authorization(TAG_ATTESTATION_ID_MODEL, "malicious-model"); .Authorization(TAG_ATTESTATION_ID_MODEL, "malicious-model");
// TODO(b/262255219): Remove this condition when StrongBox supports 2nd IMEI attestation. if (isSecondImeiIdAttestationRequired()) {
if (SecLevel() != SecurityLevel::STRONGBOX) { 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<uint8_t> key_blob;
vector<KeyCharacteristics> key_characteristics; vector<KeyCharacteristics> key_characteristics;
@ -1061,11 +1057,6 @@ TEST_P(AttestKeyTest, SecondIMEIAttestationIDSuccess) {
GTEST_SKIP() << "Test not applicable under GSI"; 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. // Skip the test if there is no second IMEI exists.
string second_imei = get_imei(1); string second_imei = get_imei(1);
if (second_imei.empty() || second_imei.compare("null") == 0) { if (second_imei.empty() || second_imei.compare("null") == 0) {
@ -1144,11 +1135,6 @@ TEST_P(AttestKeyTest, MultipleIMEIAttestationIDSuccess) {
GTEST_SKIP() << "Test not applicable under GSI"; 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. // Skip the test if there is no first IMEI exists.
string imei = get_imei(0); string imei = get_imei(0);
if (imei.empty() || imei.compare("null") == 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. * presented.
*/ */
TEST_P(SigningOperationsTest, NoUserConfirmation) { TEST_P(SigningOperationsTest, NoUserConfirmation) {
if (SecLevel() == SecurityLevel::STRONGBOX) {
GTEST_SKIP() << "Test not applicable to StrongBox device";
}
ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder() ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(1024, 65537) .RsaSigningKey(1024, 65537)
.Digest(Digest::NONE) .Digest(Digest::NONE)
@ -7825,10 +7822,6 @@ TEST_P(UsageCountLimitTest, TestLimitUseRsa) {
* in hardware. * in hardware.
*/ */
TEST_P(UsageCountLimitTest, TestSingleUseKeyAndRollbackResistance) { TEST_P(UsageCountLimitTest, TestSingleUseKeyAndRollbackResistance) {
if (SecLevel() == SecurityLevel::STRONGBOX) {
GTEST_SKIP() << "Test not applicable to StrongBox device";
}
auto error = GenerateKey(AuthorizationSetBuilder() auto error = GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(2048, 65537) .RsaSigningKey(2048, 65537)
.Digest(Digest::NONE) .Digest(Digest::NONE)