mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1953 from cbeams/remove-crypto-restrictions

Browse source 
Remove Utilities.removeCryptographyRestrictions
This commit is contained in:
Manfred Karrer 2018-11-23 10:54:36 +01:00 • committed by GitHub
commit c0729f1f0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
common/src/main/java/bisq/common/util/Utilities.java
View file

@ -46,8 +46,6 @@ import javafx.scene.input.KeyEvent;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.Permission;
import java.security.PermissionCollection;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -67,7 +65,6 @@ import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.HashSet; import java.util.HashSet;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.TimeZone; import java.util.TimeZone;
@ -79,9 +76,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -552,56 +546,6 @@ public class Utilities {
return collection.stream().map(Object::toString).collect(Collectors.joining(",")); return collection.stream().map(Object::toString).collect(Collectors.joining(","));
} }
public static void removeCryptographyRestrictions() {
if (!isRestrictedCryptography()) {
System.out.println("Cryptography restrictions removal not needed");
return;
}
try {
/*
* Do the following, but with reflection to bypass access checks:
*
* JceSecurity.isRestricted = false;
* JceSecurity.defaultPolicy.perms.clear();
* JceSecurity.defaultPolicy.add(CryptoAllPermission.INSTANCE);
*/
final Class<?> jceSecurity = Class.forName("javax.crypto.JceSecurity");
final Class<?> cryptoPermissions = Class.forName("javax.crypto.CryptoPermissions");
final Class<?> cryptoAllPermission = Class.forName("javax.crypto.CryptoAllPermission");
final Field isRestrictedField = jceSecurity.getDeclaredField("isRestricted");
isRestrictedField.setAccessible(true);
final Field modifiersField = Field.class.getDeclaredField("modifiers");
modifiersField.setAccessible(true);
modifiersField.setInt(isRestrictedField, isRestrictedField.getModifiers() & ~Modifier.FINAL);
isRestrictedField.set(null, false);
final Field defaultPolicyField = jceSecurity.getDeclaredField("defaultPolicy");
defaultPolicyField.setAccessible(true);
final PermissionCollection defaultPolicy = (PermissionCollection) defaultPolicyField.get(null);
final Field perms = cryptoPermissions.getDeclaredField("perms");
perms.setAccessible(true);
((Map<?, ?>) perms.get(defaultPolicy)).clear();
final Field instance = cryptoAllPermission.getDeclaredField("INSTANCE");
instance.setAccessible(true);
defaultPolicy.add((Permission) instance.get(null));
System.out.println("Successfully removed cryptography restrictions");
} catch (final Exception e) {
System.err.println("Failed to remove cryptography restrictions" + e);
}
}
public static boolean isRestrictedCryptography() {
// This matches Oracle Java 7 and 8, but not Java 9 or OpenJDK.
final String name = System.getProperty("java.runtime.name");
final String ver = System.getProperty("java.version");
return name != null && name.equals("Java(TM) SE Runtime Environment")
&& ver != null && (ver.startsWith("1.7") || ver.startsWith("1.8"));
}
public static byte[] integerToByteArray(int intValue, int numBytes) { public static byte[] integerToByteArray(int intValue, int numBytes) {
byte[] bytes = new byte[numBytes]; byte[] bytes = new byte[numBytes];
for (int i = numBytes - 1; i >= 0; i--) { for (int i = numBytes - 1; i >= 0; i--) {

3
core/src/main/java/bisq/core/app/BisqExecutable.java
View file

@ -78,9 +78,6 @@ import static java.lang.String.join;
@Slf4j @Slf4j
public abstract class BisqExecutable implements GracefulShutDownHandler { public abstract class BisqExecutable implements GracefulShutDownHandler {
static {
Utilities.removeCryptographyRestrictions();
}
protected Injector injector; protected Injector injector;
protected AppModule module; protected AppModule module;

2
relay/src/main/java/bisq/relay/RelayMain.java
View file

@ -42,8 +42,6 @@ public class RelayMain {
static { static {
// Need to set default locale initially otherwise we get problems at non-english OS // Need to set default locale initially otherwise we get problems at non-english OS
Locale.setDefault(new Locale("en", Locale.getDefault().getCountry())); Locale.setDefault(new Locale("en", Locale.getDefault().getCountry()));
Utilities.removeCryptographyRestrictions();
} }
/** /**