[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/global-system.xml idp-profile-spri...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Nov  3 19:42:54 2015
New Revision: 7927

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7927&view=rev
Log:
IDP-849: Update HttpClient-related components to use new TLSSocketFactory.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7927&r1=7926&r2=7927&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Tue Nov  3 19:42:54 2015
@@ -304,7 +304,7 @@
         class="org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory">
         <constructor-arg>
             <bean class="net.shibboleth.utilities.java.support.httpclient.HttpClientSupport"
-                factory-method="buildNoTrustSSLConnectionSocketFactory" />
+                factory-method="buildNoTrustTLSSocketFactory" />
         </constructor-arg>
         <constructor-arg>
             <bean class="org.apache.http.conn.ssl.StrictHostnameVerifier" />

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java?rev=7927&r1=7926&r2=7927&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	Tue Nov  3 19:42:54 2015
@@ -183,7 +183,7 @@
 
         if (haveTLSTrustEngine) {
             clientBuilder.addPropertyValue("tLSSocketFactory",
-                    new TrustEngineTLSSocketFactory(HttpClientSupport.buildNoTrustSSLConnectionSocketFactory(),
+                    new TrustEngineTLSSocketFactory(HttpClientSupport.buildNoTrustTLSSocketFactory(),
                             new StrictHostnameVerifier()));
         }
 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java?rev=7927&r1=7926&r2=7927&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java	Tue Nov  3 19:42:54 2015
@@ -192,7 +192,7 @@
 
         if (haveTLSTrustEngine) {
             clientBuilder.addPropertyValue("tLSSocketFactory",
-                    new TrustEngineTLSSocketFactory(HttpClientSupport.buildNoTrustSSLConnectionSocketFactory(),
+                    new TrustEngineTLSSocketFactory(HttpClientSupport.buildNoTrustTLSSocketFactory(),
                             new StrictHostnameVerifier()));
         }