diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-19 22:53:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 22:53:21 +0000 |
| commit | 84a378f256bf7925ceb5d2c039a033d3e59b75df (patch) | |
| tree | 132c8e27015cbce33888005a5a81bf3cea702dc7 /keystore | |
| parent | 1e575a0f32a00fc6a2f9a71fe1d1eb4426c71787 (diff) | |
| parent | ae1e0e9265ce276d33ed47349074f443ea028b93 (diff) | |
| download | frameworks_base-84a378f256bf7925ceb5d2c039a033d3e59b75df.zip frameworks_base-84a378f256bf7925ceb5d2c039a033d3e59b75df.tar.gz frameworks_base-84a378f256bf7925ceb5d2c039a033d3e59b75df.tar.bz2 | |
Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java index fc53451..83131ed 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java @@ -446,7 +446,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor inputLen = input.length; src.get(input); } - super.engineUpdateAAD(input, inputOffset, inputLen); + engineUpdateAAD(input, inputOffset, inputLen); } @Override |