From ae1e0e9265ce276d33ed47349074f443ea028b93 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Fri, 19 Jun 2015 15:50:45 -0700 Subject: Fix a bug in Android Keystore updateAAD. The variant of CipherSpi.engineUpdateAAD which takes ByteBuffers delegated to a byte[]-taking variant of superclass instead of its own class. Bug: 18088752 Change-Id: I3b426bbdca54bbf7f6f3939589da07b24db14d0d --- .../java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keystore') 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 -- cgit v1.1