This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 2b1dfe5bc4 Drop NPN calls
2b1dfe5bc4 is described below
commit 2b1dfe5bc4befdc53d74a0333ac8931d78ec39f6
Author: remm <r...@apache.org>
AuthorDate: Tue May 31 11:17:10 2022 +0200
Drop NPN calls
Tomcat-native is dropping them as well as they are obsolete.
---
modules/openssl-java17/openssl-tomcat.conf | 1 -
.../tomcat/util/net/openssl/panama/OpenSSLContext.java | 2 --
.../apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 12 +-----------
.../java/org/apache/tomcat/util/openssl/constants$11.java | 10 ----------
.../main/java/org/apache/tomcat/util/openssl/openssl_h.java | 11 -----------
5 files changed, 1 insertion(+), 35 deletions(-)
diff --git a/modules/openssl-java17/openssl-tomcat.conf
b/modules/openssl-java17/openssl-tomcat.conf
index 5273538daf..f6765453b4 100644
--- a/modules/openssl-java17/openssl-tomcat.conf
+++ b/modules/openssl-java17/openssl-tomcat.conf
@@ -214,7 +214,6 @@
--include-function SSL_get_shutdown # header:
/usr/include/openssl/ssl.h
--include-function SSL_get_version # header:
/usr/include/openssl/ssl.h
--include-function SSL_get0_alpn_selected # header:
/usr/include/openssl/ssl.h
---include-function SSL_get0_next_proto_negotiated # header:
/usr/include/openssl/ssl.h
--include-function SSL_in_init # header:
/usr/include/openssl/ssl.h
--include-function SSL_load_client_CA_file # header:
/usr/include/openssl/ssl.h
--include-function SSL_new # header:
/usr/include/openssl/ssl.h
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index ee2ab2f9d1..516f4c68ef 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -678,8 +678,6 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
CLinker.getInstance().upcallStub(openSSLCallbackAlpnSelectProtoHandle,
openSSLCallbackAlpnSelectProtoFunctionDescriptor,
state.contextScope);
SSL_CTX_set_alpn_select_cb(state.sslCtx,
openSSLCallbackAlpnSelectProto, state.sslCtx);
- // Skip NPN (annoying and likely not useful anymore)
- //SSLContext.setNpnProtos(state.ctx, protocolsArray,
SSL.SSL_SELECTOR_FAILURE_NO_ADVERTISE);
}
// Apply OpenSSLConfCmd if used
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 52e0677144..f3cc027298 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -1008,9 +1008,6 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
MemorySegment lenAddress = allocator.allocate(CLinker.C_INT, 0);
MemorySegment protocolPointer = allocator.allocate(CLinker.C_POINTER,
MemoryAddress.NULL);
SSL_get0_alpn_selected(state.ssl, protocolPointer, lenAddress);
- if (MemoryAddress.NULL.equals(protocolPointer.address())) {
- SSL_get0_next_proto_negotiated(state.ssl, protocolPointer,
lenAddress);
- }
if (MemoryAddress.NULL.equals(protocolPointer.address())) {
return null;
}
@@ -1808,14 +1805,7 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
public String getProtocol() {
String applicationProtocol =
OpenSSLEngine.this.applicationProtocol;
if (applicationProtocol == null) {
- synchronized (OpenSSLEngine.this) {
- if (!destroyed) {
- applicationProtocol = getProtocolNegotiated();
- }
- }
- if (applicationProtocol == null) {
- applicationProtocol = fallbackApplicationProtocol;
- }
+ applicationProtocol = fallbackApplicationProtocol;
if (applicationProtocol != null) {
OpenSSLEngine.this.applicationProtocol =
applicationProtocol.replace(':', '_');
} else {
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
index 051943ca6c..92b679eff7 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/constants$11.java
@@ -35,16 +35,6 @@ class constants$11 {
"(Ljdk/incubator/foreign/MemoryAddress;J)J",
constants$11.SSL_set_options$FUNC, false
);
- static final FunctionDescriptor SSL_get0_next_proto_negotiated$FUNC =
FunctionDescriptor.ofVoid(
- C_POINTER,
- C_POINTER,
- C_POINTER
- );
- static final MethodHandle SSL_get0_next_proto_negotiated$MH =
RuntimeHelper.downcallHandle(
- openssl_h.LIBRARIES, "SSL_get0_next_proto_negotiated",
-
"(Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;Ljdk/incubator/foreign/MemoryAddress;)V",
- constants$11.SSL_get0_next_proto_negotiated$FUNC, false
- );
static final FunctionDescriptor SSL_CTX_set_alpn_select_cb$FUNC =
FunctionDescriptor.ofVoid(
C_POINTER,
C_POINTER,
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
index 2981d7fe51..a2b172dad7 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/openssl/openssl_h.java
@@ -987,17 +987,6 @@ public class openssl_h {
throw new AssertionError("should not reach here", ex$);
}
}
- public static MethodHandle SSL_get0_next_proto_negotiated$MH() {
- return
RuntimeHelper.requireNonNull(constants$11.SSL_get0_next_proto_negotiated$MH,"SSL_get0_next_proto_negotiated");
- }
- public static void SSL_get0_next_proto_negotiated ( Addressable s,
Addressable data, Addressable len) {
- var mh$ =
RuntimeHelper.requireNonNull(constants$11.SSL_get0_next_proto_negotiated$MH,
"SSL_get0_next_proto_negotiated");
- try {
- mh$.invokeExact(s.address(), data.address(), len.address());
- } catch (Throwable ex$) {
- throw new AssertionError("should not reach here", ex$);
- }
- }
public static MethodHandle SSL_CTX_set_alpn_select_cb$MH() {
return
RuntimeHelper.requireNonNull(constants$11.SSL_CTX_set_alpn_select_cb$MH,"SSL_CTX_set_alpn_select_cb");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
