commit ae97b320d04fe4d39eaaad6bb5a1b09b7aed711b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 13 22:53:15 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 13 22:53:15 2020 +0000
tree 6891b8cce9515bd30900e781349a947b874d8a2c
parent b5bb5d4ba125b10acd1acad5e7c88d585b26529f
parent e8a6bffec0c965393ad414aec02854102de7d13c

Merge "Update counters for session encryption to start at 1."

identity/java/android/security/identity/CredstoreIdentityCredential.java

diff --git a/identity/java/android/security/identity/CredstoreIdentityCredential.java b/identity/java/android/security/identity/CredstoreIdentityCredential.java
index c520331..7c0af6d 100644
--- a/identity/java/android/security/identity/CredstoreIdentityCredential.java
+++ b/identity/java/android/security/identity/CredstoreIdentityCredential.java
@@ -152,8 +152,8 @@
             derivedKey = Util.computeHkdf("HmacSha256", sharedSecret, salt, info, 32);
             mReaderSecretKey = new SecretKeySpec(derivedKey, "AES");
 
-            mEphemeralCounter = 0;
-            mReadersExpectedEphemeralCounter = 0;
+            mEphemeralCounter = 1;
+            mReadersExpectedEphemeralCounter = 1;
 
         } catch (NoSuchAlgorithmException e) {
             throw new RuntimeException("Error performing key agreement", e);