This is an automated email from the ASF dual-hosted git repository.
markt 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 3ee20f61a7 Apply standard code formatting
3ee20f61a7 is described below
commit 3ee20f61a77ecea21d142b6e55108ecb1f9233e1
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Mar 18 08:35:48 2026 +0000
Apply standard code formatting
(to minimise differences between versions)
---
.../net/openssl/ciphers/OpenSSLCipherConfigurationParser.java | 8 +++-----
1 file changed, 3 insertions(+), 5 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 f8e1042745..ff3dfd385b 100644
---
a/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
+++
b/java/org/apache/tomcat/util/net/openssl/ciphers/OpenSSLCipherConfigurationParser.java
@@ -493,9 +493,8 @@ public class OpenSSLCipherConfigurationParser {
new HashSet<>(Arrays.asList(Encryption.CAMELLIA128,
Encryption.CAMELLIA256))));
addListAlias(CAMELLIA128, filterByEncryption(allCiphers,
Collections.singleton(Encryption.CAMELLIA128)));
addListAlias(CAMELLIA256, filterByEncryption(allCiphers,
Collections.singleton(Encryption.CAMELLIA256)));
- addListAlias(CBC, filterByEncryption(allCiphers,
- new HashSet<>(Arrays.asList(Encryption.AES128,
Encryption.AES256, Encryption.CAMELLIA128,
- Encryption.CAMELLIA256))));
+ addListAlias(CBC, filterByEncryption(allCiphers, new HashSet<>(
+ Arrays.asList(Encryption.AES128, Encryption.AES256,
Encryption.CAMELLIA128, Encryption.CAMELLIA256))));
addListAlias(CHACHA20, filterByEncryption(allCiphers,
Collections.singleton(Encryption.CHACHA20POLY1305)));
addListAlias(TRIPLE_DES, filterByEncryption(allCiphers,
Collections.singleton(Encryption.TRIPLE_DES)));
addListAlias(DES, filterByEncryption(allCiphers,
Collections.singleton(Encryption.DES)));
@@ -528,8 +527,7 @@ public class OpenSSLCipherConfigurationParser {
addListAlias(kSRP, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.SRP)));
addListAlias(SRP, filterByKeyExchange(allCiphers,
Collections.singleton(KeyExchange.SRP)));
initialized = true;
- addListAlias(DEFAULT, parse(
-
"ALL:!eNULL:!aNULL:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES:!ARIA"));
+ addListAlias(DEFAULT,
parse("ALL:!eNULL:!aNULL:!DES:!RC2:!RC4:!DSS:!SEED:!IDEA:!CAMELLIA:!AESCCM:!3DES:!ARIA"));
// COMPLEMENTOFDEFAULT is also not exactly as defined by the docs
LinkedHashSet<Cipher> complementOfDefault =
filterByKeyExchange(all, new
HashSet<>(Arrays.asList(KeyExchange.EDH, KeyExchange.EECDH)));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
