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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Oct 25 16:52:54 2016
New Revision: 8542

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8542&view=rev
Log:
Refactor security-enhanced TLS socket factory bean wiring to use new support class.  Add bean that support clientTLS. 

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

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=8542&r1=8541&r2=8542&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 Oct 25 16:52:54 2016
@@ -322,15 +322,13 @@
         
     <bean id="shibboleth.SecurityEnhancedTLSSocketFactory" name="shibboleth.TrustEngineTLSSocketFactory" 
         lazy-init="true"
-        class="org.opensaml.security.httpclient.impl.SecurityEnhancedTLSSocketFactory">
-        <constructor-arg>
-            <bean class="net.shibboleth.utilities.java.support.httpclient.HttpClientSupport"
-                factory-method="buildNoTrustTLSSocketFactory" />
-        </constructor-arg>
-        <constructor-arg>
-            <bean class="org.apache.http.conn.ssl.StrictHostnameVerifier" />
-        </constructor-arg>
-    </bean>
+        class="org.opensaml.security.httpclient.impl.SecurityEnhancedHttpClientSupport"
+        factory-method="buildTLSSocketFactory" />
+    
+    <bean id="shibboleth.SecurityEnhancedTLSSocketFactoryWithClientTLS"
+        lazy-init="true"
+        class="org.opensaml.security.httpclient.impl.SecurityEnhancedHttpClientSupport"
+        factory-method="buildTLSSocketFactoryWithClientTLS" />
     
     <bean id="shibboleth.StaticTrustEngine" abstract="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.security.trustengine.impl.StaticExplicitKeyFactoryBean" />