This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 207de9e50c7aad0f4cdc9e3beab411964592f1ea Author: remm <[email protected]> AuthorDate: Wed Sep 10 21:07:16 2025 +0200 Cleanups --- java/org/apache/tomcat/util/net/SSLHostConfig.java | 4 ++-- .../apache/tomcat/util/net/openssl/ciphers/SignatureAlgorithm.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/org/apache/tomcat/util/net/SSLHostConfig.java b/java/org/apache/tomcat/util/net/SSLHostConfig.java index 73a87d67ff..0e9d787170 100644 --- a/java/org/apache/tomcat/util/net/SSLHostConfig.java +++ b/java/org/apache/tomcat/util/net/SSLHostConfig.java @@ -109,8 +109,6 @@ public class SSLHostConfig implements Serializable { // Values <0 mean use the implementation default private int sessionCacheSize = -1; private int sessionTimeout = 86400; - private String groups = null; - private LinkedHashSet<Group> groupList = null; // JSSE private String keyManagerAlgorithm = KeyManagerFactory.getDefaultAlgorithm(); private boolean revocationEnabled = false; @@ -122,6 +120,8 @@ public class SSLHostConfig implements Serializable { private String truststoreProvider = System.getProperty("javax.net.ssl.trustStoreProvider"); private String truststoreType = System.getProperty("javax.net.ssl.trustStoreType"); private transient KeyStore truststore = null; + private String groups = null; + private LinkedHashSet<Group> groupList = null; // OpenSSL private String certificateRevocationListPath; private String caCertificateFile; diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureAlgorithm.java b/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureAlgorithm.java index 8adde314d7..7b2f94f3f6 100644 --- a/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureAlgorithm.java +++ b/java/org/apache/tomcat/util/net/openssl/ciphers/SignatureAlgorithm.java @@ -36,7 +36,7 @@ public enum SignatureAlgorithm { rsa_pss_rsae_sha384(0x0805), rsa_pss_rsae_sha512(0x0806), - // EdDSA algorithms */ + // EdDSA algorithms ed25519(0x0807), ed448(0x0808), @@ -45,7 +45,7 @@ public enum SignatureAlgorithm { rsa_pss_pss_sha384(0x080a), rsa_pss_pss_sha512(0x080b), - // Legacy algorithms */ + // Legacy algorithms rsa_pkcs1_sha1(0x0201), ecdsa_sha1(0x0203), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
