This is an automated email from the ASF dual-hosted git repository.
markt-asf 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 4692cd25b2 Consistently log missing SSL instance
4692cd25b2 is described below
commit 4692cd25b261c1ece050f732e7594425c801c595
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Jun 16 15:24:30 2026 +0100
Consistently log missing SSL instance
---
.../tomcat/util/net/openssl/panama/LocalStrings.properties | 1 +
.../apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
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 0ca4c424a7..5508cb6e39 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/net/openssl/panama/LocalStrings.properties
@@ -28,6 +28,7 @@ engine.invalidDestinationBuffersState=The state of the
destination buffers chang
engine.invalidOCSPURL=The OCSP URL is invalid: [{0}]
engine.noRestrictSessionCreation=OpenSslEngine does not permit restricting the
engine to only resuming existing sessions
engine.noSSLContext=No SSL context
+engine.noSSLState= No state was found in the SSL Engine for the given SSL
instance [{0}]
engine.noSession=SSL session ID not available
engine.nullBuffer=Null buffer
engine.nullBufferInArray=Null buffer in array
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index b120a1202e..70d60939ef 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -1103,7 +1103,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
public void apply(MemorySegment ssl, int where, int ret) {
EngineState state = getState(ssl);
if (state == null) {
- log.warn(sm.getString("engine.noSSL",
Long.valueOf(ssl.address())));
+ log.warn(sm.getString("engine.noSSLState",
Long.valueOf(ssl.address())));
return;
}
if (0 != (where & SSL_CB_HANDSHAKE_DONE())) {
@@ -1118,7 +1118,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
MemorySegment ssl = X509_STORE_CTX_get_ex_data(x509ctx,
SSL_get_ex_data_X509_STORE_CTX_idx());
EngineState state = getState(ssl);
if (state == null) {
- log.warn(sm.getString("engine.noSSL",
Long.valueOf(ssl.address())));
+ log.warn(sm.getString("engine.noSSLState",
Long.valueOf(ssl.address())));
return 0;
}
if (log.isTraceEnabled()) {
@@ -1450,9 +1450,11 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
static void markPostHandshakeAuthComplete(MemorySegment ssl) {
EngineState state = getState(ssl);
- if (state != null) {
- state.phaState = PHAState.COMPLETE;
+ if (state == null) {
+ log.warn(sm.getString("engine.noSSLState",
Long.valueOf(ssl.address())));
+ return;
}
+ state.phaState = PHAState.COMPLETE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
