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

remm 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 d392bb0361 Port cleanups
d392bb0361 is described below

commit d392bb036123cb03b7e5eb770011f04220eba026
Author: remm <r...@apache.org>
AuthorDate: Tue Dec 19 14:05:43 2023 +0100

    Port cleanups
---
 .../util/net/openssl/panama/OpenSSLContext.java    | 158 +++++++++++----------
 .../util/net/openssl/panama/OpenSSLEngine.java     |  35 +----
 .../net/openssl/panama/LocalStrings.properties     |  10 +-
 3 files changed, 93 insertions(+), 110 deletions(-)

diff --git 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 12da6c00c7..7160acef7c 100644
--- 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.SegmentAllocator;
 import java.lang.foreign.SymbolLookup;
 import java.lang.foreign.ValueLayout;
 import java.lang.ref.Cleaner;
@@ -184,26 +183,17 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
             // Create OpenSSLConfCmd context if used
             OpenSSLConf openSslConf = sslHostConfig.getOpenSslConf();
             if (openSslConf != null) {
-                try {
-                    if (log.isDebugEnabled()) {
-                        log.debug(sm.getString("openssl.makeConf"));
-                    }
-                    confCtx = SSL_CONF_CTX_new();
-                    long errCode = ERR_get_error();
-                    if (errCode != 0) {
-                        try (var localArena = Arena.ofConfined()) {
-                            var buf = 
localArena.allocate(ValueLayout.JAVA_BYTE, 128);
-                            ERR_error_string(errCode, buf);
-                            
log.error(sm.getString("openssl.errorLoadingCertificate", buf.getString(0)));
-                        }
-                    }
-                    SSL_CONF_CTX_set_flags(confCtx, SSL_CONF_FLAG_FILE() |
-                            SSL_CONF_FLAG_SERVER() |
-                            SSL_CONF_FLAG_CERTIFICATE() |
-                            SSL_CONF_FLAG_SHOW_ERRORS());
-                } catch (Exception e) {
-                    throw new 
SSLException(sm.getString("openssl.errMakeConf"), e);
+                if (log.isDebugEnabled()) {
+                    log.debug(sm.getString("openssl.makeConf"));
+                }
+                confCtx = SSL_CONF_CTX_new();
+                if (MemorySegment.NULL.equals(confCtx)) {
+                    throw new SSLException(sm.getString("openssl.errMakeConf", 
getLastError()));
                 }
+                SSL_CONF_CTX_set_flags(confCtx, SSL_CONF_FLAG_FILE() |
+                        SSL_CONF_FLAG_SERVER() |
+                        SSL_CONF_FLAG_CERTIFICATE() |
+                        SSL_CONF_FLAG_SHOW_ERRORS());
             }
 
             // SSL protocol
@@ -368,11 +358,9 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                 } else {
                     int code = SSL_CONF_cmd_value_type(state.confCtx, 
localArena.allocateFrom(name));
                     rc = 1;
-                    long errCode = ERR_get_error();
-                    if (errCode != 0) {
-                        var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 
128);
-                        ERR_error_string(errCode, buf);
-                        log.error(sm.getString("opensslconf.checkFailed", 
buf.getString(0)));
+                    String errorMessage = getLastError();
+                    if (errorMessage != null) {
+                        log.error(sm.getString("opensslconf.checkFailed", 
errorMessage));
                         rc = 0;
                     }
                     if (code == SSL_CONF_TYPE_UNKNOWN()) {
@@ -444,11 +432,9 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                 } else {
                     rc = SSL_CONF_cmd(state.confCtx, 
localArena.allocateFrom(name),
                             localArena.allocateFrom(value));
-                    long errCode = ERR_get_error();
-                    if (rc <= 0 || errCode != 0) {
-                        var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 
128);
-                        ERR_error_string(errCode, buf);
-                        log.error(sm.getString("opensslconf.commandError", 
name, value, buf.getString(0)));
+                    String errorMessage = getLastError();
+                    if (rc <= 0 || errorMessage != null) {
+                        log.error(sm.getString("opensslconf.commandError", 
name, value, errorMessage));
                         rc = 0;
                     }
                 }
@@ -582,9 +568,9 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                     var rawCACertificatePointer = 
localArena.allocateFrom(ValueLayout.ADDRESS, rawCACertificate);
                     var x509CACert = d2i_X509(MemorySegment.NULL, 
rawCACertificatePointer, rawCACertificate.byteSize());
                     if (MemorySegment.NULL.equals(x509CACert)) {
-                        logLastError(localArena, 
"openssl.errorLoadingCertificate");
+                        logLastError("openssl.errorLoadingCertificate");
                     } else if (SSL_CTX_add_client_CA(state.sslCtx, x509CACert) 
<= 0) {
-                        logLastError(localArena, 
"openssl.errorAddingCertificate");
+                        logLastError("openssl.errorAddingCertificate");
                     } else if (log.isDebugEnabled()) {
                         log.debug(sm.getString("openssl.addedClientCaCert", 
caCert.toString()));
                     }
@@ -602,7 +588,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                         && SSL_CTX_load_verify_locations(state.sslCtx,
                                 caCertificateFileNative == null ? 
MemorySegment.NULL : caCertificateFileNative,
                                         caCertificatePathNative == null ? 
MemorySegment.NULL : caCertificatePathNative) <= 0) {
-                    logLastError(localArena, 
"openssl.errorConfiguringLocations");
+                    logLastError("openssl.errorConfiguringLocations");
                 } else {
                     var caCerts = SSL_CTX_get_client_CA_list(state.sslCtx);
                     if (MemorySegment.NULL.equals(caCerts)) {
@@ -974,7 +960,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
             MemorySegment certificateBIO = BIO_new(BIO_s_mem());
             try {
                 if (BIO_write(certificateBIO, certificateFileBytesNative, 
certificateFileBytes.length) <= 0) {
-                    log.error(sm.getString("openssl.errorLoadingCertificate", 
"[0]:" + certificate.getCertificateFile()));
+                    
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                            certificate.getCertificateFile(), getLastError()));
                     return false;
                 }
                 MemorySegment cert = MemorySegment.NULL;
@@ -983,7 +970,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                     // Load pkcs12
                     MemorySegment p12 = d2i_PKCS12_bio(certificateBIO, 
MemorySegment.NULL);
                     if (MemorySegment.NULL.equals(p12)) {
-                        
log.error(sm.getString("openssl.errorLoadingCertificate", "[1]:" + 
certificate.getCertificateFile()));
+                        
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                certificate.getCertificateFile(), 
getLastError()));
                         return false;
                     }
                     MemorySegment passwordAddress = MemorySegment.NULL;
