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 eb4d323d0e Try add flag for LibreSSL 3.3.6 from GitHub actions
eb4d323d0e is described below
commit eb4d323d0eace40a4fb28f302a22bbee0755187e
Author: remm <[email protected]>
AuthorDate: Mon Jan 5 11:59:37 2026 +0100
Try add flag for LibreSSL 3.3.6 from GitHub actions
It does not seem to have TLS 1.3, so try to find a way to detect it.
---
.../apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
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 97b1ffc49d..c497c807f2 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -86,9 +86,15 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
final Set<String> availableCipherSuites = new LinkedHashSet<>(128);
availableCipherSuites.addAll(OpenSSLLibrary.findCiphers("ALL"));
AVAILABLE_CIPHER_SUITES =
Collections.unmodifiableSet(availableCipherSuites);
- IMPLEMENTED_PROTOCOLS_SET = Set.of(Constants.SSL_PROTO_SSLv2Hello,
Constants.SSL_PROTO_SSLv2,
- Constants.SSL_PROTO_SSLv3, Constants.SSL_PROTO_TLSv1,
Constants.SSL_PROTO_TLSv1_1,
- Constants.SSL_PROTO_TLSv1_2, Constants.SSL_PROTO_TLSv1_3);
+ if (OpenSSL_version_num() >= 0x1010100f) {
+ IMPLEMENTED_PROTOCOLS_SET = Set.of(Constants.SSL_PROTO_SSLv2Hello,
Constants.SSL_PROTO_SSLv2,
+ Constants.SSL_PROTO_SSLv3, Constants.SSL_PROTO_TLSv1,
Constants.SSL_PROTO_TLSv1_1,
+ Constants.SSL_PROTO_TLSv1_2, Constants.SSL_PROTO_TLSv1_3);
+ } else {
+ IMPLEMENTED_PROTOCOLS_SET = Set.of(Constants.SSL_PROTO_SSLv2Hello,
Constants.SSL_PROTO_SSLv2,
+ Constants.SSL_PROTO_SSLv3, Constants.SSL_PROTO_TLSv1,
Constants.SSL_PROTO_TLSv1_1,
+ Constants.SSL_PROTO_TLSv1_2);
+ }
}
private static final int MAX_PLAINTEXT_LENGTH = 16 * 1024; // 2^14
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
