You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2020/01/15 22:36:36 UTC
svn commit: r1872840 - in /manifoldcf/trunk: ./ connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/ framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/interfaces/ framework/connector-common/src/ma...

Author: kwright
Date: Wed Jan 15 22:36:35 2020
New Revision: 1872840

URL: http://svn.apache.org/viewvc?rev=1872840&view=rev
Log:
CONNECTORS-1632: Use TLS SocketContexts throughout

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
    manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/interfaces/KeystoreManagerFactory.java
    manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/keystore/KeystoreManager.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1872840&r1=1872839&r2=1872840&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Jan 15 22:36:35 2020
@@ -3,6 +3,8 @@ $Id$
 
 ======================= 2.16-dev =====================
 
+CONNECTORS-1632: Use TLS sockets and no longer support old SSL connections.
+(Jörn Franke)
 
 ======================= Release 2.15 =====================
 

Modified: manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java?rev=1872840&r1=1872839&r2=1872840&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java (original)
+++ manifoldcf/trunk/connectors/gts/connector/src/main/java/org/apache/manifoldcf/agents/output/gts/HttpPoster.java Wed Jan 15 22:36:35 2020
@@ -589,7 +589,7 @@ public class HttpPoster
       java.security.SecureRandom secureRandom = java.security.SecureRandom.getInstance("SHA1PRNG");
 
       // Create an SSL context
-      javax.net.ssl.SSLContext sslContext = javax.net.ssl.SSLContext.getInstance("SSL");
+      javax.net.ssl.SSLContext sslContext = javax.net.ssl.SSLContext.getInstance("TLS");
       sslContext.init(null,new LaxTrustManager[]{new LaxTrustManager()},secureRandom);
       return sslContext.getSocketFactory();
     }

Modified: manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/interfaces/KeystoreManagerFactory.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/interfaces/KeystoreManagerFactory.java?rev=1872840&r1=1872839&r2=1872840&view=diff
==============================================================================
--- manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/interfaces/KeystoreManagerFactory.java (original)
+++ manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/interfaces/KeystoreManagerFactory.java Wed Jan 15 22:36:35 2020
@@ -59,7 +59,7 @@ public class KeystoreManagerFactory
       java.security.SecureRandom secureRandom = java.security.SecureRandom.getInstance("SHA1PRNG");
 
       // Create an SSL context
-      javax.net.ssl.SSLContext sslContext = javax.net.ssl.SSLContext.getInstance("SSL");
+      javax.net.ssl.SSLContext sslContext = javax.net.ssl.SSLContext.getInstance("TLS");
       sslContext.init(null,openTrustManagerArray,secureRandom);
 
       return sslContext.getSocketFactory();

Modified: manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/keystore/KeystoreManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/keystore/KeystoreManager.java?rev=1872840&r1=1872839&r2=1872840&view=diff
==============================================================================
--- manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/keystore/KeystoreManager.java (original)
+++ manifoldcf/trunk/framework/connector-common/src/main/java/org/apache/manifoldcf/connectorcommon/keystore/KeystoreManager.java Wed Jan 15 22:36:35 2020
@@ -401,7 +401,7 @@ public class KeystoreManager implements
       java.security.SecureRandom secureRandom = java.security.SecureRandom.getInstance("SHA1PRNG");
 
       // Create an SSL context
-      javax.net.ssl.SSLContext sslContext = javax.net.ssl.SSLContext.getInstance("SSL");
+      javax.net.ssl.SSLContext sslContext = javax.net.ssl.SSLContext.getInstance("TLS");
       sslContext.init(((keyManagerFactory==null)?null:keyManagerFactory.getKeyManagers()),getTrustManagers(),
         secureRandom);