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 2017/03/07 15:26:26 UTC
cxf git commit: Fixing transports system test with Jetty upgrade
Repository: cxf
Updated Branches:
refs/heads/master 41262ee02 -> f17784b09
Fixing transports system test with Jetty upgrade
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f17784b0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f17784b0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f17784b0
Branch: refs/heads/master
Commit: f17784b09d435f35a242b01c0cde1e7eba1fa083
Parents: 41262ee
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Mar 7 15:25:45 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Mar 7 15:26:23 2017 +0000
----------------------------------------------------------------------
.../org/apache/cxf/https/ssl3/sslv3-server.xml | 16 ++++++++++++++++
.../ciphersuites/ciphersuites-explicit-client.xml | 2 +-
.../https/ciphersuites/ciphersuites-server.xml | 5 +++--
3 files changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f17784b0/systests/transports-ssl3/src/test/resources/org/apache/cxf/https/ssl3/sslv3-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/resources/org/apache/cxf/https/ssl3/sslv3-server.xml b/systests/transports-ssl3/src/test/resources/org/apache/cxf/https/ssl3/sslv3-server.xml
index b7c93ff..797f098 100644
--- a/systests/transports-ssl3/src/test/resources/org/apache/cxf/https/ssl3/sslv3-server.xml
+++ b/systests/transports-ssl3/src/test/resources/org/apache/cxf/https/ssl3/sslv3-server.xml
@@ -34,6 +34,10 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:exclude>SSL_RSA_WITH_DES_CBC_SHA</sec:exclude>
+ </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
@@ -56,6 +60,10 @@
<sec:trustManagers>
<sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:exclude>SSL_RSA_WITH_DES_CBC_SHA</sec:exclude>
+ </sec:cipherSuitesFilter>
<sec:clientAuthentication want="true" required="false"/>
</httpj:tlsServerParameters>
</httpj:engine>
@@ -85,6 +93,10 @@
<sec:excludeProtocol>TLSv1.1</sec:excludeProtocol>
<sec:excludeProtocol>TLSv1.2</sec:excludeProtocol>
</sec:excludeProtocols>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:exclude>SSL_RSA_WITH_DES_CBC_SHA</sec:exclude>
+ </sec:cipherSuitesFilter>
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
@@ -111,6 +123,10 @@
<sec:includeProtocol>SSLv3</sec:includeProtocol>
<sec:includeProtocol>SSLv2Hello</sec:includeProtocol>
</sec:includeProtocols>
+ <sec:cipherSuitesFilter>
+ <sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:exclude>SSL_RSA_WITH_DES_CBC_SHA</sec:exclude>
+ </sec:cipherSuitesFilter>
</httpj:tlsServerParameters>
</httpj:engine>
</httpj:engine-factory>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f17784b0/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml
index 6864ce4..71d82ff 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-explicit-client.xml
@@ -30,7 +30,7 @@
<sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
</sec:trustManagers>
<sec:cipherSuites>
- <sec:cipherSuite>TLS_RSA_WITH_AES_256_CBC_SHA</sec:cipherSuite>
+ <sec:cipherSuite>TLS_RSA_WITH_AES_256_CBC_SHA256</sec:cipherSuite>
</sec:cipherSuites>
</http:tlsClientParameters>
</http:conduit>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f17784b0/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
index adbbcb2..610b41d 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-server.xml
@@ -34,6 +34,7 @@
<sec:clientAuthentication want="false" required="false"/>
<sec:cipherSuitesFilter>
<sec:include>.*_WITH_AES_.*</sec:include>
+ <sec:exclude>SSL_RSA_WITH_DES_CBC_SHA</sec:exclude>
</sec:cipherSuitesFilter>
</httpj:tlsServerParameters>
</httpj:engine>
@@ -53,7 +54,6 @@
</jaxws:inInterceptors>
</jaxws:endpoint>
-
<httpj:engine-factory id="rc4-tls-settings">
<httpj:engine port="${testutil.ports.CipherSuitesServer.2}">
<httpj:tlsServerParameters>
@@ -107,7 +107,7 @@
</sec:keyManagers>
<sec:clientAuthentication want="false" required="false"/>
<sec:cipherSuites>
- <sec:cipherSuite>TLS_RSA_WITH_AES_256_CBC_SHA</sec:cipherSuite>
+ <sec:cipherSuite>TLS_RSA_WITH_AES_256_CBC_SHA256</sec:cipherSuite>
</sec:cipherSuites>
</httpj:tlsServerParameters>
</httpj:engine>
@@ -148,4 +148,5 @@
</bean>
</jaxws:inInterceptors>
</jaxws:endpoint>
+
</beans>