Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update counters for session encryption to start at 1." am: ae97b320d0 am: 61856cc926

Browse Source 
Change-Id: I6ea839fbed2f7eea9804d4372ca05a411d233b6e
This commit is contained in:
Treehugger Robot
2020-02-13 23:20:35 +00:00
parent 4976a53208 61856cc926
commit d4a7179271
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
identity/java/android/security/identity/CredstoreIdentityCredential.java
View File

@@ -152,8 +152,8 @@ class CredstoreIdentityCredential extends IdentityCredential {
derivedKey = Util.computeHkdf("HmacSha256", sharedSecret, salt, info, 32); derivedKey = Util.computeHkdf("HmacSha256", sharedSecret, salt, info, 32);
mReaderSecretKey = new SecretKeySpec(derivedKey, "AES"); mReaderSecretKey = new SecretKeySpec(derivedKey, "AES");
mEphemeralCounter = 0; mEphemeralCounter = 1;
mReadersExpectedEphemeralCounter = 0; mReadersExpectedEphemeralCounter = 1;
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
throw new RuntimeException("Error performing key agreement", e); throw new RuntimeException("Error performing key agreement", e);