diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java index 578ebead2ead816f6f2579eec8a99d0d3fd47edb..0f7b432ba094bf29a89969df69aa155c78c6da22 100644 --- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java +++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java @@ -9,20 +9,10 @@ import java.io.File; public class TomcatConnectorFactory { public static Connector getSSLConnectorWithTrustStore(String certificateFile, String keyFile, int port) { - Connector connector = new Connector(); - connector.setPort(port); - connector.setSecure(true); - connector.setScheme("https"); - connector.setAttribute("protocol", "org.apache.coyote.http11.Http11NioProtocol"); - connector.setAttribute("SSLCertificateFile", System.getProperty("user.dir") + File.separator + certificateFile); - connector.setAttribute("SSLCertificateKeyFile", System.getProperty("user.dir") + File.separator + keyFile); + Connector connector = getSSLConnectorWithoutTrustStore(certificateFile,keyFile,port); connector.setAttribute("truststoreFile",System.getProperty("user.dir") + File.separator + "keystore.jks"); connector.setAttribute("clientAuth","optional"); connector.setAttribute("truststorePassword","changeit"); - connector.setAttribute("protocol", "HTTP/1.1"); - connector.setAttribute("sslProtocol", "TLSv1.3"); - connector.setAttribute("maxThreads", "200"); - connector.setAttribute("SSLEnabled", "true"); return connector; }