mirror of
https://github.com/GeyserMC/Geyser.git
synced 2025-03-14 11:43:48 +01:00
Don't use a blocking algorithm for generating keys on unix-like systems
This should fix GeyserMC/Floodgate#125
This commit is contained in:
parent
677a8d68f6
commit
5c12dc8e15
1 changed files with 13 additions and 1 deletions
|
@ -29,7 +29,9 @@ package org.geysermc.floodgate.crypto;
|
|||
import javax.crypto.KeyGenerator;
|
||||
import javax.crypto.SecretKey;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
import java.util.Locale;
|
||||
|
||||
public final class AesKeyProducer implements KeyProducer {
|
||||
public static int KEY_SIZE = 128;
|
||||
|
@ -38,7 +40,7 @@ public final class AesKeyProducer implements KeyProducer {
|
|||
public SecretKey produce() {
|
||||
try {
|
||||
KeyGenerator keyGenerator = KeyGenerator.getInstance("AES");
|
||||
keyGenerator.init(KEY_SIZE, SecureRandom.getInstanceStrong());
|
||||
keyGenerator.init(KEY_SIZE, getSecureRandom());
|
||||
return keyGenerator.generateKey();
|
||||
} catch (Exception exception) {
|
||||
throw new RuntimeException(exception);
|
||||
|
@ -53,4 +55,14 @@ public final class AesKeyProducer implements KeyProducer {
|
|||
throw new RuntimeException(exception);
|
||||
}
|
||||
}
|
||||
|
||||
private SecureRandom getSecureRandom() throws NoSuchAlgorithmException {
|
||||
// use Windows-PRNG for windows (default impl is SHA1PRNG)
|
||||
// default impl for unix-like systems is NativePRNG.
|
||||
if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win")) {
|
||||
return SecureRandom.getInstance("Windows-PRNG");
|
||||
} else {
|
||||
return new SecureRandom();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue