[java-idp-plugin-jetty] 43/186: IDP-1110 - Remove workaround for bug no longer in Jetty ?

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/foo
in repository java-idp-plugin-jetty.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=a4b963c1aff83be28633738bbf48f0916dfbfbb7

commit a4b963c1aff83be28633738bbf48f0916dfbfbb7
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Apr 26 09:35:26 2018 -0500

    IDP-1110 - Remove workaround for bug no longer in Jetty ?
    
    https://issues.shibboleth.net/jira/browse/IDP-1110
---
 src/main/resources/jetty-base/etc/idp-backchannel.xml   | 2 --
 src/main/resources/jetty-base/etc/jetty-ssl-context.xml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/main/resources/jetty-base/etc/idp-backchannel.xml b/src/main/resources/jetty-base/etc/idp-backchannel.xml
index 0bb2a21..7da42fb 100644
--- a/src/main/resources/jetty-base/etc/idp-backchannel.xml
+++ b/src/main/resources/jetty-base/etc/idp-backchannel.xml
@@ -12,8 +12,6 @@
     <Set name="KeyStorePath"><Property name="jetty.backchannel.keystore.path" default="../credentials/idp-backchannel.p12" /></Set>
     <Set name="KeyStoreType"><Property name="jetty.backchannel.keystore.type" default="PKCS12" /></Set>
     <Set name="KeyStorePassword"><Property name="jetty.backchannel.keystore.password" default="changeit" /></Set>
-    <!-- This is a tweak to work around a bug in Jetty when using the PKCS12 keystore type. -->
-    <Set name="TrustStoreType"><Property name="jetty.backchannel.keystore.type" /></Set>
     <Set name="EndpointIdentificationAlgorithm"></Set>
     <Set name="renegotiationAllowed">false</Set>
     <Set name="useCipherSuitesOrder">true</Set>
diff --git a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
index 752cb72..8406e12 100644
--- a/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
+++ b/src/main/resources/jetty-base/etc/jetty-ssl-context.xml
@@ -8,8 +8,6 @@
     <Set name="KeyStorePath"><Property name="jetty.sslContext.keyStorePath" default="../credentials/idp-userfacing.p12" /></Set>
     <Set name="KeyStoreType"><Property name="jetty.sslContext.keyStoreType" default="PKCS12" /></Set>
     <Set name="KeyStorePassword"><Property name="jetty.sslContext.keyStorePassword" default="changeit" /></Set>
-    <!-- This is a tweak to work around a bug in Jetty when using the PKCS12 keystore type. -->
-    <Set name="TrustStoreType"><Property name="jetty.sslContext.keyStoreType" /></Set>
     <Set name="EndpointIdentificationAlgorithm"></Set>
     <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" default="false"/></Set>
     <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" default="false"/></Set>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.