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

am 216d18b9: Merge "Remove IV auto-generation workaround."

Browse Source 
* commit '216d18b997eb929c2c3af9b2102595f4ec694c20':
  Remove IV auto-generation workaround.
This commit is contained in:
Alex Klyubin
2015-04-16 16:57:05 +00:00
committed by Android Git Automerger
parent 2b300a99bb 216d18b997
commit 28a9089f5b
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
keystore/java/android/security/KeyStoreCipherSpi.java
View File

@@ -547,18 +547,12 @@ public abstract class KeyStoreCipherSpi extends CipherSpi implements KeyStoreCry
if (mIvRequired) { if (mIvRequired) {
// IV is needed // IV is needed
if ((mIv == null) && (mEncrypting)) { if ((mIv == null) && (mEncrypting)) {
// TODO: Switch to keymaster-generated IV code below once keymaster supports // IV was not provided by the caller and thus will be generated by keymaster.
// that. // Mix in some additional entropy from the provided SecureRandom.
// IV is needed but was not provided by the caller -- generate an IV. if (mRng != null) {
mIv = new byte[mBlockSizeBytes]; mAdditionalEntropyForBegin = new byte[mBlockSizeBytes];
SecureRandom rng = (mRng != null) ? mRng : new SecureRandom(); mRng.nextBytes(mAdditionalEntropyForBegin);
rng.nextBytes(mIv); }
// // IV was not provided by the caller and thus will be generated by keymaster.
// // Mix in some additional entropy from the provided SecureRandom.
// if (mRng != null) {
// mAdditionalEntropyForBegin = new byte[mBlockSizeBytes];
// mRng.nextBytes(mAdditionalEntropyForBegin);
// }
} }
} }
} }