@@ -994,14 +982,16 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                     }
                     if (PKCS12_verify_mac(p12, passwordAddress, 
passwordLength) <= 0) {
                         // Bad password
-                        
log.error(sm.getString("openssl.errorLoadingCertificate", "[2]:" + 
certificate.getCertificateFile()));
+                        
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                certificate.getCertificateFile(), 
getLastError()));
                         PKCS12_free(p12);
                         return false;
                     }
                     MemorySegment certPointer = 
localArena.allocate(ValueLayout.ADDRESS);
                     MemorySegment keyPointer = 
localArena.allocate(ValueLayout.ADDRESS);
                     if (PKCS12_parse(p12, passwordAddress, keyPointer, 
certPointer, MemorySegment.NULL) <= 0) {
-                        
log.error(sm.getString("openssl.errorLoadingCertificate", "[3]:" + 
certificate.getCertificateFile()));
+                        
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                certificate.getCertificateFile(), 
getLastError()));
                         PKCS12_free(p12);
                         return false;
                     }
@@ -1023,7 +1013,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                     MemorySegment keyBIO = BIO_new(BIO_s_mem());
                     try {
                         if (BIO_write(keyBIO, certificateKeyFileBytesNative, 
certificateKeyFileBytes.length) <= 0) {
-                            
log.error(sm.getString("openssl.errorLoadingCertificate", "[0]:" + 
certificateKeyFileName));
+                            
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                    certificateKeyFileName, getLastError()));
                             return false;
                         }
                         key = MemorySegment.NULL;
@@ -1051,7 +1042,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                         }
                     }
                     if (MemorySegment.NULL.equals(key)) {
-                        
log.error(sm.getString("openssl.errorLoadingCertificate", "[1]:" + 
certificateKeyFileName));
+                        
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                certificateKeyFileName, getLastError()));
                         return false;
                     }
                     // Load certificate
