This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 4fecf7ce9c Fix TLS based test when running with Java 7, APR & OpenSSl
3+
4fecf7ce9c is described below
commit 4fecf7ce9cecd658d1ac53f740cb3dac83f1c1a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Apr 19 18:45:08 2023 +0100
Fix TLS based test when running with Java 7, APR & OpenSSl 3+
Based on similar fix in TestWebSocketFrameClientSSL
---
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
index eb44ac6aed..58bbacf4db 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
@@ -58,6 +58,9 @@ public class TestWsWebSocketContainerSSL extends
WebSocketBaseTest {
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
clientEndpointConfig.getUserProperties().put(org.apache.tomcat.websocket.Constants.SSL_TRUSTSTORE_PROPERTY,
TesterSupport.CA_JKS);
+ // Java 7 doesn't default to TLSv1.2 but the tests do
+
clientEndpointConfig.getUserProperties().put(org.apache.tomcat.websocket.Constants.SSL_PROTOCOLS_PROPERTY,
+ TesterSupport.isTlsv13Available() ? "TLSv1.3" : "TLSv1.2");
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
new URI("wss://localhost" + ":" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
CountDownLatch latch = new CountDownLatch(1);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
