commit 457ee6c0157bcb1c18163a0ed35bfe318774beea
author Max Bires <jbires@google.com> Tue Jun 16 21:08:58 2020 -0700
committer Dorin Drimus <dorindrimus@google.com> Wed Aug 19 11:27:32 2020 +0000
tree bf65e459e370e7588fa123906c244073a6d96372
parent 8a7a940babfd155e1e2bb325fb4e0858364fc1f4

Updating allowed keymaster attestation versions

With the addition of Keymaster 4.1, an attestation version of 4 must also
be added to the list of accepted attestation versions.

Bug: 149746301
Bug: 163336591
Test: atest KeyAttestationTest
Change-Id: Ia38a32bf6d47e8f44e03e816058dbe1ece784f0f

tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java

diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
index 55ba086..2ca4099 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -780,6 +780,7 @@
                 case 2:
                 case 3:
                 case 4:
+                case 41:
                     assertThat(teeEnforcedDigests, is(expectedDigests));
                     break;
 
@@ -808,8 +809,8 @@
 
     @SuppressWarnings("unchecked")
     private void checkAttestationSecurityLevelDependentParams(Attestation attestation) {
-        assertThat("Attestation version must be 1, 2, or 3", attestation.getAttestationVersion(),
-               either(is(1)).or(is(2)).or(is(3)));
+        assertThat("Attestation version must be 1, 2, 3, or 4", attestation.getAttestationVersion(),
+               either(is(1)).or(is(2)).or(is(3)).or(is(4)));
 
         AuthorizationList teeEnforced = attestation.getTeeEnforced();
         AuthorizationList softwareEnforced = attestation.getSoftwareEnforced();