Update CTS to accept KeyMint versions.
Bug: 177729159
Test: atest CtsKeystoreTestCases
Change-Id: Ie5b98705dee682fe8e7e72a114b45317bb23c266
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
index b2d0e9a..0c022e3 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -1054,8 +1054,9 @@
@SuppressWarnings("unchecked")
private void checkAttestationSecurityLevelDependentParams(Attestation attestation) {
- assertThat("Attestation version must be 1, 2, 3, 4 or 5", attestation.getAttestationVersion(),
- either(is(1)).or(is(2)).or(is(3)).or(is(4)).or(is(5)));
+ assertThat("Attestation version must be 1, 2, 3, 4 or 100",
+ attestation.getAttestationVersion(),
+ either(is(1)).or(is(2)).or(is(3)).or(is(4)).or(is(100)));
AuthorizationList teeEnforced = attestation.getTeeEnforced();
AuthorizationList softwareEnforced = attestation.getSoftwareEnforced();
@@ -1069,7 +1070,7 @@
attestation.getKeymasterSecurityLevel(),
is(KM_SECURITY_LEVEL_TRUSTED_ENVIRONMENT));
assertThat(attestation.getKeymasterVersion(),
- either(is(2)).or(is(3)).or(is(4)).or(is(41)));
+ either(is(2)).or(is(3)).or(is(4)).or(is(41)).or(is(100)));
checkRootOfTrust(attestation, false /* requireLocked */);
assertThat(teeEnforced.getOsVersion(), is(systemOsVersion));