You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/05/06 14:29:48 UTC

svn commit: r1677966 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Author: markt
Date: Wed May  6 12:29:48 2015
New Revision: 1677966

URL: http://svn.apache.org/r1677966
Log:
Use the trustStoreProvider rather than the keystoreProvider for the trust manager

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1677966&r1=1677965&r2=1677966&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Wed May  6 12:29:48 2015
@@ -365,8 +365,7 @@ public class JSSESocketFactory implement
             algorithm = TrustManagerFactory.getDefaultAlgorithm();
         }
 
-        return getTrustManagers(truststoreType, sslHostConfig.getCertificateKeystoreProvider(),
-                algorithm);
+        return getTrustManagers(truststoreType, endpoint.getTruststoreProvider(), algorithm);
     }
 
     @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org