@@ -1079,20 +1071,21 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                         cert = d2i_X509_bio(certificateBIO, 
MemorySegment.NULL);
                     }
                     if (MemorySegment.NULL.equals(cert)) {
-                        
log.error(sm.getString("openssl.errorLoadingCertificate", 
certificate.getCertificateFile()));
+                        
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                certificate.getCertificateFile(), 
getLastError()));
                         return false;
                     }
                 }
                 if (SSL_CTX_use_certificate(state.sslCtx, cert) <= 0) {
-                    logLastError(localArena, 
"openssl.errorLoadingCertificate");
+                    logLastError("openssl.errorLoadingCertificate");
                     return false;
                 }
                 if (SSL_CTX_use_PrivateKey(state.sslCtx, key) <= 0) {
-                    logLastError(localArena, "openssl.errorLoadingPrivateKey");
+                    logLastError("openssl.errorLoadingPrivateKey");
                     return false;
                 }
                 if (SSL_CTX_check_private_key(state.sslCtx) <= 0) {
-                    logLastError(localArena, "openssl.errorPrivateKeyCheck");
+                    logLastError("openssl.errorPrivateKeyCheck");
                     return false;
                 }
                 // Try to read DH parameters from the (first) 
SSLCertificateFile
@@ -1163,14 +1156,16 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                     MemorySegment certificateChainBIO = BIO_new(BIO_s_mem());
                     try {
                         if (BIO_write(certificateChainBIO, 
certificateChainBytesNative, certificateChainBytes.length) <= 0) {
-                            
log.error(sm.getString("openssl.errorLoadingCertificate", "[0]:" + 
certificate.getCertificateChainFile()));
+                            
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                    certificate.getCertificateChainFile(), 
getLastError()));
                             return false;
                         }
                         MemorySegment certChainEntry =
                                 PEM_read_bio_X509_AUX(certificateChainBIO, 
MemorySegment.NULL, MemorySegment.NULL, MemorySegment.NULL);
                         while (!MemorySegment.NULL.equals(certChainEntry)) {
                             if (SSL_CTX_add0_chain_cert(state.sslCtx, 
certChainEntry) <= 0) {
-                                
log.error(sm.getString("openssl.errorLoadingCertificate", "[1]:" + 
certificate.getCertificateChainFile()));
+                                
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                        certificate.getCertificateChainFile(), 
getLastError()));
                             }
                             certChainEntry =
                                     PEM_read_bio_X509_AUX(certificateChainBIO, 
MemorySegment.NULL, MemorySegment.NULL, MemorySegment.NULL);
@@ -1179,7 +1174,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                         if ((ERR_peek_last_error() & ERR_REASON_MASK()) == 
PEM_R_NO_START_LINE()) {
                             ERR_clear_error();
                         } else {
-                            
log.error(sm.getString("openssl.errorLoadingCertificate", "[2]:" + 
certificate.getCertificateChainFile()));
+                            
log.error(sm.getString("openssl.errorLoadingCertificateWithError",
+                                    certificate.getCertificateChainFile(), 
getLastError()));
                         }
                     } finally {
                         BIO_free(certificateChainBIO);
@@ -1198,7 +1194,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                             
localArena.allocateFrom(SSLHostConfig.adjustRelativePath(sslHostConfig.getCertificateRevocationListFile()));
                     if (X509_LOOKUP_load_file(x509Lookup, 
certificateRevocationListFileNative,
                             X509_FILETYPE_PEM()) <= 0) {
-                        
log.error(sm.getString("openssl.errorLoadingCertificateRevocationList", 
sslHostConfig.getCertificateRevocationListFile()));
+                        
log.error(sm.getString("openssl.errorLoadingCertificateRevocationListWithError",
+                                
sslHostConfig.getCertificateRevocationListFile(), getLastError()));
                     }
                 }
                 if (sslHostConfig.getCertificateRevocationListPath() != null) {
@@ -1207,7 +1204,8 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                             
localArena.allocateFrom(SSLHostConfig.adjustRelativePath(sslHostConfig.getCertificateRevocationListPath()));
                     if (X509_LOOKUP_add_dir(x509Lookup, 
certificateRevocationListPathNative,
                             X509_FILETYPE_PEM()) <= 0) {
-                        
log.error(sm.getString("openssl.errorLoadingCertificateRevocationList", 
sslHostConfig.getCertificateRevocationListPath()));
+                        
log.error(sm.getString("openssl.errorLoadingCertificateRevocationListWithError",
+                                
sslHostConfig.getCertificateRevocationListPath(), getLastError()));
                     }
                 }
                 X509_STORE_set_flags(certificateStore, X509_V_FLAG_CRL_CHECK() 
| X509_V_FLAG_CRL_CHECK_ALL());
@@ -1236,7 +1234,7 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
             var rawKey = localArena.allocateFrom(ValueLayout.JAVA_BYTE, 
sb.toString().getBytes(StandardCharsets.US_ASCII));
             var x509cert = d2i_X509(MemorySegment.NULL, rawCertificatePointer, 
rawCertificate.byteSize());
             if (MemorySegment.NULL.equals(x509cert)) {
-                logLastError(localArena, "openssl.errorLoadingCertificate");
+                logLastError("openssl.errorLoadingCertificate");
                 return false;
             }
             MemorySegment keyBIO = BIO_new(BIO_s_mem());
