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 c17f627dd8 Code cleanups
c17f627dd8 is described below
commit c17f627dd82b732a132e8d008900ce344cc48c0b
Author: remm <[email protected]>
AuthorDate: Tue Feb 27 14:33:10 2024 +0100
Code cleanups
These classes are only compiled with Java 22.
---
.../tomcat/util/net/openssl/panama/OpenSSLContext.java | 17 +++--------------
.../tomcat/util/net/openssl/panama/OpenSSLEngine.java | 13 ++-----------
2 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index a2ce690c88..f72606ba05 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -35,7 +35,6 @@ import java.util.Arrays;
import java.util.Base64;
import java.util.Iterator;
import java.util.List;
-import java.util.function.Consumer;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLEngine;
@@ -67,7 +66,6 @@ import
org.apache.tomcat.util.openssl.SSL_CTX_set_alpn_select_cb$cb;
import org.apache.tomcat.util.openssl.SSL_CTX_set_cert_verify_callback$cb;
import org.apache.tomcat.util.openssl.SSL_CTX_set_tmp_dh_callback$dh;
import org.apache.tomcat.util.openssl.SSL_CTX_set_verify$callback;
-import org.apache.tomcat.util.openssl.openssl_h_Macros;
import org.apache.tomcat.util.openssl.pem_password_cb;
import org.apache.tomcat.util.res.StringManager;
@@ -1081,8 +1079,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// Set callback for DH parameters
SSL_CTX_set_tmp_dh_callback(state.sslCtx,
SSL_CTX_set_tmp_dh_callback$dh.allocate(new TmpDHCallback(), contextArena));
} else {
- var d2i_ECPKParameters =
openssl_h_Macros.d2i_ECPKParameters$SYMBOL();
- var ecparams = PEM_ASN1_read_bio(d2i_ECPKParameters,
+ var ecparams =
PEM_ASN1_read_bio(d2i_ECPKParameters$SYMBOL(),
PEM_STRING_ECPARAMETERS(), certificateBIO,
MemorySegment.NULL, MemorySegment.NULL, MemorySegment.NULL);
if (!MemorySegment.NULL.equals(ecparams)) {
int curveNid = EC_GROUP_get_curve_name(ecparams);
@@ -1407,18 +1404,10 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
// Use another arena to avoid keeping a reference through segments
// This also allows making further accesses to the main pointers
safer
this.sslCtx = sslCtx.reinterpret(ValueLayout.ADDRESS.byteSize(),
stateArena,
- new Consumer<MemorySegment>() {
- @Override
- public void accept(MemorySegment t) {
- SSL_CTX_free(t);
- }});
+ (MemorySegment t) -> SSL_CTX_free(t));
if (!MemorySegment.NULL.equals(confCtx)) {
this.confCtx =
confCtx.reinterpret(ValueLayout.ADDRESS.byteSize(), stateArena,
- new Consumer<MemorySegment>() {
- @Override
- public void accept(MemorySegment t) {
- SSL_CONF_CTX_free(t);
- }});
+ (MemorySegment t) -> SSL_CONF_CTX_free(t));
} else {
this.confCtx = null;
}
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 6099620f72..d80b48d2c4 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -42,7 +42,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
@@ -1684,17 +1683,9 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
// Use another arena to avoid keeping a reference through segments
// This also allows making further accesses to the main pointers
safer
this.ssl = ssl.reinterpret(ValueLayout.ADDRESS.byteSize(),
stateArena,
- new Consumer<MemorySegment>() {
- @Override
- public void accept(MemorySegment t) {
- SSL_free(t);
- }});
+ (MemorySegment t) -> SSL_free(t));
this.networkBIO =
networkBIO.reinterpret(ValueLayout.ADDRESS.byteSize(), stateArena,
- new Consumer<MemorySegment>() {
- @Override
- public void accept(MemorySegment t) {
- BIO_free(t);
- }});
+ (MemorySegment t) -> BIO_free(t));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
