This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 804b6a7e196136b43cadbf7a451f49f48a08d931
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 2 18:33:30 2024 +0100
Fix ordering
---
java/org/apache/catalina/security/LocalStrings.properties | 6 +++---
.../apache/tomcat/util/net/openssl/panama/LocalStrings.properties | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/security/LocalStrings.properties
b/java/org/apache/catalina/security/LocalStrings.properties
index e356c44a27..f16560004f 100644
--- a/java/org/apache/catalina/security/LocalStrings.properties
+++ b/java/org/apache/catalina/security/LocalStrings.properties
@@ -13,14 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+SecurityListener.buildDateAgeUnreadable=Unable to read configured
buildDateWarningAgeDays [{0}], using default of [{1}] days.
+SecurityListener.buildDateIsOld=This version of Tomcat was built more than {0}
days ago. You should consider upgrading to the current version.
+SecurityListener.buildDateUnreadable=Server build date [{0}] is unreadable as
an ISO-8601 date.
SecurityListener.checkUmaskFail=Start attempted with umask setting of [{0}].
Running Tomcat without a umask at least as restrictive as [{1}] has been
blocked by the Lifecycle listener org.apache.catalina.security.SecurityListener
(usually configured in CATALINA_BASE/conf/server.xml)
SecurityListener.checkUmaskNone=No umask setting was found in system property
[{0}]. However, it appears Tomcat is running on a platform that supports umask.
The system property is typically set in CATALINA_HOME/bin/catalina.sh. The
Lifecycle listener org.apache.catalina.security.SecurityListener (usually
configured in CATALINA_BASE/conf/server.xml) expects a umask at least as
restrictive as [{1}]
SecurityListener.checkUmaskParseFail=Failed to parse value [{0}] as a valid
umask.
SecurityListener.checkUmaskSkip=Unable to determine umask. It appears Tomcat
is running on Windows so skip the umask check.
SecurityListener.checkUserWarning=Start attempted while running as user [{0}].
Running Tomcat as this user has been blocked by the Lifecycle listener
org.apache.catalina.security.SecurityListener (usually configured in
CATALINA_BASE/conf/server.xml)
-SecurityListener.buildDateAgeUnreadable=Unable to read configured
buildDateWarningAgeDays [{0}], using default of [{1}] days.
-SecurityListener.buildDateUnreadable=Server build date [{0}] is unreadable as
an ISO-8601 date.
-SecurityListener.buildDateIsOld=This version of Tomcat was built more than {0}
days ago. You should consider upgrading to the current version.
SecurityUtil.doAsPrivilege=An exception occurs when running the
PrivilegedExceptionAction block.
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 5b4ef5c6ee..1a2f3d83fa 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
@@ -52,10 +52,10 @@ openssl.errMakeConf=Could not create OpenSSLConf context
[{0}]
openssl.errorAddingCertificate=Error adding certificate to chain: [{0}]
openssl.errorConfiguringLocations=Error configuring CA certificate locations:
[{0}]
openssl.errorLoadingCertificate=Error loading certificate: [{0}]
+openssl.errorLoadingCertificateRevocationListWithError=Error loading
certificate revocation [{0}] with error [{1}]
openssl.errorLoadingCertificateWithError=Error loading certificate [{0}] with
error [{1}]
openssl.errorLoadingPassword=Error loading password file: [{0}]
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
@@ -82,8 +82,6 @@ opensslconf.noCommandName=OpenSSLConf no command name - will
be ignored (command
opensslconf.resultCommand=OpenSSLConf command (name [{0}], value [{1}])
returned [{2}]
opensslconf.unknownCommandType=SSL_CONF command [{0}] type unknown
-sessionContext.nullTicketKeys=Null keys
-
openssllibrary.ciphersFailure=Failed getting cipher list
openssllibrary.currentFIPSMode=Current FIPS mode: [{0}]
openssllibrary.engineError=Error creating engine
@@ -99,3 +97,4 @@ openssllibrary.tooLateForSSLEngine=Cannot setSSLEngine: SSL
has already been ini
openssllibrary.tooLateForSSLRandomSeed=Cannot setSSLRandomSeed: SSL has
already been initialized
openssllibrary.wrongFIPSMode=Unexpected value of FIPSMode option of
AprLifecycleListener: [{0}]
+sessionContext.nullTicketKeys=Null keys
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
