[camel] branch master updated: Using the correct TLS algorithm in some of the tests

[co...@apache.org]

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/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 2512f9d  Using the correct TLS algorithm in some of the tests
2512f9d is described below

commit 2512f9dc4b52ff6cd65fb1c53068398c6a57aadc
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jan 14 12:55:20 2019 +0000

    Using the correct TLS algorithm in some of the tests
---
 .../org/apache/camel/support/jsse/TrustManagersParametersTest.java    | 3 ++-
 .../java/org/apache/camel/component/http4/HttpsServerTestSupport.java | 4 ++--
 .../test/java/org/apache/camel/component/rest/swagger/HttpsTest.java  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java b/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java
index 83d6b9e..7ca57ac 100644
--- a/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java
+++ b/camel-core/src/test/java/org/apache/camel/support/jsse/TrustManagersParametersTest.java
@@ -21,6 +21,7 @@ import java.security.NoSuchProviderException;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
 import org.apache.camel.CamelContext;
@@ -100,7 +101,7 @@ public class TrustManagersParametersTest extends AbstractJsseParametersTest {
     @Test
     public void testExplicitProvider() throws Exception {
         TrustManagersParameters tmp = this.createMinimalTrustManagersParameters();
-        tmp.setProvider(KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
+        tmp.setProvider(TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
                         .getProvider().getName());
         
         TrustManager[] tms = tmp.createTrustManagers();
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
index 2117d1f..322035e 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
@@ -62,7 +62,7 @@ public abstract class HttpsServerTestSupport extends HttpServerTestSupport {
         KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
         trustStore.load(new FileInputStream(KEYSTORE), PASSWORD.toCharArray());
 
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         trustManagerFactory.init(trustStore);
 
         SSLContext sslcontext = SSLContext.getInstance(SECURE_SOCKET_PROTOCOL);
@@ -70,4 +70,4 @@ public abstract class HttpsServerTestSupport extends HttpServerTestSupport {
 
         return sslcontext;
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
index 744f489..9216e13 100644
--- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
+++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java
@@ -155,7 +155,7 @@ public abstract class HttpsTest extends CamelTestSupport {
     static SSLContextParameters createHttpsParameters(final CamelContext camelContext) throws Exception {
         final TrustManagersParameters trustManagerParameters = new TrustManagersParameters();
         trustManagerParameters.setCamelContext(camelContext);
-        final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("PKIX");
+        final TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
         final HttpsSettings httpsSettings = petstore.getOptions().httpsSettings();
         final KeyStore trustStore = CertificateUtils.getKeyStore(Resource.newResource(httpsSettings.keyStorePath()),
             httpsSettings.keyStoreType(), null, httpsSettings.keyStorePassword());