@@ -1244,19 +1242,19 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                 BIO_write(keyBIO, rawKey, (int) rawKey.byteSize());
                 MemorySegment privateKeyAddress = 
PEM_read_bio_PrivateKey(keyBIO, MemorySegment.NULL, MemorySegment.NULL, 
MemorySegment.NULL);
                 if (MemorySegment.NULL.equals(privateKeyAddress)) {
-                    logLastError(localArena, "openssl.errorLoadingPrivateKey");
+                    logLastError("openssl.errorLoadingPrivateKey");
                     return false;
                 }
                 if (SSL_CTX_use_certificate(state.sslCtx, x509cert) <= 0) {
-                    logLastError(localArena, 
"openssl.errorLoadingCertificate");
+                    logLastError("openssl.errorLoadingCertificate");
                     return false;
                 }
                 if (SSL_CTX_use_PrivateKey(state.sslCtx, privateKeyAddress) <= 
0) {
-                    logLastError(localArena, "openssl.errorLoadingPrivateKey");
+                    logLastError("openssl.errorLoadingPrivateKey");
                     return false;
                 }
                 if (SSL_CTX_check_private_key(state.sslCtx) <= 0) {
-                    logLastError(localArena, "openssl.errorPrivateKeyCheck");
+                    logLastError("openssl.errorPrivateKeyCheck");
                     return false;
                 }
                 if (!OPENSSL_3) {
@@ -1284,11 +1282,11 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
                     var rawCertificateChainPointer = 
localArena.allocateFrom(ValueLayout.ADDRESS, rawCertificateChain);
                     var x509certChain = d2i_X509(MemorySegment.NULL, 
rawCertificateChainPointer, rawCertificateChain.byteSize());
                     if (MemorySegment.NULL.equals(x509certChain)) {
-                        logLastError(localArena, 
"openssl.errorLoadingCertificate");
+                        logLastError("openssl.errorLoadingCertificate");
                         return false;
                     }
                     if (SSL_CTX_add0_chain_cert(state.sslCtx, x509certChain) 
<= 0) {
-                        logLastError(localArena, 
"openssl.errorAddingCertificate");
+                        logLastError("openssl.errorAddingCertificate");
                         return false;
                     }
                 }
@@ -1362,27 +1360,43 @@ public class OpenSSLContext implements 
org.apache.tomcat.util.net.SSLContext {
     }
 
 
-    private static void logLastError(SegmentAllocator allocator, String 
string) {
+    private static void logLastError(String string) {
+        String message = getLastError();
+        if (message != null) {
+            log.error(sm.getString(string, message));
+        }
+    }
+
+
+    /**
+     * Many calls to SSL methods do not check the last error. Those that do
+     * check the last error need to ensure that any previously ignored error is
+     * cleared prior to the method call else errors may be falsely reported.
+     * Ideally, before any SSL_read, SSL_write, clearLastError should always
+     * be called, and getLastError should be called after on any negative or
+     * zero result.
+     * @return the first error in the stack
+     */
+    static String getLastError() {
         String sslError = null;
         long error = ERR_get_error();
         if (error != SSL_ERROR_NONE()) {
-            do {
-                // Loop until getLastErrorNumber() returns SSL_ERROR_NONE
-                var buf = allocator.allocate(ValueLayout.JAVA_BYTE, 128);
-                ERR_error_string(error, buf);
-                String err = buf.getString(0);
-                if (sslError == null) {
-                    sslError = err;
-                }
-                if (log.isDebugEnabled()) {
-                    log.debug(sm.getString("engine.openSSLError", 
Long.toString(error), err));
-                }
-            } while ((error = ERR_get_error()) != SSL_ERROR_NONE());
-        }
-        if (sslError == null) {
-            sslError = "";
+            try (var localArena = Arena.ofConfined()) {
+                do {
+                    // Loop until getLastErrorNumber() returns SSL_ERROR_NONE
+                    var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 128);
+                    ERR_error_string(error, buf);
+                    String err = buf.getString(0);
+                    if (sslError == null) {
+                        sslError = err;
+                    }
+                    if (log.isDebugEnabled()) {
+                        log.debug(sm.getString("engine.openSSLError", 
Long.toString(error), err));
+                    }
+                } while ((error = ERR_get_error()) != SSL_ERROR_NONE());
+            }
         }
-        log.error(sm.getString(string, sslError));
+        return sslError;
     }
 
 
