This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 23fe379261 Sorts are not in-place sorts
23fe379261 is described below
commit 23fe379261830c803d8db7992b93cc361e793d15
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Jun 12 17:02:44 2026 +0100
Sorts are not in-place sorts
---
.../util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
index fbbbfd86e4..70f846e124 100644
---
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
+++
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
@@ -511,7 +511,7 @@ public class OpenSSLCipherConfigurationParser {
complementOfDefault.addAll(aliases.get(CAMELLIA));
complementOfDefault.addAll(aliases.get(AESCCM));
complementOfDefault.addAll(aliases.get(ARIA));
- defaultSort(complementOfDefault);
+ complementOfDefault = defaultSort(complementOfDefault);
addListAlias(COMPLEMENTOFDEFAULT, complementOfDefault);
initialized = true;
@@ -736,7 +736,7 @@ public class OpenSSLCipherConfigurationParser {
moveToEnd(ciphers, alias);
}
} else if ("@STRENGTH".equals(element)) {
- strengthSort(ciphers);
+ ciphers = strengthSort(ciphers);
} else if (aliases.containsKey(element)) {
add(ciphers, element);
} else if (element.contains(AND)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
