diff options
author | Alex Klyubin <klyubin@google.com> | 2015-06-17 17:58:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-17 17:58:35 +0000 |
commit | 4250c8d6435cca2c14839f7adec0a43773d01e3b (patch) | |
tree | b5ced4e9939b0679345801ac3acfe6381ff339b5 /keystore/java/android/security/keystore/AndroidKeyStoreRSACipherSpi.java | |
parent | 5ddaa72b9a60dda43c9e199f85990c01b0bf702c (diff) | |
parent | 00af27b7d9010eb41e45959dab7c4ff6de119897 (diff) | |
download | frameworks_base-4250c8d6435cca2c14839f7adec0a43773d01e3b.zip frameworks_base-4250c8d6435cca2c14839f7adec0a43773d01e3b.tar.gz frameworks_base-4250c8d6435cca2c14839f7adec0a43773d01e3b.tar.bz2 |
Merge "Expose AES GCM backed by Android Keystore." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/keystore/AndroidKeyStoreRSACipherSpi.java')
-rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreRSACipherSpi.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreRSACipherSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreRSACipherSpi.java index 6abdf19..38e216d 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreRSACipherSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreRSACipherSpi.java @@ -129,6 +129,7 @@ abstract class AndroidKeyStoreRSACipherSpi extends AndroidKeyStoreCipherSpiBase private final KeyStoreCryptoOperationStreamer mDelegate; private final int mModulusSizeBytes; private final ByteArrayOutputStream mInputBuffer = new ByteArrayOutputStream(); + private long mConsumedInputSizeBytes; private ZeroPaddingEncryptionStreamer( KeyStoreCryptoOperationStreamer delegate, @@ -142,6 +143,7 @@ abstract class AndroidKeyStoreRSACipherSpi extends AndroidKeyStoreCipherSpiBase throws KeyStoreException { if (inputLength > 0) { mInputBuffer.write(input, inputOffset, inputLength); + mConsumedInputSizeBytes += inputLength; } return EmptyArray.BYTE; } @@ -151,6 +153,7 @@ abstract class AndroidKeyStoreRSACipherSpi extends AndroidKeyStoreCipherSpiBase byte[] additionalEntropy) throws KeyStoreException { if (inputLength > 0) { + mConsumedInputSizeBytes += inputLength; mInputBuffer.write(input, inputOffset, inputLength); } byte[] bufferedInput = mInputBuffer.toByteArray(); @@ -173,6 +176,16 @@ abstract class AndroidKeyStoreRSACipherSpi extends AndroidKeyStoreCipherSpiBase } return mDelegate.doFinal(paddedInput, 0, paddedInput.length, additionalEntropy); } + + @Override + public long getConsumedInputSizeBytes() { + return mConsumedInputSizeBytes; + } + + @Override + public long getProducedOutputSizeBytes() { + return mDelegate.getProducedOutputSizeBytes(); + } } } |