Skip to content

Commit 0e64b9f

Browse files
committed
added PBKDF2 tests and missing SHA512-224/256 PBE implementations.
minor cleanup of deprecated classes and configuration.
1 parent 444055e commit 0e64b9f

File tree

5 files changed

+308
-166
lines changed

5 files changed

+308
-166
lines changed

prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static public class CBC
5454
{
5555
public CBC()
5656
{
57-
super(new CBCBlockCipher(new DESedeEngine()), 64);
57+
super(CBCBlockCipher.newInstance(new DESedeEngine()), 64);
5858
}
5959
}
6060

prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/IDEA.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static public class PBEWithSHAAndIDEA
7373
{
7474
public PBEWithSHAAndIDEA()
7575
{
76-
super(CBCBlockCipher.newInstance(new IDEAEngine()));
76+
super(CBCBlockCipher.newInstance(new IDEAEngine()), PKCS12, SHA1, 128, 8);
7777
}
7878
}
7979

prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ protected AlgorithmParameters engineGetParameters()
331331
engineParams.init(pbeSpec);
332332
}
333333
catch (Exception e)
334-
{
334+
{ e.printStackTrace();
335335
return null;
336336
}
337337
}
@@ -696,6 +696,8 @@ protected void engineInit(
696696
throw new InvalidKeyException("Algorithm requires a PBE key");
697697
}
698698

699+
pbeAlgorithm = "PKCS12PBE";
700+
699701
if (key instanceof BCPBEKey)
700702
{
701703
// PKCS#12 sets an IV, if we get a key that doesn't have ParametersWithIV we need to reject it. If the

prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ else if (type == PKCS5S2 || type == PKCS5S2_UTF8)
116116
case SHA512:
117117
generator = new PKCS5S2ParametersGenerator(DigestFactory.createSHA512PRF());
118118
break;
119+
case SHA512_224:
120+
generator = new PKCS5S2ParametersGenerator(DigestFactory.createSHA512_224PRF());
121+
break;
122+
case SHA512_256:
123+
generator = new PKCS5S2ParametersGenerator(DigestFactory.createSHA512_256PRF());
124+
break;
119125
case SHA3_224:
120126
generator = new PKCS5S2ParametersGenerator(DigestFactory.createSHA3_224PRF());
121127
break;

0 commit comments

Comments
 (0)