This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 f9531729b9 Review "Report a configuration error for PEM certificates
with a ..."
f9531729b9 is described below
commit f9531729b9d2a23cc1ecaa9cba03215b11494f9b
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Nov 3 20:41:15 2026 +0000
Review "Report a configuration error for PEM certificates with a ..."
Better error message
---
java/org/apache/tomcat/util/net/LocalStrings.properties | 1 +
java/org/apache/tomcat/util/net/SSLUtilBase.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/net/LocalStrings.properties
b/java/org/apache/tomcat/util/net/LocalStrings.properties
index 44c9810470..b95a948cc3 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -179,6 +179,7 @@ sslImplementation.cnfe=Unable to create SSLImplementation
for class [{0}]
sslUtilBase.active=The [{0}] that are active are : [{1}]
sslUtilBase.aliasIgnored=FIPS enabled so alias name [{0}] will be ignored. If
there is more than one key in the key store, the key used will depend on the
key store implementation
sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry
+sslUtilBase.fipsNoCertFile=FIPS enabled. Configure the certificate using a key
store.
sslUtilBase.fipsPemNotSupported=FIPS enabled so PEM format certificate files
are not supported. Configure the certificate using a key store rather than the
certificateFile attribute
sslUtilBase.invalidTrustManagerClassName=The trustManagerClassName provided
[{0}] does not implement javax.net.ssl.TrustManager
sslUtilBase.keystore_load_failed=Failed to load keystore type [{0}] with path
[{1}] due to [{2}]
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index b88da6ffa0..f4ea8ba56f 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -356,7 +356,7 @@ public abstract class SSLUtilBase implements SSLUtil {
}
if (ks == null) {
if (certificate.getCertificateFile() == null) {
- throw new
IOException(sm.getString("sslUtilBase.noCertFile"));
+ throw new
IOException(sm.getString("sslUtilBase.fipsNoCertFile"));
}
// Importing PEM format certificates into an in memory key
store
// requires the key manipulation that is avoided above.
Passing a
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
