This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 31b961f Updating BouncyCastle to 1.65
31b961f is described below
commit 31b961f8ff71c6e50d81dbb4c359fbced94a65f1
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Tue Apr 7 08:20:25 2020 +0100
Updating BouncyCastle to 1.65
(cherry picked from commit 3f3dc69a8831a968a60a183cdc06a9a1a3ae5ea0)
---
parent/pom.xml | 2 +-
.../systest/https/clientauth/ClientAuthTest.java | 60 ----------------------
2 files changed, 1 insertion(+), 61 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5c8e745..c0024e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -87,7 +87,7 @@
<cxf.aspectj.version>1.9.1</cxf.aspectj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.5.2</cxf.atmosphere.version>
- <cxf.bcprov.version>1.64</cxf.bcprov.version>
+ <cxf.bcprov.version>1.65</cxf.bcprov.version>
<cxf.brave.reporter.version>2.12.1</cxf.brave.reporter.version>
<cxf.brave.version>5.10.1</cxf.brave.version>
<cxf.brave.zipkin.version>2.19.3</cxf.brave.zipkin.version>
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 2fa82a5..6bb653a 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
@@ -22,7 +22,6 @@ package org.apache.cxf.systest.https.clientauth;
import java.io.InputStream;
import java.net.URL;
import java.security.KeyStore;
-import java.security.Security;
import java.util.Arrays;
import java.util.Collection;
@@ -43,17 +42,13 @@ import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.helpers.JavaUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.https.InsecureTrustManager;
import org.apache.hello_world.Greeter;
import org.apache.hello_world.services.SOAPService;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jsse.provider.BouncyCastleJsseProvider;
import org.junit.AfterClass;
-import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
@@ -473,61 +468,6 @@ public class ClientAuthTest extends
AbstractBusClientServerTestBase {
((java.io.Closeable)port).close();
}
- // See CXF-7782
- @org.junit.Test
- public void testBouncyCastleProvider() throws Exception {
- // TODO There seems to be a bug with BC 1.60 + JDK 11
- Assume.assumeFalse(JavaUtils.isJava11Compatible());
- try {
- Security.addProvider(new BouncyCastleProvider());
- Security.addProvider(new BouncyCastleJsseProvider());
- URL url = SOAPService.WSDL_LOCATION;
- SOAPService service = new SOAPService(url, SOAPService.SERVICE);
- assertNotNull("Service is null", service);
-
- // Set up (shared) KeyManagers/TrustManagers
- TrustManager[] trustManagers =
InsecureTrustManager.getNoOpX509TrustManagers();
-
- KeyManagerFactory kmf =
KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-
- try (InputStream inputStream =
ClassLoaderUtils.getResourceAsStream("keymanagers.jks", this.getClass())) {
- KeyStore keyStore = KeyStore.getInstance("JKS");
- keyStore.load(inputStream, "password".toCharArray());
-
- kmf.init(keyStore, "password".toCharArray());
- }
- KeyManager[] keyManagers = kmf.getKeyManagers();
-
- // First call to PORT using Morpit
- TLSClientParameters tlsParams = new TLSClientParameters();
- tlsParams.setJsseProvider(new
BouncyCastleJsseProvider().getName());
- tlsParams.setKeyManagers(keyManagers);
- tlsParams.setCertAlias("morpit");
- tlsParams.setTrustManagers(trustManagers);
- tlsParams.setDisableCNCheck(true);
-
- Greeter port = service.getHttpsPort();
- assertNotNull("Port is null", port);
-
- updateAddressPort(port, PORT);
-
- // Enable Async
- if (async) {
-
((BindingProvider)port).getRequestContext().put("use.async.http.conduit", true);
- }
-
- Client client = ClientProxy.getClient(port);
- HTTPConduit http = (HTTPConduit) client.getConduit();
- http.setTlsClientParameters(tlsParams);
-
- assertEquals(port.greetMe("Kitty"), "Hello Kitty");
- ((java.io.Closeable)port).close();
- } finally {
- Security.removeProvider(new BouncyCastleJsseProvider().getName());
- Security.removeProvider(new BouncyCastleProvider().getName());
- }
- }
-
// Server directly trusts the client cert
@org.junit.Test
public void testDirectTrustUsingKeyManagers() throws Exception {
