commit 045a2c87e0f4450efb7c0c34125b2f06684b4f2d
author David Zeuthen <zeuthen@google.com> Sat Sep 11 13:52:17 2021 -0400
committer David Zeuthen <zeuthen@google.com> Mon Jan 10 17:38:04 2022 -0500
tree 9aee00ef7c8f7c6c75c6dc353ec5226a8143c34c
parent edeefe007974927be5c12a6fe7120789ac11de8b

identity: Add multi-document presentation support.

Also fix a bug so the same AuthKey is used for several getEntries()
calls on a credential. This matches the behavior in the Jetpack.

Bug: 197965513
Test: New CTS tests and new screen in CtsVerifier
Change-Id: I344f44b5655f0977ee650b518ce669e3c8a7b47a

identity/CredentialData.cpp

diff --git a/identity/CredentialData.cpp b/identity/CredentialData.cpp
index 74b995d..2189f90 100644
--- a/identity/CredentialData.cpp
+++ b/identity/CredentialData.cpp
@@ -538,7 +538,8 @@
 }
 
 const AuthKeyData* CredentialData::selectAuthKey(bool allowUsingExhaustedKeys,
-                                                 bool allowUsingExpiredKeys) {
+                                                 bool allowUsingExpiredKeys,
+                                                 bool incrementUsageCount) {
     AuthKeyData* candidate;
 
     // First try to find a un-expired key..
@@ -556,7 +557,9 @@
         }
     }
 
-    candidate->useCount += 1;
+    if (incrementUsageCount) {
+        candidate->useCount += 1;
+    }
     return candidate;
 }