This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 337d9f0171 Allow alternate protocols
new b8d2b25936 Add support for pre-shared keys with Tomcat Native TLS
connections.
new 2ad4b3d7ef Expand the PSK support to cover OpenSSL-FFM
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/startup/Catalina.java | 5 +
...OffsetRule.java => PreSharedKeyCreateRule.java} | 39 ++--
.../catalina/storeconfig/SSLHostConfigSF.java | 14 +-
.../catalina/storeconfig/server-registry.xml | 9 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 5 +-
java/org/apache/tomcat/util/net/SSLHostConfig.java | 38 ++++
.../tomcat/util/net/SSLHostConfigPreSharedKey.java | 141 ++++++++++++++
java/org/apache/tomcat/util/net/jsse/JSSEUtil.java | 4 +
.../tomcat/util/net/jsse/LocalStrings.properties | 1 +
.../util/net/openssl/LocalStrings.properties | 3 +
.../tomcat/util/net/openssl/OpenSSLContext.java | 28 ++-
.../net/openssl/OpenSSLPreSharedKeySelector.java | 102 +++++++++++
.../tomcat/util/net/openssl/OpenSSLUtil.java | 3 +
.../net/openssl/panama/LocalStrings.properties | 1 +
.../util/net/openssl/panama/OpenSSLContext.java | 125 ++++++++++++-
.../util/net/openssl/panama/OpenSSLUtil.java | 3 +
...b$cb.java => SSL_psk_find_session_cb_func.java} | 20 +-
...lect_cb$cb.java => SSL_psk_server_cb_func.java} | 20 +-
java/org/apache/tomcat/util/openssl/openssl_h.java | 202 ++++++++++++++++++++-
res/openssl/openssl-tomcat.conf | 11 ++
.../catalina/storeconfig/TestStoreConfig.java | 8 +
.../apache/tomcat/util/net/TestSSLHostConfig.java | 68 +++++++
webapps/docs/changelog.xml | 8 +
webapps/docs/config/http.xml | 31 +++-
24 files changed, 833 insertions(+), 56 deletions(-)
copy java/org/apache/catalina/startup/{AddPortOffsetRule.java =>
PreSharedKeyCreateRule.java} (55%)
create mode 100644
java/org/apache/tomcat/util/net/SSLHostConfigPreSharedKey.java
create mode 100644
java/org/apache/tomcat/util/net/openssl/OpenSSLPreSharedKeySelector.java
copy java/org/apache/tomcat/util/openssl/{SSL_CTX_set_alpn_select_cb$cb.java
=> SSL_psk_find_session_cb_func.java} (70%)
copy java/org/apache/tomcat/util/openssl/{SSL_CTX_set_alpn_select_cb$cb.java
=> SSL_psk_server_cb_func.java} (72%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
