This is an automated email from the ASF dual-hosted git repository. markt-asf pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit acc5058cc23142b5eb59e92df3a892eec469d4fb Author: Mark Thomas <[email protected]> AuthorDate: Sun May 24 15:03:33 2026 +0100 Remove more cipher classes not listed in OpenSSL 4.0 documentation --- .../TestOpenSSLCipherConfigurationParser.java | 64 +--------------------- .../util/net/openssl/ciphers/TesterOpenSSL.java | 1 + 2 files changed, 3 insertions(+), 62 deletions(-) diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java index 3e75008761..65c6b41385 100644 --- a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java +++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java @@ -356,12 +356,6 @@ public class TestOpenSSLCipherConfigurationParser { } - @Test - public void testaGOST94() throws Exception { - testSpecification("aGOST94"); - } - - @Test public void testkGOST() throws Exception { testSpecification("kGOST"); @@ -472,8 +466,8 @@ public class TestOpenSSLCipherConfigurationParser { @Test public void testSpecification03() throws Exception { // Reported as failing during 8.0.11 release vote by Ognjen Blagojevic - // EDH was introduced in 1.0.0 - testSpecification("EECDH+aRSA+SHA384:EECDH:EDH+aRSA:RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS"); + // EDH was introduced in 1.0.0 (s/\!EXP//) + testSpecification("EECDH+aRSA+SHA384:EECDH:EDH+aRSA:RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!PSK:!SRP:!DSS"); } @@ -497,60 +491,6 @@ public class TestOpenSSLCipherConfigurationParser { } - @Test - public void testSpecificationIsEmptySSLv2() throws Exception { - testSpecificationIsEmpty("SSLv2"); - } - - - @Test - public void testSpecificationIsEmptyEXPORT() throws Exception { - testSpecificationIsEmpty("EXPORT"); - } - - - @Test - public void testSpecificationIsEmptyEXPORT40() throws Exception { - testSpecificationIsEmpty("EXPORT40"); - } - - - @Test - public void testSpecificationIsEmptyEXPORT56() throws Exception { - testSpecificationIsEmpty("EXPORT56"); - } - - - @Test - public void testSpecificationIsEmptyKRB5() throws Exception { - testSpecificationIsEmpty("KRB5"); - } - - - @Test - public void testSpecificationIsEmptykFZA() throws Exception { - testSpecificationIsEmpty("kFZA"); - } - - - @Test - public void testSpecificationIsEmptyaFZA() throws Exception { - testSpecificationIsEmpty("aFZA"); - } - - - @Test - public void testSpecificationIsEmptyeFZA() throws Exception { - testSpecificationIsEmpty("eFZA"); - } - - - @Test - public void testSpecificationIsEmptyFZA() throws Exception { - testSpecificationIsEmpty("FZA"); - } - - private void testSpecificationIsEmpty(String specification) throws Exception { String openSSLCipherList = TesterOpenSSL.getOpenSSLCiphersAsExpression(specification); Assert.assertEquals("Specification [" + specification + "] returned [" + openSSLCipherList + diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java index 455c9b7611..337009e776 100644 --- a/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java +++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TesterOpenSSL.java @@ -382,6 +382,7 @@ public class TesterOpenSSL { String errorText = stderr.getText(); if (errorText.length() > 0) { + System.err.println(cmd); System.err.println(errorText); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
