You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/12/10 14:42:14 UTC
[2/3] cxf git commit: Removing CipherSuiteFilter from test files
Removing CipherSuiteFilter from test files
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/19e912e8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/19e912e8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/19e912e8
Branch: refs/heads/master
Commit: 19e912e8d4b6d3f3a4c2b88b1d53e691496d7dc0
Parents: e5a8058
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 10 13:37:53 2014 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 10 13:38:29 2014 +0000
----------------------------------------------------------------------
.../basic_https/src/main/resources/ServerConfig.xml | 9 ---------
.../ut_policy/src/main/resources/ClientConfig.xml | 9 ---------
.../ut_policy/src/main/resources/ClientConfigStax.xml | 9 ---------
.../ut_policy/src/main/resources/ServiceConfig.xml | 9 ---------
.../ut_policy/src/main/resources/ServiceConfigStax.xml | 9 ---------
.../src/main/resources/SecureClient.xml | 9 ---------
.../src/main/resources/ServerConfig.xml | 9 ---------
.../http/netty/client/integration/ServerConfig.xml | 12 ------------
.../netty/server/integration/ApplicationContext.xml | 12 ------------
.../http/netty/server/integration/ServerConfig.xml | 12 ------------
.../apache/cxf/systest/sts/basic_auth/cxf-service.xml | 5 -----
.../cxf/systest/sts/basic_auth/stax-cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 5 -----
.../cxf/systest/sts/caching/cxf-caching-service.xml | 5 -----
.../org/apache/cxf/systest/sts/caching/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/claims/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/claims/stax-cxf-service.xml | 5 -----
.../cxf/systest/sts/cross_domain/cxf-service.xml | 5 -----
.../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 5 -----
.../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 5 -----
.../cxf/systest/sts/custom_onbehalfof/cxf-service.xml | 5 -----
.../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/deployment/cxf-sts.xml | 5 -----
.../apache/cxf/systest/sts/deployment/stax-cxf-sts.xml | 5 -----
.../systest/sts/distributed_caching/cxf-service.xml | 5 -----
.../cxf/systest/sts/distributed_caching/cxf-sts-1.xml | 5 -----
.../cxf/systest/sts/distributed_caching/cxf-sts-2.xml | 5 -----
.../cxf/systest/sts/kerberos/cxf-intermediary.xml | 5 -----
.../apache/cxf/systest/sts/kerberos/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/realms/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/realms/cxf-sts-saml1.xml | 5 -----
.../apache/cxf/systest/sts/realms/cxf-sts-saml2.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 5 -----
.../apache/cxf/systest/sts/secure_conv/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 5 -----
.../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 5 -----
.../org/apache/cxf/systest/sts/soap12/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/soap12/stax-cxf-service.xml | 5 -----
.../cxf/systest/sts/transformation/cxf-service.xml | 5 -----
.../cxf/systest/sts/usernametoken/cxf-service.xml | 5 -----
.../cxf/systest/sts/usernametoken/stax-cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/bearer/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/bearer/cxf-stax-service.xml | 5 -----
.../cxf/systest/sts/delegation/cxf-sts-transport.xml | 5 -----
.../cxf/systest/sts/deployment/cxf-transport.xml | 5 -----
.../cxf/systest/sts/deployment/stax-cxf-transport.xml | 5 -----
.../cxf-intermediary-caching.xml | 5 -----
.../intermediary_transformation/cxf-intermediary.xml | 5 -----
.../sts/intermediary_transformation/cxf-service.xml | 5 -----
.../org/apache/cxf/systest/sts/issuer/cxf-service.xml | 5 -----
.../cxf/systest/sts/issuer/cxf-sts-transport.xml | 5 -----
.../org/apache/cxf/systest/sts/jaas/cxf-service.xml | 5 -----
.../cxf/systest/sts/sendervouches/cxf-intermediary.xml | 5 -----
.../cxf/systest/sts/sendervouches/cxf-service.xml | 5 -----
.../sts/sendervouches/cxf-stax-intermediary.xml | 5 -----
.../cxf/systest/sts/sendervouches/cxf-stax-service.xml | 5 -----
.../apache/cxf/systest/sts/stsclient/cxf-service.xml | 5 -----
.../apache/cxf/systest/sts/transport/cxf-service.xml | 5 -----
.../cxf/systest/sts/transport/cxf-stax-service.xml | 5 -----
.../cxf/systest/jaxrs/security/jaxrs-https-server.xml | 5 -----
.../cxf/systest/kerberos/wssec/kerberos/server.xml | 10 ----------
.../systest/kerberos/wssec/kerberos/stax-server.xml | 5 -----
.../cxf/systest/kerberos/wssec/spnego/server.xml | 5 -----
.../cxf/systest/kerberos/wssec/spnego/stax-server.xml | 5 -----
.../apache/cxf/systest/kerberos/wssec/sts/cxf-sts.xml | 5 -----
.../cxf/systest/kerberos/wssec/sts/stax-cxf-sts.xml | 5 -----
.../apache/cxf/systest/jaxrs/security/jwt/server.xml | 5 -----
.../cxf/systest/jaxrs/security/jwt/serverJwsJson.xml | 5 -----
.../cxf/systest/jaxrs/security/oauth2/server.xml | 5 -----
.../cxf/systest/jaxrs/security/saml/secureServer.xml | 5 -----
.../apache/cxf/systest/jaxrs/security/saml/server.xml | 5 -----
.../apache/cxf/systest/jaxrs/security/xml/server.xml | 5 -----
.../cxf/systest/jaxrs/security/xml/stax-server.xml | 5 -----
.../apache/cxf/systest/wssec/examples/saml/server.xml | 5 -----
.../cxf/systest/wssec/examples/saml/stax-server.xml | 5 -----
.../apache/cxf/systest/wssec/examples/ut/server.xml | 5 -----
.../cxf/systest/wssec/examples/ut/stax-server.xml | 5 -----
.../org/apache/cxf/systest/ws/https/server.xml | 5 -----
.../org/apache/cxf/systest/ws/https/stax-server.xml | 5 -----
.../apache/cxf/systest/ws/policy/javafirstserver.xml | 13 -------------
.../org/apache/cxf/systest/ws/policy/server.xml | 5 -----
.../org/apache/cxf/systest/ws/saml/server.xml | 5 -----
.../org/apache/cxf/systest/ws/saml/stax-server.xml | 5 -----
.../apache/cxf/systest/ws/saml/subjectconf/server.xml | 5 -----
.../cxf/systest/ws/saml/subjectconf/stax-server.xml | 5 -----
.../apache/cxf/systest/ws/security/https_config.xml | 9 ---------
.../cxf/systest/ws/security/https_config_client.xml | 9 ---------
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 5 -----
.../org/apache/cxf/systest/ws/ut/server-derived.xml | 5 -----
.../resources/org/apache/cxf/systest/ws/ut/server.xml | 5 -----
.../apache/cxf/systest/ws/ut/stax-policy-server.xml | 5 -----
.../org/apache/cxf/systest/ws/ut/stax-server.xml | 5 -----
.../org/apache/cxf/systest/ws/wssc/server.xml | 10 ----------
.../org/apache/cxf/systest/ws/wssc/unit-server.xml | 5 -----
.../org/apache/cxf/systest/ws/wssec10/server.xml | 5 -----
.../cxf/systest/ws/wssec10/server_restricted.xml | 5 -----
.../ws/wssec10/server_restricted_authorized.xml | 5 -----
.../ws/wssec10/server_restricted_authorized_2.xml | 5 -----
.../org/apache/cxf/systest/ws/wssec10/stax-server.xml | 5 -----
.../cxf/systest/ws/wssec10/stax-server_restricted.xml | 5 -----
.../org/apache/cxf/systest/ws/x509/server.xml | 5 -----
.../org/apache/cxf/systest/ws/x509/stax-server.xml | 5 -----
.../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 5 -----
107 files changed, 610 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
index 2e1c4ff..d0100c1 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/resources/ServerConfig.xml
@@ -30,15 +30,6 @@
<sec:trustManagers>
<sec:keyStore file="src/main/config/serviceKeystore.jks" password="sspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
index f499f21..6ba062e 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfig.xml
@@ -34,15 +34,6 @@
<sec:trustManagers>
<sec:keyStore file="src/main/config/clientKeystore.jks" password="cspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
</http:tlsClientParameters>
</http:conduit>
<jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
index 3385aa8..b3ff026 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ClientConfigStax.xml
@@ -34,15 +34,6 @@
<sec:trustManagers>
<sec:keyStore file="src/main/config/clientKeystore.jks" password="cspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
</http:tlsClientParameters>
</http:conduit>
<jaxws:client name="{http://apache.org/hello_world_soap_http}SoapPort" createdFromAPI="true">
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
index ec43a27..0eaa16a 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfig.xml
@@ -51,15 +51,6 @@
<sec:trustManagers>
<sec:keyStore file="src/main/config/serviceKeystore.jks" password="sspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
index dffe0ae..c5f7249 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/resources/ServiceConfigStax.xml
@@ -52,15 +52,6 @@
<sec:trustManagers>
<sec:keyStore file="src/main/config/serviceKeystore.jks" password="sspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
index 1b0a4b3..d69644b 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
@@ -29,15 +29,6 @@
<sec:trustManagers>
<sec:keyStore file="src/main/config/clientKeystore.jks" password="cspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
</http:tlsClientParameters>
</http:conduit>
</beans>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
index ff99a56..454c39b 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
@@ -32,15 +32,6 @@
<sec:trustManagers>
<sec:keyStore file="src/main/config/serviceKeystore.jks" password="sspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
index 90862e2..b909085 100644
--- a/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
+++ b/rt/transports/http-netty/netty-client/src/test/resources/org/apache/cxf/transport/http/netty/client/integration/ServerConfig.xml
@@ -33,18 +33,6 @@
<sec:trustManagers>
<sec:keyStore file="src/test/resources/org/apache/cxf/transport/http/netty/client/integration/serviceKeystore.jks" password="sspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
index baae443..d1a150e 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ApplicationContext.xml
@@ -35,18 +35,6 @@
<sec:trustManagers>
<sec:keyStore file="src/test/resources/org/apache/cxf/transport/http/netty/server/integration/serviceKeystore.jks" password="sspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpn:tlsServerParameters>
</httpn:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
index ddff885..ad58bf5 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/integration/ServerConfig.xml
@@ -33,18 +33,6 @@
<sec:trustManagers>
<sec:keyStore file="src/test/resources/org/apache/cxf/transport/http/netty/server/integration/serviceKeystore.jks" password="sspass" type="JKS"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <!-- these filters ensure that a ciphersuite with
- export-suitable or null encryption is used,
- but exclude anonymous Diffie-Hellman key change as
- this is vulnerable to man-in-the-middle attacks -->
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_DES_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- <sec:include>.*_WITH_NULL_.*</sec:include>
- <sec:exclude>.*_DH_anon_.*</sec:exclude>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpn:tlsServerParameters>
</httpn:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
index f7a113f..e2adbae 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/cxf-service.xml
@@ -69,11 +69,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
index 6012487..24e44b9 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/basic_auth/stax-cxf-service.xml
@@ -71,11 +71,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
index 560ccd2..6c62410 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/cxf-sts.xml
@@ -109,11 +109,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
index 30580d7..6670bc5 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml
@@ -115,11 +115,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
index c36f976..aa9ed5c 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-caching-service.xml
@@ -86,11 +86,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
index 9ee7838..a10626b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/caching/cxf-service.xml
@@ -46,11 +46,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
index 5952f8f..125e99e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/cxf-service.xml
@@ -73,11 +73,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
index 216318a..e048e37 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/claims/stax-cxf-service.xml
@@ -78,11 +78,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
index 88e0baf..606dd4a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-service.xml
@@ -47,11 +47,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
index 5eea24e..a54bb03 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml1.xml
@@ -76,11 +76,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
index c6b7938..4a7d789 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/cross_domain/cxf-sts-saml2.xml
@@ -76,11 +76,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
index 1ff25d8..f8a3bf4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-service.xml
@@ -52,11 +52,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
index d22fa0e..94317fe 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/custom_onbehalfof/cxf-sts.xml
@@ -137,11 +137,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
index dc66440..ac48f17 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
@@ -138,11 +138,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml
index 8984837..caab127 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-sts.xml
@@ -143,11 +143,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
index 6d43ae4..6fc175a 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-service.xml
@@ -83,11 +83,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
index 3869147..5b664d6 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-1.xml
@@ -117,11 +117,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
index 8847f88..70dd6ad 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/distributed_caching/cxf-sts-2.xml
@@ -110,11 +110,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
index 4640559..53ede43 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-intermediary.xml
@@ -85,11 +85,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
index 07a6006..b96fcc6 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/kerberos/cxf-service.xml
@@ -36,11 +36,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
index fa7ea2b..d3a1c4f 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-service.xml
@@ -125,11 +125,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
index 78c69a2..d1edaed 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml1.xml
@@ -100,11 +100,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
index fee597c..f13d0d1 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/cxf-sts-saml2.xml
@@ -93,11 +93,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
index 5f3d5a8..d4cf6fa 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-service.xml
@@ -54,11 +54,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
index 5e5c541..4b58d0e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml
@@ -126,11 +126,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
index 75da26e..d7b97f9 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/cxf-sts.xml
@@ -117,11 +117,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
index 0d5cd51..e0ac2e4 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml
@@ -120,11 +120,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
index 5625015..138bd39 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-service.xml
@@ -83,11 +83,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
index 9713b1a..9f4c684 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/cxf-sts.xml
@@ -147,11 +147,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
index 90e3ec8..6a2c706 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/stax-cxf-sts.xml
@@ -154,11 +154,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
index 4251ad3..425342e 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/cxf-service.xml
@@ -56,11 +56,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
index 8b25bfa..183acd3 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/soap12/stax-cxf-service.xml
@@ -58,11 +58,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
index 11ab3db..7dda43b 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/transformation/cxf-service.xml
@@ -80,11 +80,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
index 32892dd..9ba4d80 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/cxf-service.xml
@@ -96,11 +96,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
index ad4e339..81fc786 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/usernametoken/stax-cxf-service.xml
@@ -54,11 +54,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
index daecd2f..bb70869 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-service.xml
@@ -42,11 +42,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
index be16201..f47c15a 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/bearer/cxf-stax-service.xml
@@ -44,11 +44,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
index 91cf5c9..eb2f175 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml
@@ -135,11 +135,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
index 9bed201..49a1b6d 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml
@@ -169,11 +169,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
index d6ca805..a209974 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-transport.xml
@@ -153,11 +153,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
index e050aab..d015642 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
@@ -37,11 +37,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
index 45b5378..7c9262f 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary.xml
@@ -37,11 +37,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
index 2c82aee..89d783d 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-service.xml
@@ -43,11 +43,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
index b60fba6..215d77b 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
@@ -56,11 +56,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
index c4bf49d..62e5da1 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
@@ -136,11 +136,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
index 4e985b5..52b1bf6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/jaas/cxf-service.xml
@@ -100,11 +100,6 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:trustManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml
index ed06804..4eb5e4d 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-intermediary.xml
@@ -38,11 +38,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
index bb4e331..5fd50df 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-service.xml
@@ -39,11 +39,6 @@
<sec:keyManagers keyPassword="stskpass">
<sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="true"/>
</httpj:tlsServerParameters>
</httpj:engine>
http://git-wip-us.apache.org/repos/asf/cxf/blob/19e912e8/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml
index e31a654..34539c5 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/sendervouches/cxf-stax-intermediary.xml
@@ -39,11 +39,6 @@
<sec:keyManagers keyPassword="skpass">
<sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
</sec:keyManagers>
- <sec:cipherSuitesFilter>
- <sec:include>.*_EXPORT_.*</sec:include>
- <sec:include>.*_EXPORT1024_.*</sec:include>
- <sec:include>.*_WITH_AES_.*</sec:include>
- </sec:cipherSuitesFilter>
<sec:clientAuthentication want="false" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>