Merge pull request #1660 from ripcurlx/java10-support

Java 10 support
bisq-network · Sep 18, 2018 · a6fe389 · a6fe389
2 parents cbefd37 + db17991
commit a6fe389
Show file tree

Hide file tree

Showing 63 changed files with 200 additions and 279 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: java
-jdk: oraclejdk8
+jdk: oraclejdk10
 before_install:
   grep -v '^#' src/main/resources/META-INF/services/bisq.asset.Asset | sort --check --dictionary-order --ignore-case
 notifications:

diff --git a/assets/build.gradle b/assets/build.gradle
@@ -6,7 +6,7 @@ plugins {
 group 'network.bisq'
 version '-SNAPSHOT'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 1.10
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'

diff --git a/common/build.gradle b/common/build.gradle
@@ -11,7 +11,7 @@ ext {
     protobufVersion = '3.5.1'
 }
 
-sourceCompatibility = 1.8
+sourceCompatibility = 1.10
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
@@ -56,7 +56,7 @@ dependencies {
     compile 'org.bouncycastle:bcpg-jdk15on:1.56'
     compile 'commons-io:commons-io:2.4'
     compile 'org.apache.commons:commons-lang3:3.4'
-    compileOnly 'org.projectlombok:lombok:1.16.16'
-    annotationProcessor 'org.projectlombok:lombok:1.16.16'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
+    annotationProcessor 'org.projectlombok:lombok:1.18.2'
     testCompile 'junit:junit:4.12'
 }
diff --git a/common/src/main/java/bisq/common/crypto/Encryption.java b/common/src/main/java/bisq/common/crypto/Encryption.java
@@ -25,6 +25,8 @@
 import javax.crypto.KeyGenerator;
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.OAEPParameterSpec;
+import javax.crypto.spec.PSource;
 import javax.crypto.spec.SecretKeySpec;
 
 import java.security.InvalidKeyException;
@@ -36,6 +38,7 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.spec.InvalidKeySpecException;
+import java.security.spec.MGF1ParameterSpec;
 import java.security.spec.X509EncodedKeySpec;
 
 import java.io.ByteArrayOutputStream;
@@ -51,7 +54,7 @@ public class Encryption {
     private static final Logger log = LoggerFactory.getLogger(Encryption.class);
 
     public static final String ASYM_KEY_ALGO = "RSA";
-    private static final String ASYM_CIPHER = "RSA/None/OAEPWithSHA256AndMGF1Padding";
+    private static final String ASYM_CIPHER = "RSA/ECB/OAEPWithSHA-256AndMGF1PADDING";
 
     private static final String SYM_KEY_ALGO = "AES";
     private static final String SYM_CIPHER = "AES";
@@ -61,7 +64,7 @@ public class Encryption {
     public static KeyPair generateKeyPair() {
         long ts = System.currentTimeMillis();
         try {
-            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(ASYM_KEY_ALGO, "BC");
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(ASYM_KEY_ALGO);
             keyPairGenerator.initialize(2048);
             KeyPair keyPair = keyPairGenerator.genKeyPair();
             log.trace("Generate msgEncryptionKeyPair needed {} ms", System.currentTimeMillis() - ts);
@@ -80,7 +83,7 @@ public static KeyPair generateKeyPair() {
 
     public static byte[] encrypt(byte[] payload, SecretKey secretKey) throws CryptoException {
         try {
-            Cipher cipher = Cipher.getInstance(SYM_CIPHER, "BC");
+            Cipher cipher = Cipher.getInstance(SYM_CIPHER);
             cipher.init(Cipher.ENCRYPT_MODE, secretKey);
             return cipher.doFinal(payload);
         } catch (Throwable e) {
@@ -91,7 +94,7 @@ public static byte[] encrypt(byte[] payload, SecretKey secretKey) throws CryptoE
 
     public static byte[] decrypt(byte[] encryptedPayload, SecretKey secretKey) throws CryptoException {
         try {
-            Cipher cipher = Cipher.getInstance(SYM_CIPHER, "BC");
+            Cipher cipher = Cipher.getInstance(SYM_CIPHER);
             cipher.init(Cipher.DECRYPT_MODE, secretKey);
             return cipher.doFinal(encryptedPayload);
         } catch (Throwable e) {
@@ -157,7 +160,7 @@ private static boolean verifyHmac(byte[] message, byte[] hmac, SecretKey secretK
     }
 
     private static byte[] getHmac(byte[] payload, SecretKey secretKey) throws NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException {
-        Mac mac = Mac.getInstance(HMAC, "BC");
+        Mac mac = Mac.getInstance(HMAC);
         mac.init(secretKey);
         return mac.doFinal(payload);
     }
@@ -195,8 +198,10 @@ public static byte[] decryptPayloadWithHmac(byte[] encryptedPayloadWithHmac, Sec
 
     public static byte[] encryptSecretKey(SecretKey secretKey, PublicKey publicKey) throws CryptoException {
         try {
-            Cipher cipher = Cipher.getInstance(ASYM_CIPHER, "BC");
-            cipher.init(Cipher.WRAP_MODE, publicKey);
+            Cipher cipher = Cipher.getInstance(ASYM_CIPHER);
+            OAEPParameterSpec oaepParameterSpec = new OAEPParameterSpec("SHA-256", "MGF1",
+                    MGF1ParameterSpec.SHA256, PSource.PSpecified.DEFAULT);
+            cipher.init(Cipher.WRAP_MODE, publicKey, oaepParameterSpec);
             return cipher.wrap(secretKey);
         } catch (Throwable e) {
             e.printStackTrace();
@@ -206,8 +211,10 @@ public static byte[] encryptSecretKey(SecretKey secretKey, PublicKey publicKey)
 
     public static SecretKey decryptSecretKey(byte[] encryptedSecretKey, PrivateKey privateKey) throws CryptoException {
         try {
-            Cipher cipher = Cipher.getInstance(ASYM_CIPHER, "BC");
-            cipher.init(Cipher.UNWRAP_MODE, privateKey);
+            Cipher cipher = Cipher.getInstance(ASYM_CIPHER);
+            OAEPParameterSpec oaepParameterSpec = new OAEPParameterSpec("SHA-256", "MGF1",
+                    MGF1ParameterSpec.SHA256, PSource.PSpecified.DEFAULT);
+            cipher.init(Cipher.UNWRAP_MODE, privateKey, oaepParameterSpec);
             return (SecretKey) cipher.unwrap(encryptedSecretKey, "AES", Cipher.SECRET_KEY);
         } catch (Throwable e) {
             // errors when trying to decrypt foreign network_messages are normal
@@ -222,7 +229,7 @@ public static SecretKey decryptSecretKey(byte[] encryptedSecretKey, PrivateKey p
 
     public static SecretKey generateSecretKey(int bits) {
         try {
-            KeyGenerator keyPairGenerator = KeyGenerator.getInstance(SYM_KEY_ALGO, "BC");
+            KeyGenerator keyPairGenerator = KeyGenerator.getInstance(SYM_KEY_ALGO);
             keyPairGenerator.init(bits);
             return keyPairGenerator.generateKey();
         } catch (Throwable e) {
@@ -242,8 +249,8 @@ public static byte[] getPublicKeyBytes(PublicKey encryptionPubKey) {
      */
     public static PublicKey getPublicKeyFromBytes(byte[] encryptionPubKeyBytes) {
         try {
-            return KeyFactory.getInstance(Encryption.ASYM_KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(encryptionPubKeyBytes));
-        } catch (InvalidKeySpecException | NoSuchAlgorithmException | NoSuchProviderException e) {
+            return KeyFactory.getInstance(Encryption.ASYM_KEY_ALGO).generatePublic(new X509EncodedKeySpec(encryptionPubKeyBytes));
+        } catch (InvalidKeySpecException | NoSuchAlgorithmException e) {
             log.error("Error creating sigPublicKey from bytes. sigPublicKeyBytes as hex={}, error={}", Utilities.bytesAsHexString(encryptionPubKeyBytes), e);
             e.printStackTrace();
             throw new KeyConversionException(e);

diff --git a/common/src/main/java/bisq/common/crypto/Hash.java b/common/src/main/java/bisq/common/crypto/Hash.java
@@ -25,7 +25,6 @@
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 
 import java.nio.ByteBuffer;
 
@@ -40,10 +39,10 @@ public class Hash {
      */
     public static byte[] getSha256Hash(byte[] data) {
         try {
-            MessageDigest digest = MessageDigest.getInstance("SHA-256", "BC");
+            MessageDigest digest = MessageDigest.getInstance("SHA-256");
             digest.update(data, 0, data.length);
             return digest.digest();
-        } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
+        } catch (NoSuchAlgorithmException e) {
             log.error("Could not create MessageDigest for hash. " + e.toString());
             e.printStackTrace();
             throw new RuntimeException(e);

diff --git a/common/src/main/java/bisq/common/crypto/KeyStorage.java b/common/src/main/java/bisq/common/crypto/KeyStorage.java
@@ -28,7 +28,6 @@
 import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.interfaces.DSAParams;
@@ -121,7 +120,7 @@ public KeyPair loadKeyPair(KeyEntry keyEntry) {
         FileUtil.rollingBackup(storageDir, keyEntry.getFileName() + ".key", 20);
         // long now = System.currentTimeMillis();
         try {
-            KeyFactory keyFactory = KeyFactory.getInstance(keyEntry.getAlgorithm(), "BC");
+            KeyFactory keyFactory = KeyFactory.getInstance(keyEntry.getAlgorithm());
             PublicKey publicKey;
             PrivateKey privateKey;
 
@@ -158,7 +157,7 @@ public KeyPair loadKeyPair(KeyEntry keyEntry) {
 
             log.debug("load completed in {} msec", System.currentTimeMillis() - new Date().getTime());
             return new KeyPair(publicKey, privateKey);
-        } catch (NoSuchAlgorithmException | InvalidKeySpecException | NoSuchProviderException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
             e.printStackTrace();
             log.error(e.getMessage());
             throw new RuntimeException("Could not load key " + keyEntry.toString(), e);

diff --git a/common/src/main/java/bisq/common/crypto/Sig.java b/common/src/main/java/bisq/common/crypto/Sig.java
@@ -28,7 +28,6 @@
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.security.Signature;
@@ -60,12 +59,12 @@ public class Sig {
     public static KeyPair generateKeyPair() {
         long ts = System.currentTimeMillis();
         try {
-            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_ALGO, "BC");
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_ALGO);
             keyPairGenerator.initialize(1024);
             KeyPair keyPair = keyPairGenerator.genKeyPair();
             log.trace("Generate msgSignatureKeyPair needed {} ms", System.currentTimeMillis() - ts);
             return keyPair;
-        } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
+        } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
             log.error(e.toString());
             throw new RuntimeException("Could not create key.");
@@ -80,11 +79,11 @@ public static KeyPair generateKeyPair() {
      */
     public static byte[] sign(PrivateKey privateKey, byte[] data) throws CryptoException {
         try {
-            Signature sig = Signature.getInstance(ALGO, "BC");
+            Signature sig = Signature.getInstance(ALGO);
             sig.initSign(privateKey);
             sig.update(data);
             return sig.sign();
-        } catch (SignatureException | NoSuchProviderException | InvalidKeyException | NoSuchAlgorithmException e) {
+        } catch (SignatureException | InvalidKeyException | NoSuchAlgorithmException e) {
             throw new CryptoException("Signing failed. " + e.getMessage());
         }
     }
@@ -107,11 +106,11 @@ public static String sign(PrivateKey privateKey, String message) throws CryptoEx
      */
     public static boolean verify(PublicKey publicKey, byte[] data, byte[] signature) throws CryptoException {
         try {
-            Signature sig = Signature.getInstance(ALGO, "BC");
+            Signature sig = Signature.getInstance(ALGO);
             sig.initVerify(publicKey);
             sig.update(data);
             return sig.verify(signature);
-        } catch (SignatureException | NoSuchProviderException | InvalidKeyException | NoSuchAlgorithmException e) {
+        } catch (SignatureException | InvalidKeyException | NoSuchAlgorithmException e) {
             throw new CryptoException("Signature verification failed. " + e.getMessage());
         }
     }
@@ -132,8 +131,8 @@ public static boolean verify(PublicKey publicKey, String message, String signatu
      */
     public static PublicKey getPublicKeyFromBytes(byte[] sigPublicKeyBytes) {
         try {
-            return KeyFactory.getInstance(Sig.KEY_ALGO, "BC").generatePublic(new X509EncodedKeySpec(sigPublicKeyBytes));
-        } catch (InvalidKeySpecException | NoSuchAlgorithmException | NoSuchProviderException e) {
+            return KeyFactory.getInstance(Sig.KEY_ALGO).generatePublic(new X509EncodedKeySpec(sigPublicKeyBytes));
+        } catch (InvalidKeySpecException | NoSuchAlgorithmException e) {
             log.error("Error creating sigPublicKey from bytes. sigPublicKeyBytes as hex={}, error={}", Utilities.bytesAsHexString(sigPublicKeyBytes), e);
             e.printStackTrace();
             throw new KeyConversionException(e);

diff --git a/common/src/main/java/bisq/common/setup/CommonSetup.java b/common/src/main/java/bisq/common/setup/CommonSetup.java
@@ -25,10 +25,7 @@
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
 import java.security.NoSuchAlgorithmException;
-import java.security.Security;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -38,8 +35,6 @@ public class CommonSetup {
     public static void setup(UncaughtExceptionHandler uncaughtExceptionHandler) {
         setupErrorHandler(uncaughtExceptionHandler);
 
-        Security.addProvider(new BouncyCastleProvider());
-
         if (Utilities.isLinux())
             System.setProperty("prism.lcdtext", "false");
     }

diff --git a/core/build.gradle b/core/build.gradle
@@ -6,12 +6,14 @@ plugins {
 group = 'network.bisq'
 version = '-SNAPSHOT'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 1.10
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
+def jmockitVersion = '1.42'
+
 repositories {
     jcenter()
     maven { url 'https://jitpack.io' }
@@ -43,18 +45,29 @@ dependencies {
     compile('com.fasterxml.jackson.core:jackson-databind:2.8.10') {
         exclude(module: 'jackson-annotations')
     }
-    compileOnly 'org.projectlombok:lombok:1.16.16'
-    annotationProcessor 'org.projectlombok:lombok:1.16.16'
+    compileOnly 'org.projectlombok:lombok:1.18.2'
+    annotationProcessor 'org.projectlombok:lombok:1.18.2'
+
+    testCompile "org.jmockit:jmockit:$jmockitVersion"
     testCompile 'junit:junit:4.12'
-    testCompile('org.mockito:mockito-core:2.8.9') {
+    testCompile('org.mockito:mockito-core:2.21.0') {
         exclude(module: 'objenesis')
     }
-    testCompile 'org.powermock:powermock-module-junit4:1.7.1'
-    testCompile 'org.powermock:powermock-api-mockito2:1.7.1'
-    testCompile 'org.jmockit:jmockit:1.30'
+    testCompile 'org.powermock:powermock-module-junit4:2.0.0-beta.5'
+    testCompile 'org.powermock:powermock-api-mockito2:2.0.0-beta.5'
+
+
     testCompile 'org.springframework:spring-test:4.3.6.RELEASE'
     testCompile 'com.natpryce:make-it-easy:4.0.1'
     testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
-    testCompileOnly 'org.projectlombok:lombok:1.16.16'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.16.16'
+    testCompileOnly 'org.projectlombok:lombok:1.18.2'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.2'
 }
+
+test {
+    systemProperty 'jdk.attach.allowAttachSelf', true
+
+    def jmockit = configurations.testCompile.files.find { it.name.contains("jmockit") }.absolutePath
+    jvmArgs "-javaagent:$jmockit"
+}
+
diff --git a/core/src/main/java/bisq/core/app/BisqSetup.java b/core/src/main/java/bisq/core/app/BisqSetup.java
@@ -444,9 +444,6 @@ private void checkCryptoSetup() {
                         ((Ping) tuple.getNetworkEnvelope()).getNonce() == payload.getNonce() &&
                         ((Ping) tuple.getNetworkEnvelope()).getLastRoundTripTime() == payload.getLastRoundTripTime()) {
                     log.debug("Crypto test succeeded");
-
-                    if (Security.getProvider("BC") == null)
-                        throw new CryptoException("Security provider BountyCastle is not available.");
                 } else {
                     throw new CryptoException("Payload not correct after decryption");
                 }

diff --git a/core/src/main/java/bisq/core/app/SetupUtils.java b/core/src/main/java/bisq/core/app/SetupUtils.java
@@ -34,8 +34,6 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
-import java.security.Security;
-
 import java.util.Date;
 import java.util.function.Consumer;
 
@@ -68,11 +66,7 @@ public void run() {
                             ((Ping) tuple.getNetworkEnvelope()).getLastRoundTripTime() == payload.getLastRoundTripTime()) {
                         log.debug("Crypto test succeeded");
 
-                        if (Security.getProvider("BC") != null) {
-                            UserThread.execute(resultHandler::handleResult);
-                        } else {
-                            errorHandler.accept(new CryptoException("Security provider BountyCastle is not available."));
-                        }
+                        UserThread.execute(resultHandler::handleResult);
                     } else {
                         errorHandler.accept(new CryptoException("Payload not correct after decryption"));
                     }

diff --git a/core/src/test/java/bisq/core/arbitration/ArbitratorManagerTest.java b/core/src/test/java/bisq/core/arbitration/ArbitratorManagerTest.java
@@ -27,6 +27,7 @@
 
 import java.util.ArrayList;
 
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -43,12 +44,10 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({User.class, ArbitratorService.class})
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class ArbitratorManagerTest {
 
-    @Before
-    public void setUp() {
-        Security.addProvider(new BouncyCastleProvider());
-    }
+
 
     @Test
     public void testIsArbitratorAvailableForLanguage() {

diff --git a/core/src/test/java/bisq/core/btc/wallet/WalletSetupPreferencesTest.java b/core/src/test/java/bisq/core/btc/wallet/WalletSetupPreferencesTest.java
@@ -23,6 +23,7 @@
 
 import java.util.List;
 
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
@@ -38,6 +39,7 @@
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest(Preferences.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*"})
 public class WalletSetupPreferencesTest {
     @Test
     public void testSelectPreferredNodesWhenPublicOption() {