Skip to content

Commit eb4d323

Browse files
committed
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.
1 parent bf4c5e6 commit eb4d323

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,15 @@ public final class OpenSSLEngine extends SSLEngine implements SSLUtil.ProtocolIn
8686
final Set<String> availableCipherSuites = new LinkedHashSet<>(128);
8787
availableCipherSuites.addAll(OpenSSLLibrary.findCiphers("ALL"));
8888
AVAILABLE_CIPHER_SUITES = Collections.unmodifiableSet(availableCipherSuites);
89-
IMPLEMENTED_PROTOCOLS_SET = Set.of(Constants.SSL_PROTO_SSLv2Hello, Constants.SSL_PROTO_SSLv2,
90-
Constants.SSL_PROTO_SSLv3, Constants.SSL_PROTO_TLSv1, Constants.SSL_PROTO_TLSv1_1,
91-
Constants.SSL_PROTO_TLSv1_2, Constants.SSL_PROTO_TLSv1_3);
89+
if (OpenSSL_version_num() >= 0x1010100f) {
90+
IMPLEMENTED_PROTOCOLS_SET = Set.of(Constants.SSL_PROTO_SSLv2Hello, Constants.SSL_PROTO_SSLv2,
91+
Constants.SSL_PROTO_SSLv3, Constants.SSL_PROTO_TLSv1, Constants.SSL_PROTO_TLSv1_1,
92+
Constants.SSL_PROTO_TLSv1_2, Constants.SSL_PROTO_TLSv1_3);
93+
} else {
94+
IMPLEMENTED_PROTOCOLS_SET = Set.of(Constants.SSL_PROTO_SSLv2Hello, Constants.SSL_PROTO_SSLv2,
95+
Constants.SSL_PROTO_SSLv3, Constants.SSL_PROTO_TLSv1, Constants.SSL_PROTO_TLSv1_1,
96+
Constants.SSL_PROTO_TLSv1_2);
97+
}
9298
}
9399

94100
private static final int MAX_PLAINTEXT_LENGTH = 16 * 1024; // 2^14

0 commit comments

Comments
 (0)