This is an automated email from the ASF dual-hosted git repository.
remm 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 d275d15a19 Avoid APR strings
d275d15a19 is described below
commit d275d15a19e84bc30151be9d0f7c6a718ed9e003
Author: remm <[email protected]>
AuthorDate: Wed Jan 24 21:12:57 2024 +0100
Avoid APR strings
---
.../apache/tomcat/util/net/openssl/panama/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 6 +-----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git
a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
index 4a36782136..4a46900aa2 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
@@ -57,6 +57,7 @@ openssl.errorLoadingPrivateKey=Error loading private key:
[{0}]
openssl.errorLoadingCertificateRevocationListWithError=Error loading
certificate revocation [{0}] with error [{1}]
openssl.errorPrivateKeyCheck=Private key does not match the certificate public
key: [{0}]
openssl.errorSSLCtxInit=Error initializing SSL context
+openssl.invalidSslProtocol=An invalid value [{0}] was provided for the
SSLProtocol attribute
openssl.keyManagerMissing=No key manager found
openssl.makeConf=Creating OpenSSLConf context
openssl.noCACerts=No CA certificates were configured
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index c6e24ee760..1939e465a8 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -55,7 +55,6 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.file.ConfigFileLoader;
import org.apache.tomcat.util.file.ConfigurationSource.Resource;
-import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.Constants;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfig.CertificateVerification;
@@ -77,8 +76,6 @@ import org.apache.tomcat.util.res.StringManager;
public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext {
private static final Log log = LogFactory.getLog(OpenSSLContext.class);
-
- private static final StringManager netSm =
StringManager.getManager(AbstractEndpoint.class);
private static final StringManager sm =
StringManager.getManager(OpenSSLContext.class);
private static final Cleaner cleaner = Cleaner.create();
@@ -216,8 +213,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
} else {
// Should not happen since filtering to build
// enabled protocols removes invalid values.
- throw new Exception(netSm.getString(
- "endpoint.apr.invalidSslProtocol",
enabledProtocol));
+ throw new
Exception(sm.getString("openssl.invalidSslProtocol", enabledProtocol));
}
}
// Set maximum and minimum protocol versions
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
