This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 109d2e82036cff8a47ebc5edb48c6b4d89cb1922
Merge: cc47f2cc28 6a4c499c61
Author: Rémy Maucherat <r...@apache.org>
AuthorDate: Thu Jul 11 10:17:30 2024 +0200
Merge pull request #740 from rmaucher/9.0.x
Add OpenSSL FFM code
Port the TLS testsuite improvements from 10.1.
APR TLS testing uses only the OpenSSL parameter (and skips JSSE and OpenSSL
FFM) to avoid looking weird while running only once.
Release build now requires a new ${java-ffm.home} property to point to a
JDK 22+ with javac. The javac version used will be logged in the release
properties so that the build can be reproduced.
build.xml | 54 +
java/org/apache/catalina/connector/Connector.java | 27 +-
.../apache/catalina/core/AprLifecycleListener.java | 1 +
java/org/apache/catalina/core/AprStatus.java | 17 +-
.../apache/catalina/core/LocalStrings.properties | 5 +
.../catalina/core/OpenSSLLifecycleListener.java | 240 +
.../tomcat/util/net/openssl/OpenSSLStatus.java | 85 +
.../net/openssl/panama/LocalStrings.properties | 103 +
.../net/openssl/panama/LocalStrings_fr.properties | 100 +
.../net/openssl/panama/LocalStrings_ja.properties | 100 +
.../openssl/panama/LocalStrings_zh_CN.properties | 16 +
.../util/net/openssl/panama/OpenSSLContext.java | 1408 +++++
.../util/net/openssl/panama/OpenSSLEngine.java | 1697 +++++
.../net/openssl/panama/OpenSSLImplementation.java | 53 +
.../util/net/openssl/panama/OpenSSLLibrary.java | 498 ++
.../net/openssl/panama/OpenSSLSessionContext.java | 155 +
.../net/openssl/panama/OpenSSLSessionStats.java | 128 +
.../util/net/openssl/panama/OpenSSLUtil.java | 108 +
.../net/openssl/panama/OpenSSLX509Certificate.java | 192 +
.../openssl/SSL_CTX_set_alpn_select_cb$cb.java | 70 +
.../SSL_CTX_set_cert_verify_callback$cb.java | 66 +
.../openssl/SSL_CTX_set_tmp_dh_callback$dh.java | 67 +
.../util/openssl/SSL_CTX_set_verify$callback.java | 66 +
.../util/openssl/SSL_set_info_callback$cb.java | 66 +
.../util/openssl/SSL_set_verify$callback.java | 66 +
java/org/apache/tomcat/util/openssl/openssl_h.java | 6479 ++++++++++++++++++++
.../util/openssl/openssl_h_Compatibility.java | 238 +
.../tomcat/util/openssl/openssl_h_Macros.java | 470 ++
.../tomcat/util/openssl/pem_password_cb.java | 81 +
res/META-INF/tomcat-coyote-ffm.jar.manifest | 9 +
res/bnd/tomcat-coyote-ffm.jar.tmp.bnd | 32 +
res/checkstyle/checkstyle.xml | 9 +-
res/maven/mvn-pub.xml | 2 +
res/maven/tomcat-coyote-ffm.pom | 55 +
.../catalina/core/TestAprLifecycleListener.java | 52 +-
.../apache/catalina/startup/TomcatBaseTest.java | 8 -
.../catalina/valves/rewrite/TestResolverSSL.java | 57 +
test/org/apache/coyote/http2/TestLargeUpload.java | 16 +-
.../org/apache/tomcat/util/net/TestClientCert.java | 32 +
.../tomcat/util/net/TestClientCertTls13.java | 67 +-
.../tomcat/util/net/TestCustomSslTrustManager.java | 31 +
.../tomcat/util/net/TestSSLHostConfigCompat.java | 32 +-
.../util/net/TestSSLHostConfigIntegration.java | 31 +
test/org/apache/tomcat/util/net/TestSsl.java | 41 +-
test/org/apache/tomcat/util/net/TesterSupport.java | 78 +-
.../tomcat/util/net/openssl/TestOpenSSLConf.java | 120 +-
.../websocket/TestWebSocketFrameClientSSL.java | 44 +-
.../websocket/TestWsWebSocketContainerSSL.java | 42 +-
48 files changed, 13259 insertions(+), 155 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
