GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Don't use a blocking algorithm for generating keys on unix-like systems 

This should fix GeyserMC/Floodgate#125
This commit is contained in:
Tim203 2021-04-01 00:37:58 +02:00
parent 677a8d68f6
commit 5c12dc8e15
No known key found for this signature in database
GPG Key ID: 064EE9F5BF7C3EE8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/org/geysermc/floodgate/crypto/AesKeyProducer.java
View File

@ -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();
}
}
}