Merge "fix: general cleanup. Remove CipherInfo as it is not compatible with java-11"

[gigi.git] / src / club / wpia / gigi / Launcher.java

diff --git a/src/club/wpia/gigi/Launcher.java b/src/club/wpia/gigi/Launcher.java
index fdcc739b7074112541dd161acf232b9331de39cf..c5e43ce62bce338b5791c3b80d2b13bd29bcbb12 100644 (file)
--- a/src/club/wpia/gigi/Launcher.java
+++ b/src/club/wpia/gigi/Launcher.java
@@ -59,7 +59,6 @@ import club.wpia.gigi.api.GigiAPI;
 import club.wpia.gigi.email.EmailProvider;
 import club.wpia.gigi.natives.SetUID;
 import club.wpia.gigi.ocsp.OCSPResponder;
-import club.wpia.gigi.util.CipherInfo;
 import club.wpia.gigi.util.PEM;
 import club.wpia.gigi.util.ServerConstants;
 import club.wpia.gigi.util.ServerConstants.Host;
@@ -273,19 +272,12 @@ public class Launcher {
         private static SslContextFactory generateSSLContextFactory(GigiConfig conf, String alias) throws GeneralSecurityException, IOException {
             SslContextFactory scf = new SslContextFactory() {
 
-                String[] ciphers = null;
-
                 @Override
                 public void customize(SSLEngine sslEngine) {
                     super.customize(sslEngine);
 
                     SSLParameters ssl = sslEngine.getSSLParameters();
                     ssl.setUseCipherSuitesOrder(true);
-                    if (ciphers == null) {
-                        ciphers = CipherInfo.filter(sslEngine.getSupportedCipherSuites());
-                    }
-
-                    ssl.setCipherSuites(ciphers);
                     sslEngine.setSSLParameters(ssl);
 
                 }