release-request-2b4652df-202e-4cb9-bf98-5bd21a9292d6-for-git_oc-release-4038361 snap-temp-L17500000067353615
Change-Id: I7b92bb072a6004c316172a0e3b16ce4f1f458f89
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 63d7b35..59b715a 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,17 +642,14 @@
{
pbeSpec = (PBEParameterSpec)params;
// BEGIN android-added
- // 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 */);
- }
+ // 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 */);
// END android-added
param = PBE.Util.makePBEParameters(k, params, cipher.getUnderlyingCipher().getAlgorithmName());
}