diff --git 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 9f6593cc42..9ac43a7be6 100644
--- 
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ 
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -945,7 +945,7 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
     }
 
     private void checkLastError() throws SSLException {
-        String sslError = getLastError();
+        String sslError = OpenSSLContext.getLastError();
         if (sslError != null) {
             // Many errors can occur during handshake and need to be reported
             if (!handshakeFinished) {
@@ -961,38 +961,7 @@ public final class OpenSSLEngine extends SSLEngine 
implements SSLUtil.ProtocolIn
      * Clear out any errors, but log a warning.
      */
     private static void clearLastError() {
-        getLastError();
-    }
-
-    /**
-     * Many calls to SSL methods do not check the last error. Those that do
-     * check the last error need to ensure that any previously ignored error is
-     * cleared prior to the method call else errors may be falsely reported.
-     * Ideally, before any SSL_read, SSL_write, clearLastError should always
-     * be called, and getLastError should be called after on any negative or
-     * zero result.
-     * @return the first error in the stack
-     */
-    private static String getLastError() {
-        String sslError = null;
-        long error = ERR_get_error();
-        if (error != SSL_ERROR_NONE()) {
-            try (var localArena = Arena.ofConfined()) {
-                do {
-                    // Loop until getLastErrorNumber() returns SSL_ERROR_NONE
-                    var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 128);
-                    ERR_error_string(error, buf);
-                    String err = buf.getString(0);
-                    if (sslError == null) {
-                        sslError = err;
-                    }
-                    if (log.isDebugEnabled()) {
-                        log.debug(sm.getString("engine.openSSLError", 
Long.toString(error), err));
-                    }
-                } while ((error = ERR_get_error()) != SSL_ERROR_NONE());
-            }
-        }
-        return sslError;
+        OpenSSLContext.getLastError();
     }
 
     private SSLEngineResult.Status getEngineStatus() {
diff --git 
a/modules/openssl-foreign/src/main/resources/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
 
b/modules/openssl-foreign/src/main/resources/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
index 3b6ab4c80d..27f9ff9c13 100644
--- 
a/modules/openssl-foreign/src/main/resources/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
+++ 
b/modules/openssl-foreign/src/main/resources/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
@@ -47,17 +47,17 @@ openssl.checkConf=Checking OpenSSLConf
 openssl.doubleInit=SSL context already initialized, ignoring
 openssl.errApplyConf=Could not apply OpenSSLConf to SSL context
 openssl.errCheckConf=Error during OpenSSLConf check
-openssl.errMakeConf=Could not create OpenSSLConf context
+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.errorLoadingCertificateWithError=Error loading certificate [{0}] with 
error [{1}]
 openssl.errorLoadingPassword=Error loading password file: [{0}]
 openssl.errorLoadingPrivateKey=Error loading private key: [{0}]
-openssl.errorLoadingCertificateRevocationList=Error loading certificate 
revocation: [{0}]
-openssl.errorPrivateKeyCheck=Private key does not match the certificate public 
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.keyManagerMissing=No key manager found
-openssl.keyManagerMissing.warn=No key manager found. TLS will work but the 
certificate will not be visible to Tomcat so management/monitoring features 
will not work for this certificate
 openssl.makeConf=Creating OpenSSLConf context
 openssl.noCACerts=No CA certificates were configured
 openssl.nonJsseCertificate=The certificate [{0}] or its private key [{1}] 
could not be processed using a JSSE key manager and will be given directly to 
OpenSSL
@@ -93,7 +93,7 @@ openssllibrary.engineError=Error creating engine
 openssllibrary.enterAlreadyInFIPSMode=AprLifecycleListener is configured to 
force entering FIPS mode, but library is already in FIPS mode [{0}]
 openssllibrary.initializeFIPSFailed=Failed to enter FIPS mode
 openssllibrary.initializeFIPSSuccess=Successfully entered FIPS mode
-openssllibrary.initializedOpenSSL=OpenSSL successfully initialized [{0}]
+openssllibrary.initializedOpenSSL=OpenSSL successfully initialized using FFM 
[{0}]
 openssllibrary.initializingFIPS=Initializing FIPS mode...
 openssllibrary.requireNotInFIPSMode=The listener is configured to require the 
library to already be in FIPS mode, but it was not in FIPS mode
 openssllibrary.skipFIPSInitialization=Already in FIPS mode; skipping FIPS 
initialization.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to