Merge "Add DEVICE_UNIQUE_ATTESTION tag & parse its value." into ub-testdpc-rvc

Author: Elis Elliott

app/src/main/java/com/afwsamples/testdpc/policy/keymanagement/GenerateKeyAndCertificateTask.java

@@ -204,6 +204,9 @@ private void showKeyGenerationResult(AttestedKeyPair keyPair) {
                     attestationDetails.append(
                             mActivity.getText(R.string.device_meid_description) + "\n");
                     attestationDetails.append(teeList.getMeid() + "\n");
+                    attestationDetails.append(
+                            "Individual Attestation:" + "\n");
+                    attestationDetails.append(teeList.isIndividualAttestation() + "\n");
                 }
 
                 Certificate root = attestationChain.get(attestationChain.size() - 1);

app/src/main/java/com/afwsamples/testdpc/policy/utils/AuthorizationList.java

@@ -131,6 +131,7 @@ public class AuthorizationList {
     private static final int KM_TAG_ATTESTATION_ID_MODEL = KM_BYTES | 717;
     private static final int KM_TAG_VENDOR_PATCHLEVEL = KM_UINT | 718;
     private static final int KM_TAG_BOOT_PATCHLEVEL = KM_UINT | 719;
+    private static final int KM_TAG_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720;
 
     // Map for converting padding values to strings
     private static final ImmutableMap<Integer, String> paddingMap = ImmutableMap
@@ -198,6 +199,7 @@ public class AuthorizationList {
     private String model;
     private boolean userPresenceRequired;
     private boolean confirmationRequired;
+    private boolean individualAttestation;
 
     @RequiresApi(api = VERSION_CODES.N)
     public AuthorizationList(ASN1Encodable sequence) throws CertificateParsingException {
@@ -323,6 +325,9 @@ public AuthorizationList(ASN1Encodable sequence) throws CertificateParsingExcept
                 case KM_TAG_TRUSTED_CONFIRMATION_REQUIRED & KEYMASTER_TAG_TYPE_MASK:
                     confirmationRequired = true;
                     break;
+                case KM_TAG_DEVICE_UNIQUE_ATTESTATION & KEYMASTER_TAG_TYPE_MASK:
+                    individualAttestation = true;
+                    break;
             }
         }
 
@@ -600,6 +605,10 @@ public boolean isConfirmationRequired() {
         return confirmationRequired;
     }
 
+    public boolean isIndividualAttestation() {
+        return individualAttestation;
+    }
+
     private String getStringFromAsn1Value(ASN1Primitive value) throws CertificateParsingException {
         try {
             return Asn1Utils.getStringFromAsn1OctetStreamAssumingUTF8(value);
@@ -709,6 +718,10 @@ public String toString() {
             s.append("\nConfirmation required");
         }
 
+        if (individualAttestation) {
+            s.append("\nIndividual attestation");
+        }
+
         if (brand != null) {
             s.append("\nBrand: ").append(brand);
         }