[tomcat] branch 8.5.x updated: Add the missing string

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 2f64f96  Add the missing string
2f64f96 is described below

commit 2f64f965b274a87bb4c27ad84acb2f1936532308
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 70cad95..cf9927e 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings.properties
@@ -147,6 +147,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 7433ffe..1c2fefe 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -299,7 +299,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