From 8920069726e94e4f354bfeea630dfe60c2a9be0d Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Sat, 26 Jul 2025 16:37:57 -0500 Subject: [PATCH 1/2] Java 8u261 added support for TLS1.3, avoid assuming otherwise Signed-off-by: Mitch Gaffigan --- server/test/com/mirth/connect/util/MirthSSLUtilTest.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/test/com/mirth/connect/util/MirthSSLUtilTest.java b/server/test/com/mirth/connect/util/MirthSSLUtilTest.java index 673a4fd84a..bc14150a6a 100644 --- a/server/test/com/mirth/connect/util/MirthSSLUtilTest.java +++ b/server/test/com/mirth/connect/util/MirthSSLUtilTest.java @@ -33,9 +33,6 @@ public void testEnabledProtocols() throws Exception { if (getJavaVersion() >= 11) { assertTrue(ArrayUtils.contains(enabledClientProtocols, "TLSv1.3")); assertTrue(ArrayUtils.contains(enabledServerProtocols, "TLSv1.3")); - } else { - assertFalse(ArrayUtils.contains(enabledClientProtocols, "TLSv1.3")); - assertFalse(ArrayUtils.contains(enabledServerProtocols, "TLSv1.3")); } } @@ -50,8 +47,6 @@ public void testEnabledCipherSuites() throws Exception { // TLS_AES_256_GCM_SHA384 supported in Java 11+ if (getJavaVersion() >= 11) { assertTrue(ArrayUtils.contains(enabledClientCipherSuites, "TLS_AES_256_GCM_SHA384")); - } else { - assertFalse(ArrayUtils.contains(enabledClientCipherSuites, "TLS_AES_256_GCM_SHA384")); } } From ca21f1e101b2c7f4f60c252c281e4aff7a313a07 Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Tue, 29 Jul 2025 10:41:47 -0500 Subject: [PATCH 2/2] Remove version check since all supported java versions support tls1.3 Signed-off-by: Mitch Gaffigan --- .../com/mirth/connect/util/MirthSSLUtilTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/server/test/com/mirth/connect/util/MirthSSLUtilTest.java b/server/test/com/mirth/connect/util/MirthSSLUtilTest.java index bc14150a6a..c6113e0bde 100644 --- a/server/test/com/mirth/connect/util/MirthSSLUtilTest.java +++ b/server/test/com/mirth/connect/util/MirthSSLUtilTest.java @@ -29,11 +29,9 @@ public void testEnabledProtocols() throws Exception { String[] enabledClientProtocols = MirthSSLUtil.getEnabledHttpsProtocols(defaultClientProtocols); String[] enabledServerProtocols = MirthSSLUtil.getEnabledHttpsProtocols(defaultServerProtocols); - // TLSv1.3 supported in Java 11+ - if (getJavaVersion() >= 11) { - assertTrue(ArrayUtils.contains(enabledClientProtocols, "TLSv1.3")); - assertTrue(ArrayUtils.contains(enabledServerProtocols, "TLSv1.3")); - } + // TLSv1.3 supported in Java 8u261+ + assertTrue(ArrayUtils.contains(enabledClientProtocols, "TLSv1.3")); + assertTrue(ArrayUtils.contains(enabledServerProtocols, "TLSv1.3")); } @Test @@ -44,10 +42,8 @@ public void testEnabledCipherSuites() throws Exception { String[] enabledClientCipherSuites = MirthSSLUtil.getEnabledHttpsCipherSuites(defaultClientCipherSuites); - // TLS_AES_256_GCM_SHA384 supported in Java 11+ - if (getJavaVersion() >= 11) { - assertTrue(ArrayUtils.contains(enabledClientCipherSuites, "TLS_AES_256_GCM_SHA384")); - } + // TLS_AES_256_GCM_SHA384 supported in Java 8u261+ + assertTrue(ArrayUtils.contains(enabledClientCipherSuites, "TLS_AES_256_GCM_SHA384")); } private int getJavaVersion() {