Skip to content

Use SecureRandom for cryptographic operations and remove SHA1PRNG dependency #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmestwa-coder wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −18
Open

Use SecureRandom for cryptographic operations and remove SHA1PRNG dependency #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions wicket-core/src/main/java/org/apache/wicket/core/random/DefaultSecureRandomSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@
*/
package org.apache.wicket.core.random;

import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;

import org.apache.wicket.WicketRuntimeException;

/**
* A very simple {@link ISecureRandomSupplier} that holds a {@code SecureRandom} using
* {@code SHA1PRNG}. This {@code SecureRandom} is strong enough for generation of nonces with a
* A very simple {@link ISecureRandomSupplier} that holds a {@code SecureRandom}.
* This {@code SecureRandom} is strong enough for generation of nonces with a
* short lifespan, but might not be strong enough for generating long-lived keys. When your
* application has stronger requirements on the random implementation, you should replace this class
* by your own implementation.
Expand All @@ -34,19 +31,10 @@ public class DefaultSecureRandomSupplier implements ISecureRandomSupplier
{
private static final class Holder
{
private static final SecureRandom INSTANCE;

static
{
try
{
INSTANCE = SecureRandom.getInstance("SHA1PRNG");
} catch (NoSuchAlgorithmException e) {
throw new WicketRuntimeException(e);
}
}
private static final SecureRandom INSTANCE = new SecureRandom();
}


@Override
public SecureRandom getRandom()
{
Expand Down
5 changes: 3 additions & 2 deletions wicket-util/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@

import java.security.GeneralSecurityException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
import java.util.Random;

import javax.crypto.Cipher;
import javax.crypto.SecretKey;
Expand All @@ -42,6 +42,7 @@
*/
public class SunJceCrypt extends AbstractCrypt
{
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
/** Name of the default encryption method */
public static final String DEFAULT_CRYPT_METHOD = "PBEWithMD5AndDES";

Expand Down Expand Up @@ -169,7 +170,7 @@ public static byte[] randomSalt()
// must be 8 bytes - for anything else PBES1Core throws
// InvalidAlgorithmParameterException: Salt must be 8 bytes long
byte[] salt = new byte[8];
new Random().nextBytes(salt);
SECURE_RANDOM.nextBytes(salt);
return salt;
}
}