This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new fc193e7f56 Apply standard code formatting
fc193e7f56 is described below
commit fc193e7f56e5b63e4ebe749ee3e17eb081a46095
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Mar 18 08:36:32 2026 +0000
Apply standard code formatting
(to minimise differences between versions)
---
java/org/apache/tomcat/util/net/openssl/ciphers/Group.java | 5 +++--
.../net/openssl/ciphers/OpenSSLCipherConfigurationParser.java | 8 +++-----
.../apache/tomcat/util/net/openssl/ciphers/SignatureScheme.java | 5 +++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/Group.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/Group.java
index 05fd55a769..2fe0abde19 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/Group.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/Group.java
@@ -21,8 +21,9 @@ import java.util.Map;
/**
* All the supported named groups for TLS 1.3.
- * @see <a
href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8";
>The supported groups
- * registry</a>
+ *
+ * @see <a
href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-8";
>The supported
+ * groups registry</a>
*/
public enum Group {
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)));
diff --git
a/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureScheme.java
b/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureScheme.java
index 5bad9e8ffd..129410496c 100644
--- a/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureScheme.java
+++ b/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureScheme.java
@@ -21,8 +21,9 @@ import java.util.Map;
/**
* All the signature schemes for TLS 1.3.
- * @see <a
href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-signaturescheme";
>The signature schemes
- * registry</a>
+ *
+ * @see <a
href="https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-signaturescheme";
>The
+ * signature schemes registry</a>
*/
public enum SignatureScheme {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
