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 fb382b1552 Cleanups
fb382b1552 is described below
commit fb382b1552d00f4ca5fdc23f66bc1fe347e3965d
Author: remm <r...@apache.org>
AuthorDate: Fri Dec 8 11:26:05 2023 +0100
Cleanups
Remove methods not present in Tomcat 11.
Remove deprecated tags, this is clearly flagged as pre OpenSSL 3.
---
.../tomcat/util/net/openssl/panama/OpenSSLImplementation.java | 9 ---------
.../apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java | 3 ---
2 files changed, 12 deletions(-)
diff --git
a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLImplementation.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLImplementation.java
index 28d7ae2b8f..260d196b93 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLImplementation.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLImplementation.java
@@ -29,11 +29,6 @@ import org.apache.tomcat.util.net.jsse.JSSESupport;
public class OpenSSLImplementation extends SSLImplementation {
- @Deprecated
- public SSLSupport getSSLSupport(SSLSession session) {
- return new JSSESupport(session, null);
- }
-
@Override
public SSLSupport getSSLSupport(SSLSession session, Map<String,
List<String>> additionalAttributes) {
return new JSSESupport(session, additionalAttributes);
@@ -44,8 +39,4 @@ public class OpenSSLImplementation extends SSLImplementation {
return new OpenSSLUtil(certificate);
}
- public boolean isAlpnSupported() {
- // OpenSSL supported ALPN
- return true;
- }
}
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
index d184189074..45e3178fc7 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLLibrary.java
@@ -95,7 +95,6 @@ public class OpenSSLLibrary {
{ BN_get_rfc3526_prime_2048, NULL, 1025 },
{ BN_get_rfc2409_prime_1024, NULL, 0 }
*/
- @Deprecated
static final class DHParam {
final MemorySegment dh;
final int min;
@@ -106,7 +105,6 @@ public class OpenSSLLibrary {
}
static final DHParam[] dhParameters = new DHParam[6];
- @Deprecated
private static void initDHParameters() {
var dh = DH_new();
var p = BN_get_rfc3526_prime_8192(MemorySegment.NULL);
@@ -146,7 +144,6 @@ public class OpenSSLLibrary {
dhParameters[5] = new DHParam(dh, 0);
}
- @Deprecated
private static void freeDHParameters() {
for (int i = 0; i < dhParameters.length; i++) {
if (dhParameters[i] != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
