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
The following commit(s) were added to refs/heads/9.0.x by this push: new 6ebfb5f Add the missing string 6ebfb5f is described below commit 6ebfb5faa9f1fe15668aaf7a65fb398a56109383 Author: remm <r...@apache.org> AuthorDate: Tue Sep 8 12:53:23 2020 +0200 Add the missing string --- 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 e2a16b9..efd962b 100644 --- a/java/org/apache/tomcat/util/net/LocalStrings.properties +++ b/java/org/apache/tomcat/util/net/LocalStrings.properties @@ -164,6 +164,7 @@ sslImplementation.cnfe=Unable to create SSLImplementation for class [{0}] sslUtilBase.active=The [{0}] that are active are : [{1}] sslUtilBase.alias_no_key_entry=Alias name [{0}] does not identify a key entry +sslUtilBase.aliasIgnored=Alias name [{0}] will be ignored when using FIPS mode 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}] sslUtilBase.noCertFile=SSLHostConfig attribute certificateFile must be defined when using an SSL connector diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java index 143b2d2..09e3aa7 100644 --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java @@ -300,7 +300,7 @@ public abstract class SSLUtilBase implements SSLUtil { if (kmf.getProvider().getInfo().indexOf("FIPS") != -1) { // FIPS doesn't like ANY wrapping nor key manipulation. if (keyAlias != null) { - log.warn(sm.getString("sslUtilBase.alias_ignored", keyAlias)); + log.warn(sm.getString("sslUtilBase.aliasIgnored", keyAlias)); } kmf.init(ksUsed, keyPassArray); return kmf.getKeyManagers(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org