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 eda176857e Fix test failures with OpenSSL 3.1.x
eda176857e is described below
commit eda176857e8f735f0acdbe9ae4dc2138998d0059
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Dec 5 14:59:59 2022 +0000
Fix test failures with OpenSSL 3.1.x
The move of CCM8 ciphers from HIGH to medium has been deferred to 3.2.x.
---
.../ciphers/TestOpenSSLCipherConfigurationParser.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 dc8b007a63..5f301b5cae 100644
---
a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
+++
b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParser.java
@@ -62,8 +62,8 @@ public class TestOpenSSLCipherConfigurationParser {
@Test
public void testHIGH() throws Exception {
- if (TesterOpenSSL.VERSION < 30100) {
- // OpenSSL 3.1.x moved the CCM8 ciphers from high to medium
+ if (TesterOpenSSL.VERSION < 30200) {
+ // OpenSSL 3.2.x moved the CCM8 ciphers from high to medium
testSpecification("HIGH:!AESCCM8");
} else {
testSpecification("HIGH");
@@ -73,8 +73,8 @@ public class TestOpenSSLCipherConfigurationParser {
@Test
public void testMEDIUM() throws Exception {
- if (TesterOpenSSL.VERSION < 30100) {
- // OpenSSL 3.1.x moved the CCM8 ciphers from high to medium
+ if (TesterOpenSSL.VERSION < 30200) {
+ // OpenSSL 3.2.x moved the CCM8 ciphers from high to medium
testSpecification("MEDIUM:AESCCM8");
} else {
testSpecification("MEDIUM");
@@ -533,8 +533,8 @@ public class TestOpenSSLCipherConfigurationParser {
// Tomcat 8 default as of 2014-08-04
// This gets an A- from https://www.ssllabs.com/ssltest with no FS for
// a number of the reference browsers
- if (TesterOpenSSL.VERSION < 30100) {
- // OpenSSL 3.1.x moved the CCM8 ciphers from high to medium
+ if (TesterOpenSSL.VERSION < 30200) {
+ // OpenSSL 3.2.x moved the CCM8 ciphers from high to medium
testSpecification("HIGH:!AESCCM8:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5");
} else {
testSpecification("HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
