Merge pull request #512 from greboid/master

Switch to J8 Base64.

build.gradle

@@ -38,7 +38,6 @@ dependencies {
 
     bundle group: 'com.squareup.dagger', name: 'dagger', version: '1.2.1'
     bundle group: 'com.esotericsoftware.yamlbeans', name: 'yamlbeans', version: '1.08'
-    bundle group: 'com.brsanthu', name: 'migbase64', version: '2.2'
     bundle group: 'net.kencochrane.raven', name: 'raven', version: '6.0.0'
     bundle group: 'com.google.guava', name:'guava', version: '18.0'
     bundle group: 'net.engio', name: 'mbassador', version: '1.2.0'

src/com/dmdirc/tls/CertificateManager.java

@@ -47,6 +47,7 @@ import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -63,8 +64,6 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import com.migcomponents.migbase64.Base64;
-
 /**
  * Manages storage and validation of certificates used when connecting to SSL servers.
  *
@@ -200,7 +199,7 @@ public class CertificateManager implements X509TrustManager {
      */
     public TrustResult isTrusted(final X509Certificate certificate) {
         try {
-            final String sig = Base64.encodeToString(certificate.getSignature(), false);
+            final String sig = Base64.getEncoder().encodeToString(certificate.getSignature());
 
             if (config.hasOptionString("ssl", "trusted") && config.getOptionList("ssl",
                     "trusted").contains(sig)) {
@@ -296,8 +295,8 @@ public class CertificateManager implements X509TrustManager {
         }
 
         if (!problems.isEmpty()) {
-            eventBus.publishAsync(new ServerCertificateProblemEncounteredEvent(
-                    connection, this, Arrays.asList(chain), problems));
+            eventBus.publishAsync(new ServerCertificateProblemEncounteredEvent(connection, this,
+                    Arrays.asList(chain), problems));
 
             try {
                 actionSem.acquire();
@@ -314,7 +313,7 @@ public class CertificateManager implements X509TrustManager {
                 case IGNORE_PERMANENTLY:
                     final List<String> list = new ArrayList<>(config
                             .getOptionList("ssl", "trusted"));
-                    list.add(Base64.encodeToString(chain[0].getSignature(), false));
+                    list.add(Base64.getEncoder().encodeToString(chain[0].getSignature()));
                     userSettings.setOption("ssl", "trusted", list);
                     break;
                 case IGNORE_TEMPORARILY:
@@ -444,4 +443,4 @@ public class CertificateManager implements X509TrustManager {
         return globalTrustedCAs.toArray(new X509Certificate[globalTrustedCAs.size()]);
     }
 
-}
+}