diff options
| author | Adam Vartanian <flooey@google.com> | 2017-05-24 09:45:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-24 09:45:40 +0000 |
| commit | 566e4d644931869cce37399e78bb41a93d4d42b7 (patch) | |
| tree | dc840cc90ea0d3c91ce0f3b0976008f8d0995dc4 | |
| parent | 86fa29062ba17ebd956354a214abb0c5cd6d7734 (diff) | |
| parent | 7e0f44f7d1b6a268d5d901555c830f56e01eb46f (diff) | |
| download | bouncycastle-566e4d644931869cce37399e78bb41a93d4d42b7.tar.gz | |
Merge "Don't use algorithm parameters if missing salt or iteration count." am: 9fd196fcf0 am: dc3758ea55 am: fa175f7308
am: 7e0f44f7d1
Change-Id: I585d00f30e8848563d74d3f244f073d91d5db268
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java index 59b715ad..63d7b351 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java @@ -642,14 +642,17 @@ public class BaseBlockCipher { pbeSpec = (PBEParameterSpec)params; // BEGIN android-added - // At this point, k.getParam() == null, so the key hasn't been generated. Recreate - // the BCPBEKey with specs from algorithm parameters as to generate the key. - k = new BCPBEKey(k.getAlgorithm(), k.getOID(), k.getType(), k.getDigest(), - k.getKeySize(), k.getIvSize(), - new PBEKeySpec( - k.getPassword(), pbeSpec.getSalt(), pbeSpec.getIterationCount(), - k.getKeySize()), - null /* CipherParameters */); + // At this point, k.getParam() == null, so the key hasn't been generated. If + // the parameters have non-default values, recreate the BCPBEKey from algorithm + // parameters as to generate the key. + if ((pbeSpec.getSalt().length != 0) && (pbeSpec.getIterationCount() > 0)) { + k = new BCPBEKey(k.getAlgorithm(), k.getOID(), k.getType(), k.getDigest(), + k.getKeySize(), k.getIvSize(), + new PBEKeySpec( + k.getPassword(), pbeSpec.getSalt(), pbeSpec.getIterationCount(), + k.getKeySize()), + null /* CipherParameters */); + } // END android-added param = PBE.Util.makePBEParameters(k, params, cipher.getUnderlyingCipher().getAlgorithmName()); } |