Skip to content

Commit eb5b0fd

Browse files
committed
added SHA512/224, SHA512/256 PBE.
1 parent b0c629c commit eb5b0fd

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,24 @@ public PBKDF2withSHA512()
273273
}
274274
}
275275

276+
public static class PBKDF2withSHA512_224
277+
extends BasePBKDF2
278+
{
279+
public PBKDF2withSHA512_224()
280+
{
281+
super("PBKDF2", PKCS5S2_UTF8, SHA512_224);
282+
}
283+
}
284+
285+
public static class PBKDF2withSHA512_256
286+
extends BasePBKDF2
287+
{
288+
public PBKDF2withSHA512_256()
289+
{
290+
super("PBKDF2", PKCS5S2_UTF8, SHA512_256);
291+
}
292+
}
293+
276294
public static class PBKDF2withGOST3411
277295
extends BasePBKDF2
278296
{
@@ -360,6 +378,8 @@ public void configure(ConfigurableProvider provider)
360378
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA256", PREFIX + "$PBKDF2withSHA256");
361379
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA384", PREFIX + "$PBKDF2withSHA384");
362380
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA512", PREFIX + "$PBKDF2withSHA512");
381+
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA512-224", PREFIX + "$PBKDF2withSHA512_224");
382+
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA512-256", PREFIX + "$PBKDF2withSHA512_256");
363383
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA3-224", PREFIX + "$PBKDF2withSHA3_224");
364384
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA3-256", PREFIX + "$PBKDF2withSHA3_256");
365385
provider.addAlgorithm("SecretKeyFactory.PBKDF2WITHHMACSHA3-384", PREFIX + "$PBKDF2withSHA3_384");

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public interface PBE
4444
static final int SHA3_384 = 12;
4545
static final int SHA3_512 = 13;
4646
static final int SM3 = 14;
47+
static final int SHA512_224 = 15;
48+
static final int SHA512_256 = 16;
4749

4850
static final int PKCS5S1 = 0;
4951
static final int PKCS5S2 = 1;

0 commit comments

Comments
 (0)