squash w/ 2870ae7. remove TLS/JKS options

Author: korydraughn

irods/src/main/java/ch/cyberduck/core/irods/IRODSConnectionUtils.java

@@ -18,6 +18,8 @@
 import ch.cyberduck.core.preferences.HostPreferencesFactory;
 import ch.cyberduck.core.preferences.PreferencesReader;
 
+import ch.cyberduck.core.ssl.X509TrustManager;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -30,6 +32,7 @@
 import org.irods.irods4j.low_level.api.IRODSApi;
 import org.irods.irods4j.low_level.api.IRODSException;
 
+import javax.net.ssl.TrustManager;
 import java.io.IOException;
 
 final class IRODSConnectionUtils {
@@ -63,11 +66,8 @@ public static IRODSApi.ConnectionOptions initConnectionOptions(IRODSSession sess
         final IRODSApi.ConnectionOptions options = new IRODSApi.ConnectionOptions();
 
         options.clientServerNegotiation = preferences.getProperty(IRODSProtocol.CLIENT_SERVER_NEGOTIATION);
-        options.sslProtocol = preferences.getProperty(IRODSProtocol.TLS_PROTOCOL);
-        options.sslTruststore = preferences.getProperty(IRODSProtocol.TLS_TRUSTSTORE);
-        options.sslTruststorePassword = preferences.getProperty(IRODSProtocol.TLS_TRUSTSTORE_PASSWORD);
-        log.debug("client server negotiation = [{}], ssl protocol = [{}], ssl truststore = [{}]",
-                options.clientServerNegotiation, options.sslProtocol, options.sslTruststore);
+        options.trustManagers = new TrustManager[]{session.getFeature(X509TrustManager.class)};
+        log.debug("client server negotiation = [{}], ssl protocol = [{}]", options.clientServerNegotiation, options.sslProtocol);
 
         options.encryptionAlgorithm = preferences.getProperty(IRODSProtocol.ENCRYPTION_ALGORITHM);
         options.encryptionKeySize = preferences.getInteger(IRODSProtocol.ENCRYPTION_KEY_SIZE);

irods/src/main/java/ch/cyberduck/core/irods/IRODSProtocol.java

@@ -33,9 +33,6 @@ public final class IRODSProtocol extends AbstractProtocol {
     public static final String DESTINATION_RESOURCE = "Destination Resource";
     public static final String DELETE_OBJECTS_PERMANTENTLY = "Delete Objects Permanently";
     public static final String CLIENT_SERVER_NEGOTIATION = "Client Server Negotiation";
-    public static final String TLS_PROTOCOL = "TLS Protocol";
-    public static final String TLS_TRUSTSTORE = "TLS Truststore";
-    public static final String TLS_TRUSTSTORE_PASSWORD = "TLS Truststore Password";
     public static final String ENCRYPTION_ALGORITHM = "Encryption Algorithm";
     public static final String ENCRYPTION_KEY_SIZE = "Encryption Key Size";
     public static final String ENCRYPTION_SALT_SIZE = "Encryption Salt Size";
@@ -89,9 +86,6 @@ public Map<String, String> getProperties() {
         final Map<String, String> props = new HashMap<>();
         props.put(DELETE_OBJECTS_PERMANTENTLY, "no");
         props.put(CLIENT_SERVER_NEGOTIATION, "CS_NEG_REFUSE");
-        props.put(TLS_PROTOCOL, "TLSv1.2");
-        props.put(TLS_TRUSTSTORE, "NOT SET");
-        props.put(TLS_TRUSTSTORE_PASSWORD, "NOT SET");
         props.put(ENCRYPTION_ALGORITHM, "AES-256-CBC");
         props.put(ENCRYPTION_KEY_SIZE, "32");
         props.put(ENCRYPTION_SALT_SIZE, "8");