diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-01 16:03:03 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-04-01 16:03:03 -0700 |
| commit | a80eee052dd729c2898829fab42a5584d6f5eaf0 (patch) | |
| tree | f41923cf80015a3ed39b7c3204fb6386776e8e17 /keystore/java/android/security/KeyStoreCipherSpi.java | |
| parent | 97467d82a31964e36cb6bc32ac4cf00e884c190e (diff) | |
| download | frameworks_base-a80eee052dd729c2898829fab42a5584d6f5eaf0.zip frameworks_base-a80eee052dd729c2898829fab42a5584d6f5eaf0.tar.gz frameworks_base-a80eee052dd729c2898829fab42a5584d6f5eaf0.tar.bz2 | |
Improve the AndroidKeyStore-backed HMAC state machine.
This defers the start of a new KeyStore operation after Mac.doFinal
until the next Mac.update or .doFinal. Previously, the a new KeyStore
operation was started immediately, at the end of doFinal.
Bug: 18088752
Change-Id: I2d594067ef261f519631d09f7a6087b715801656
Diffstat (limited to 'keystore/java/android/security/KeyStoreCipherSpi.java')
| -rw-r--r-- | keystore/java/android/security/KeyStoreCipherSpi.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyStoreCipherSpi.java b/keystore/java/android/security/KeyStoreCipherSpi.java index 5219086..afb5e36 100644 --- a/keystore/java/android/security/KeyStoreCipherSpi.java +++ b/keystore/java/android/security/KeyStoreCipherSpi.java @@ -264,8 +264,6 @@ public abstract class KeyStoreCipherSpi extends CipherSpi implements KeyStoreCry @Override protected int engineUpdate(byte[] input, int inputOffset, int inputLen, byte[] output, int outputOffset) throws ShortBufferException { - ensureKeystoreOperationInitialized(); - byte[] outputCopy = engineUpdate(input, inputOffset, inputLen); if (outputCopy == null) { return 0; |