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 2019/01/14 12:40:30 UTC
[cxf] branch master updated: Updating a few TLS settings
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new bc1a225 Updating a few TLS settings
bc1a225 is described below
commit bc1a22503447649e7991f4b8f3368a90deb42a7d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jan 14 12:40:02 2019 +0000
Updating a few TLS settings
---
.../src/main/java/demo/hw_https/client/ClientNonSpring.java | 2 +-
.../http/netty/client/integration/SSLNettyClientTest.java | 2 +-
.../http/netty/server/integration/SSLNettyServerTest.java | 2 +-
.../systest/sts/stsclient/STSTokenOutInterceptorTest.java | 2 +-
.../cxf/systest/sts/stsclient/STSTokenRetrieverTest.java | 2 +-
.../src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java | 4 ++--
.../apache/cxf/systest/https/clientauth/ClientAuthTest.java | 12 ++++++------
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
index be9e655..ed7eaaf 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
@@ -117,7 +117,7 @@ public final class ClientNonSpring {
private static TrustManager[] getTrustManagers(KeyStore trustStore)
throws NoSuchAlgorithmException, KeyStoreException {
- String alg = KeyManagerFactory.getDefaultAlgorithm();
+ String alg = TrustManagerFactory.getDefaultAlgorithm();
TrustManagerFactory fac = TrustManagerFactory.getInstance(alg);
fac.init(trustStore);
return fac.getTrustManagers();
diff --git a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
index 51e07de..94c6cf4 100644
--- a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
+++ b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
@@ -147,7 +147,7 @@ public class SSLNettyClientTest extends AbstractBusClientServerTestBase {
private static TrustManager[] getTrustManagers(KeyStore trustStore)
throws NoSuchAlgorithmException, KeyStoreException {
- String alg = KeyManagerFactory.getDefaultAlgorithm();
+ String alg = TrustManagerFactory.getDefaultAlgorithm();
TrustManagerFactory fac = TrustManagerFactory.getInstance(alg);
fac.init(trustStore);
return fac.getTrustManagers();
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java
index 41643e8..3306981 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/integration/SSLNettyServerTest.java
@@ -134,7 +134,7 @@ public class SSLNettyServerTest extends AbstractBusClientServerTestBase {
private static TrustManager[] getTrustManagers(KeyStore trustStore)
throws NoSuchAlgorithmException, KeyStoreException {
- String alg = KeyManagerFactory.getDefaultAlgorithm();
+ String alg = TrustManagerFactory.getDefaultAlgorithm();
TrustManagerFactory fac = TrustManagerFactory.getInstance(alg);
fac.init(trustStore);
return fac.getTrustManagers();
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
index 5d7a636..af50306 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java
@@ -284,7 +284,7 @@ public class STSTokenOutInterceptorTest extends AbstractBusClientServerTestBase
KeyStore keyStore = loadClientKeystore();
trustManagerFactory.init(keyStore);
TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
- SSLContext sc = SSLContext.getInstance("SSL");
+ SSLContext sc = SSLContext.getInstance("TLS");
sc.init(null, trustManagers, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
index c9f1eee..530816e 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java
@@ -222,7 +222,7 @@ public class STSTokenRetrieverTest extends AbstractBusClientServerTestBase {
KeyStore keyStore = loadClientKeystore();
trustManagerFactory.init(keyStore);
TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
- SSLContext sc = SSLContext.getInstance("SSL");
+ SSLContext sc = SSLContext.getInstance("TLS");
sc.init(null, trustManagers, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
diff --git a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
index 2c39a2d..6440114 100644
--- a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
+++ b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
@@ -97,7 +97,7 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
trustedCertStore.load(keystore, null);
}
- TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(trustedCertStore);
TrustManager[] trustManagers = tmf.getTrustManagers();
@@ -144,7 +144,7 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
trustedCertStore.load(keystore, null);
}
- TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(trustedCertStore);
TrustManager[] trustManagers = tmf.getTrustManagers();
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
index 21d3ad5..9fd5eb7 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
@@ -291,7 +291,7 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
ts.load(trustStore, "password".toCharArray());
}
- TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(ts);
KeyStore ks = KeyStore.getInstance("JKS");
@@ -300,7 +300,7 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
ks.load(keyStore, "password".toCharArray());
}
- KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, "password".toCharArray());
sslContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), new java.security.SecureRandom());
@@ -441,7 +441,7 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
ts.load(trustStore, "password".toCharArray());
}
- TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(ts);
KeyStore ks = KeyStore.getInstance("JKS");
@@ -450,7 +450,7 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
ks.load(keyStore, "password".toCharArray());
}
- KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, "password".toCharArray());
TLSClientParameters tlsParams = new TLSClientParameters();
@@ -486,7 +486,7 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
ts.load(trustStore, "password".toCharArray());
}
- TrustManagerFactory tmf = TrustManagerFactory.getInstance("PKIX");
+ TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
tmf.init(ts);
KeyStore ks = KeyStore.getInstance("JKS");
@@ -495,7 +495,7 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
ks.load(keyStore, "password".toCharArray());
}
- KeyManagerFactory kmf = KeyManagerFactory.getInstance("PKIX");
+ KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
kmf.init(ks, "password".toCharArray());
SSLContext sslContext = SSLContext.getInstance("TLS");