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
The following commit(s) were added to refs/heads/main by this push:
new 59e9c6d8ab Correct tests for updated default sort order
59e9c6d8ab is described below
commit 59e9c6d8abb01d171ad1a23d46346193b4cbc45b
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jun 12 17:46:23 2026 +0100
Correct tests for updated default sort order
---
.../ciphers/TestOpenSSLCipherConfigurationParserOnly.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
index d3bc8b8d81..9098ec63d3 100644
---
a/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
+++
b/test/org/apache/tomcat/util/net/openssl/ciphers/TestOpenSSLCipherConfigurationParserOnly.java
@@ -41,10 +41,10 @@ public class TestOpenSSLCipherConfigurationParserOnly {
LinkedHashSet<Cipher> result =
OpenSSLCipherConfigurationParser.defaultSort(input);
LinkedHashSet<Cipher> expected = new LinkedHashSet<>();
- expected.add(Cipher.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384);
expected.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384);
- expected.add(Cipher.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384);
+ expected.add(Cipher.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384);
expected.add(Cipher.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384);
+ expected.add(Cipher.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384);
Assert.assertEquals(expected.toString(), result.toString());
}
@@ -70,14 +70,14 @@ public class TestOpenSSLCipherConfigurationParserOnly {
public void testDefaultSort03() throws Exception {
// Reproducing a failure observed on Gump with OpenSSL 1.1.x
- // AES should beat CAMELLIA
+ // AES should beat CAMELLIA but
LinkedHashSet<Cipher> input = new LinkedHashSet<>();
input.add(Cipher.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384);
- input.add(Cipher.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384);
+ input.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_256_CCM);
LinkedHashSet<Cipher> result =
OpenSSLCipherConfigurationParser.defaultSort(input);
LinkedHashSet<Cipher> expected = new LinkedHashSet<>();
- expected.add(Cipher.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384);
+ expected.add(Cipher.TLS_ECDHE_ECDSA_WITH_AES_256_CCM);
expected.add(Cipher.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384);
Assert.assertEquals(expected.toString(), result.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
