Removing CipherSuiteFilters 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/cdd16477 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cdd16477 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cdd16477 Branch: refs/heads/3.0.x-fixes Commit: cdd16477de83c763681c1adc6f4d4ed552f9ad70 Parents: 838631c Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Dec 10 16:07:21 2014 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Dec 10 16:07:21 2014 +0000 ---------------------------------------------------------------------- .../basic_https/src/main/resources/ServerConfig.xml | 10 ---------- .../ut_policy/src/main/resources/ClientConfig.xml | 10 ---------- .../ut_policy/src/main/resources/ClientConfigStax.xml | 10 ---------- .../ut_policy/src/main/resources/ServiceConfig.xml | 10 ---------- .../src/main/resources/ServiceConfigStax.xml | 10 ---------- .../src/main/resources/SecureClient.xml | 10 ---------- .../src/main/resources/ServerConfig.xml | 10 ---------- .../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 | 6 ------ .../cxf/systest/sts/basic_auth/stax-cxf-service.xml | 6 ------ .../org/apache/cxf/systest/sts/batch/cxf-sts.xml | 6 ------ .../org/apache/cxf/systest/sts/batch/stax-cxf-sts.xml | 6 ------ .../cxf/systest/sts/caching/cxf-caching-service.xml | 6 ------ .../apache/cxf/systest/sts/caching/cxf-service.xml | 6 ------ .../org/apache/cxf/systest/sts/claims/cxf-service.xml | 6 ------ .../cxf/systest/sts/claims/stax-cxf-service.xml | 6 ------ .../cxf/systest/sts/cross_domain/cxf-service.xml | 6 ------ .../cxf/systest/sts/cross_domain/cxf-sts-saml1.xml | 6 ------ .../cxf/systest/sts/cross_domain/cxf-sts-saml2.xml | 6 ------ .../cxf/systest/sts/custom_onbehalfof/cxf-service.xml | 6 ------ .../cxf/systest/sts/custom_onbehalfof/cxf-sts.xml | 6 ------ .../org/apache/cxf/systest/sts/deployment/cxf-sts.xml | 6 ------ .../cxf/systest/sts/deployment/stax-cxf-sts.xml | 6 ------ .../systest/sts/distributed_caching/cxf-service.xml | 6 ------ .../cxf/systest/sts/distributed_caching/cxf-sts-1.xml | 6 ------ .../cxf/systest/sts/distributed_caching/cxf-sts-2.xml | 6 ------ .../cxf/systest/sts/kerberos/cxf-intermediary.xml | 6 ------ .../apache/cxf/systest/sts/kerberos/cxf-service.xml | 6 ------ .../org/apache/cxf/systest/sts/realms/cxf-service.xml | 6 ------ .../apache/cxf/systest/sts/realms/cxf-sts-saml1.xml | 6 ------ .../apache/cxf/systest/sts/realms/cxf-sts-saml2.xml | 6 ------ .../org/apache/cxf/systest/sts/renew/cxf-service.xml | 6 ------ .../org/apache/cxf/systest/sts/renew/cxf-sts-pop.xml | 6 ------ .../org/apache/cxf/systest/sts/renew/cxf-sts.xml | 6 ------ .../org/apache/cxf/systest/sts/renew/stax-cxf-sts.xml | 6 ------ .../cxf/systest/sts/secure_conv/cxf-service.xml | 6 ------ .../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 6 ------ .../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 6 ------ .../org/apache/cxf/systest/sts/soap12/cxf-service.xml | 6 ------ .../cxf/systest/sts/soap12/stax-cxf-service.xml | 6 ------ .../cxf/systest/sts/transformation/cxf-service.xml | 6 ------ .../cxf/systest/sts/usernametoken/cxf-service.xml | 6 ------ .../systest/sts/usernametoken/stax-cxf-service.xml | 6 ------ .../org/apache/cxf/systest/sts/bearer/cxf-service.xml | 6 ------ .../cxf/systest/sts/bearer/cxf-stax-service.xml | 6 ------ .../cxf/systest/sts/delegation/cxf-sts-transport.xml | 6 ------ .../cxf/systest/sts/deployment/cxf-transport.xml | 6 ------ .../cxf/systest/sts/deployment/stax-cxf-transport.xml | 6 ------ .../cxf-intermediary-caching.xml | 6 ------ .../intermediary_transformation/cxf-intermediary.xml | 6 ------ .../sts/intermediary_transformation/cxf-service.xml | 6 ------ .../org/apache/cxf/systest/sts/issuer/cxf-service.xml | 6 ------ .../cxf/systest/sts/issuer/cxf-sts-transport.xml | 6 ------ .../org/apache/cxf/systest/sts/jaas/cxf-service.xml | 6 ------ .../systest/sts/sendervouches/cxf-intermediary.xml | 6 ------ .../cxf/systest/sts/sendervouches/cxf-service.xml | 6 ------ .../sts/sendervouches/cxf-stax-intermediary.xml | 6 ------ .../systest/sts/sendervouches/cxf-stax-service.xml | 6 ------ .../apache/cxf/systest/sts/stsclient/cxf-service.xml | 6 ------ .../apache/cxf/systest/sts/transport/cxf-service.xml | 6 ------ .../cxf/systest/sts/transport/cxf-stax-service.xml | 6 ------ .../cxf/systest/jaxrs/security/jaxrs-https-server.xml | 6 ------ .../cxf/systest/kerberos/wssec/kerberos/server.xml | 11 ----------- .../systest/kerberos/wssec/kerberos/stax-server.xml | 6 ------ .../cxf/systest/kerberos/wssec/spnego/server.xml | 6 ------ .../cxf/systest/kerberos/wssec/spnego/stax-server.xml | 6 ------ .../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 | 6 ------ .../cxf/systest/jaxrs/security/jwt/serverJwsJson.xml | 5 ----- .../cxf/systest/jaxrs/security/oauth2/server.xml | 6 ------ .../cxf/systest/jaxrs/security/saml/secureServer.xml | 6 ------ .../apache/cxf/systest/jaxrs/security/saml/server.xml | 6 ------ .../apache/cxf/systest/jaxrs/security/xml/server.xml | 6 ------ .../cxf/systest/jaxrs/security/xml/stax-server.xml | 6 ------ .../apache/cxf/systest/wssec/examples/saml/server.xml | 6 ------ .../cxf/systest/wssec/examples/saml/stax-server.xml | 6 ------ .../apache/cxf/systest/wssec/examples/ut/server.xml | 6 ------ .../cxf/systest/wssec/examples/ut/stax-server.xml | 6 ------ .../org/apache/cxf/systest/ws/https/server.xml | 6 ------ .../org/apache/cxf/systest/ws/https/stax-server.xml | 6 ------ .../apache/cxf/systest/ws/policy/javafirstserver.xml | 14 -------------- .../org/apache/cxf/systest/ws/policy/server.xml | 6 ------ .../org/apache/cxf/systest/ws/saml/server.xml | 6 ------ .../org/apache/cxf/systest/ws/saml/stax-server.xml | 6 ------ .../apache/cxf/systest/ws/saml/subjectconf/server.xml | 6 ------ .../cxf/systest/ws/saml/subjectconf/stax-server.xml | 6 ------ .../apache/cxf/systest/ws/security/https_config.xml | 10 ---------- .../cxf/systest/ws/security/https_config_client.xml | 10 ---------- .../org/apache/cxf/systest/ws/ut/policy-server.xml | 6 ------ .../org/apache/cxf/systest/ws/ut/server-derived.xml | 6 ------ .../resources/org/apache/cxf/systest/ws/ut/server.xml | 6 ------ .../apache/cxf/systest/ws/ut/stax-policy-server.xml | 6 ------ .../org/apache/cxf/systest/ws/ut/stax-server.xml | 6 ------ .../org/apache/cxf/systest/ws/wssc/server.xml | 14 -------------- .../org/apache/cxf/systest/ws/wssc/unit-server.xml | 6 ------ .../org/apache/cxf/systest/ws/wssec10/server.xml | 6 ------ .../cxf/systest/ws/wssec10/server_restricted.xml | 6 ------ .../ws/wssec10/server_restricted_authorized.xml | 6 ------ .../ws/wssec10/server_restricted_authorized_2.xml | 6 ------ .../org/apache/cxf/systest/ws/wssec10/stax-server.xml | 6 ------ .../cxf/systest/ws/wssec10/stax-server_restricted.xml | 6 ------ .../org/apache/cxf/systest/ws/x509/server.xml | 6 ------ .../org/apache/cxf/systest/ws/x509/stax-server.xml | 6 ------ .../org/apache/cxf/systest/ws/xkms/xkms-server.xml | 6 ------ 107 files changed, 714 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/cdd16477/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 e7d1297..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,16 +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_DES_.*</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/cdd16477/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 1c98199..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,16 +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_DES_.*</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/cdd16477/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 fbfdfb2..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,16 +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_DES_.*</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/cdd16477/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 8984cb0..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,16 +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_DES_.*</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/cdd16477/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 91f3f68..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,16 +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_DES_.*</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/cdd16477/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 0350d25..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,16 +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_DES_.*</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/cdd16477/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 d496c56..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,16 +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_DES_.*</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/cdd16477/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/cdd16477/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/cdd16477/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/cdd16477/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 486b298..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,12 +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_DES_.*</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/cdd16477/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 e41a557..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,12 +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_DES_.*</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/cdd16477/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 9c1d3e0..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,12 +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_DES_.*</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/cdd16477/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 f40c817..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,12 +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_DES_.*</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/cdd16477/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 e9d75d4..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,12 +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_DES_.*</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/cdd16477/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 bace992..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,12 +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_DES_.*</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/cdd16477/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 12e64d7..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,12 +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_DES_.*</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/cdd16477/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 9d5bcc1..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,12 +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_DES_.*</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/cdd16477/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 ce78802..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,12 +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_DES_.*</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/cdd16477/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 72e8e46..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,12 +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_DES_.*</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/cdd16477/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 2503516..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,12 +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_DES_.*</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/cdd16477/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 1117109..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,12 +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_DES_.*</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/cdd16477/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 ff6722d..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,12 +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_DES_.*</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/cdd16477/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 4dfcb7e..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,12 +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_DES_.*</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/cdd16477/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 db98590..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,12 +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_DES_.*</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/cdd16477/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 4ea2fc4..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,12 +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_DES_.*</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/cdd16477/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 afafe4d..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,12 +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_DES_.*</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/cdd16477/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 37dcc65..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,12 +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_DES_.*</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/cdd16477/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 182ddbe..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,12 +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_DES_.*</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/cdd16477/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 07cf21c..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,12 +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_DES_.*</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/cdd16477/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 3a01895..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,12 +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_DES_.*</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/cdd16477/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 1fd543e..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,12 +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_DES_.*</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/cdd16477/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 ac6841c..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,12 +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_DES_.*</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/cdd16477/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 fc32c1d..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,12 +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_DES_.*</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/cdd16477/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 9a1b6b1..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,12 +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_DES_.*</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/cdd16477/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 27e41e4..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,12 +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_DES_.*</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/cdd16477/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 45e4942..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,12 +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_DES_.*</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/cdd16477/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 ac3cee8..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,12 +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_DES_.*</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/cdd16477/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 d8beab1..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,12 +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_DES_.*</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/cdd16477/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 5283967..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,12 +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_DES_.*</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/cdd16477/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 3b884f4..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,12 +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_DES_.*</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/cdd16477/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 21c08f9..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,12 +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_DES_.*</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/cdd16477/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 257f6c7..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,12 +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_DES_.*</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/cdd16477/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 7c4dd9b..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,12 +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_DES_.*</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/cdd16477/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 7ab1151..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,12 +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_DES_.*</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/cdd16477/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 acedc03..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,12 +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_DES_.*</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/cdd16477/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 5a46cd2..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,12 +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_DES_.*</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/cdd16477/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 c7f15c3..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,12 +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_DES_.*</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/cdd16477/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 f1b6a87..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,12 +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_DES_.*</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/cdd16477/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 6f67301..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,12 +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_DES_.*</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/cdd16477/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 7d37c23..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,12 +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_DES_.*</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/cdd16477/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 85836a9..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,12 +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_DES_.*</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/cdd16477/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 6556822..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,12 +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_DES_.*</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/cdd16477/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 98324ec..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,12 +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_DES_.*</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/cdd16477/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 e4dabe0..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,12 +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_DES_.*</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/cdd16477/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 0699a78..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,12 +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_DES_.*</sec:include> - <sec:include>.*_WITH_AES_.*</sec:include> - </sec:cipherSuitesFilter> <sec:clientAuthentication want="true" required="true"/> </httpj:tlsServerParameters> </httpj:engine>