add fields for protocol version 6

GrapheneOS · Oct 1, 2024 · 1376ac2 · 1376ac2
1 parent 6963539
commit 1376ac2
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/main/java/app/attestation/server/AttestationProtocol.java b/src/main/java/app/attestation/server/AttestationProtocol.java
@@ -78,11 +78,18 @@ class AttestationProtocol {
     // byte[] compressedChain { [short encodedCertificateLength, byte[] encodedCertificate] }
     // byte[] fingerprint (length: FINGERPRINT_LENGTH)
     // int osEnforcedFlags
+    // short autoRebootMinutes (-1 for unknown)
+    // byte portSecurityMode (-1 for unknown)
+    // byte userCount (-1 for unknown)
     // }
     // byte[] signature (rest of message)
     //
     // Protocol version changes:
     //
+    // 6: autoRebootMinutes added
+    // 6: portSecurityMode added
+    // 6: userCount added
+    //
     // n/a
     //
     // For each audit, the Auditee generates a fresh hardware-backed key with key attestation
@@ -1177,6 +1184,12 @@ static void verifySerialized(final byte[] attestationResult,
             throw new GeneralSecurityException("invalid device administrator state");
         }
 
+        if (version >= 6) {
+            final short autoRebootMinutes = deserializer.getShort();
+            final byte portSecurityMode = deserializer.get();
+            final byte userCount = deserializer.get();
+        }
+
         final int signatureLength = deserializer.remaining();
         final byte[] signature = new byte[signatureLength];
         deserializer.get(signature);