You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2024/02/05 14:12:26 UTC

(tomcat-native) branch 1.3.x created (now de94af367)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


      at de94af367 Align with 9.0.x

This branch includes the following new commits:

     new 35606620d Update ignores
     new 9db68a6c5 Add 1.3.x branch
     new dcb4f6595 First pass at updating version to 1.3
     new 07e76d749 Update ASF logo
     new e6f775502 Consistent formatting. Correct entries for 1.3. Add version to title.
     new f2a7699d3 Second pass at version update
     new fdd917234 First pass at reviewing use of OPENSSL_VERSION_NUMBER
     new 29f0cc900 Update minimum LibreSSL version to 3.5.2. Remove NPN support.
     new de94af367 Align with 9.0.x

The 9 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.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 03/09: First pass at updating version to 1.3

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit dcb4f6595c65c5c057ab8bb57b8bf020ba761d5d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 08:19:58 2024 +0000

    First pass at updating version to 1.3
---
 HOWTO-RELEASE.txt                 |  20 +-
 jnirelease.sh                     |   2 +-
 native/NMAKEmakefile              |   2 +-
 native/build/rpm/tcnative.spec.in |  10 +-
 native/os/win32/libtcnative.rc    |   2 +-
 xdocs/index.xml                   |   7 +-
 xdocs/miscellaneous/changelog.xml | 702 +-------------------------------------
 xdocs/news/2008.xml               |  57 ----
 xdocs/news/2009.xml               |  41 ---
 xdocs/news/2010.xml               |  46 ---
 xdocs/news/2012.xml               |  52 ---
 xdocs/news/2013.xml               |  55 ---
 xdocs/news/2014.xml               |  52 ---
 xdocs/news/2015.xml               |  59 ----
 xdocs/news/2016.xml               |  72 ----
 xdocs/news/2017.xml               |  55 ---
 xdocs/news/2018.xml               |  55 ---
 xdocs/news/2019.xml               |  44 ---
 xdocs/news/2020.xml               |  49 ---
 xdocs/news/2021.xml               |  54 ---
 xdocs/news/2022.xml               |  54 ---
 xdocs/news/2023.xml               |  57 ----
 xdocs/news/{2011.xml => 2024.xml} |  30 +-
 23 files changed, 44 insertions(+), 1533 deletions(-)

diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index d0cb3cdcf..4dc2d8c79 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -43,10 +43,10 @@ Ensure dates and/or version numbers are up to date:
 
 Run the release script to check the Java code is aligned with the current 9.0.x
 source.
-./jnirelease.sh --ver=1.2.x --with-apr=/path/to/apr/source
+./jnirelease.sh --ver=1.3.x --with-apr=/path/to/apr/source
 
-Switch back to the 1.2.x branch
-git checkout 1.2.x
+Switch back to the 1.3.x branch
+git checkout 1.3.x
 
 Tagging
 -------
@@ -63,11 +63,11 @@ git status
 git diff
 
 # Tag (modify version as appropriate)
-git commit -a -m "Tag 1.2.35"
-git tag 1.2.35
-git push origin 1.2.35
+git commit -a -m "Tag 1.3.0"
+git tag 1.3.0
+git push origin 1.3.0
 
-# Reset 1.2.x
+# Reset 1.3.x
 git reset --hard HEAD~1
 
 
@@ -75,10 +75,10 @@ Create the source release
 -------------------------
 
 # Modify version as appropriate
-./jnirelease.sh --ver=1.2.35 --with-apr=/path/to/apr/source
+./jnirelease.sh --ver=1.3.0 --with-apr=/path/to/apr/source
 
-# Switch back to the 1.2.x branch
-git checkout 1.2.x
+# Switch back to the 1.3.x branch
+git checkout 1.3.x
 
 
 Create the binary release for Windows
diff --git a/jnirelease.sh b/jnirelease.sh
index f76cda464..aa4cc82f0 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -178,7 +178,7 @@ if [ $diffcount -ne 0 ]; then
     echo "WARNING: git subtree is not up to date with"
     echo "         $TCJAVA_GITBASE"
     echo "         Either correct now by running"
-    echo "         'git checkout 1.2.x'"
+    echo "         'git checkout 1.3.x'"
     echo "         'git rm -rf java/org/apache/tomcat/jni'"
     echo "         'git read-tree --prefix=java/org/apache/tomcat/jni/ -u tcjava/9.0.x:java/org/apache/tomcat/jni'"
     echo "         'git commit'"
diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index ad02d3152..129ebe7b7 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -69,7 +69,7 @@ INCLUDES = $(INCLUDES) -I$(WITH_OPENSSL)\inc32
 LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
 !ENDIF
 
-LFLAGS = $(LFLAGS) /version:1.2
+LFLAGS = $(LFLAGS) /version:1.3
 LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
 LFLAGS = $(LFLAGS) $(APR_LIB)
 !IF DEFINED(WITH_FIPS)
diff --git a/native/build/rpm/tcnative.spec.in b/native/build/rpm/tcnative.spec.in
index 73c164240..078ca8366 100644
--- a/native/build/rpm/tcnative.spec.in
+++ b/native/build/rpm/tcnative.spec.in
@@ -17,7 +17,7 @@
 
 %define tcnver 1
 %define aprmajor 1
-%define aprminor 4
+%define aprminor 6
 
 Summary: Tomcat Native Java library
 Name: tcnative
@@ -28,7 +28,7 @@ Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= %{aprmajor}.%{aprminor}.0, openssl >= 1.0.2
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >= %{aprmajor}.%{aprminor}.0, openssl >= 1.1.1
 
 %description
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -38,7 +38,7 @@ contains additional utility interfaces for Java.
 %package devel
 Group: Development/Libraries
 Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >= %{aprmajor}.%{aprminor}.0, openssl-devel >= 1.0.2
+Requires: tcnative = %{version}-%{release}, apr-devel >= %{aprmajor}.%{aprminor}.0, openssl-devel >= 1.1.1
 
 %description devel
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -90,8 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc --parents html
 
 %changelog
+* Mon Feb 05 2024 Mark Thomas <ma...@apache.org> 1.3.0-1
+- update for tcnative 1.3
 * Sat Oct 31 2015 Rainer Jung <rj...@apache.org> 1.2.0-1
 - update for tcnative 1.2
 * Tue Jun 22 2004 Mladen Turk <mt...@jboss.com> 1.0.0-1
 - update to support v1.0.2 of APR
-                                                                                
+                                                                                
\ No newline at end of file
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index d1a1f7647..55b45baa8 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
                      "See the License for the specific language governing " \
                      "permissions and limitations under the License."
 
-#define TCN_VERSION "1.2.40"
+#define TCN_VERSION "1.3.0"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
diff --git a/xdocs/index.xml b/xdocs/index.xml
index f5bdc049a..0a5d77003 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,10 +60,10 @@
 <section name="Headlines">
 <ul>
 
-<li><a href="news/2023.html#20231003">3 October 2023 - <b>TC-Native-1.2.39
+<li><a href="news/2024.html#20240208">8 February 2024 - <b>TC-Native-1.3.0
 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.39 Stable.</p>
+Tomcat Native 1.3.0 Stable.</p>
 <p>
 The sources and the binaries for selected platforms are available from the
 <a href="../download-native.cgi">Download page</a>.
@@ -205,7 +205,8 @@ INFO: Initializing Coyote HTTP/1.1 on http-8080</source>
 
   <p>
     Refer to the tomcat documentation to configure the connectors (See
-    <a href="http://tomcat.apache.org/tomcat-10.0-doc/apr.html">Tomcat 10.0.x</a>,
+    <a href="http://tomcat.apache.org/tomcat-11.0-doc/apr.html">Tomcat 11.0.x</a>,
+    <a href="http://tomcat.apache.org/tomcat-10.1-doc/apr.html">Tomcat 10.1.x</a>,
     <a href="http://tomcat.apache.org/tomcat-9.0-doc/apr.html">Tomcat 9.0.x</a> and 
     <a href="http://tomcat.apache.org/tomcat-8.5-doc/apr.html">Tomcat 8.5.x</a>)
   </p>
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index 60fe4e4c1..68b1136e2 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -27,10 +27,11 @@
 
 <section name="Preface">
   <p>
-  This is the Changelog for Tomcat Native 1.2.
+  This is the Changelog for Tomcat Native 1.3.x. The Tomcat Native 1.3.x branch
+  started from the 1.2.39 tag.
   </p>
 </section>
-<section name="Changes in 1.2.40">
+<section name="Changes in 1.3.0">
   <changelog>
     <update>
       Drop useless <code>compile.optimize</code> option. (michaelo)
@@ -52,700 +53,9 @@
     </fix>
   </changelog>
 </section>
-<section name="Changes in 1.2.39">
-  <changelog>
-    <fix>
-      <bug>67061</bug>: If the insecure optionalNoCA certificate verification
-      mode is used, disable OCSP if enabled else client certificates from
-      unknown certificate authorities will be rejected. (markt)
-    </fix>
-    <update>
-      Update the recommended minimum version of OpenSSL to 3.0.11. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.38">
-  <changelog>
-    <update>
-      Align default pass phrase prompt with HTTPd. (michaelo)
-    </update>
-    <fix>
-      <bug>66669</bug>: Fix memory leak in SNI processing. (markt)
-    </fix>
-    <update>
-      Update the recommended minimum version of OpenSSL to 1.1.1v. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.37">
-  <changelog>
-    <update>
-      Update the recommended minimum version of APR to 1.7.4. (markt)
-    </update>
-    <update>
-      Update the recommended minimum version of OpenSSL to 1.1.1u. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.36">
-  <changelog>
-    <update>
-      Update the recommended minimum version of APR to 1.7.2. (markt)
-    </update>
-    <update>
-      Update the recommended minimum version of OpenSSL to 1.1.1t. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.35">
-  <changelog>
-    <docs>
-      Document the TLS rengotiation behaviour. (markt)
-    </docs>
-    <docs>
-      Add HOWTO-RELEASE.txt that describes the release process. (markt)
-    </docs>
-    <update>
-      Update recommended OpenSSL version to 1.1.1q or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.34">
-  <changelog>
-    <scode>
-      Refactor library initialization so it is compatible with Tomcat 10.1.x
-      onwards where a number of Java classes have been removed. (markt)
-    </scode>
-    <add>
-      Map the OpenSSL 3.x FIPS behaviour to the OpenSSL 1.x API to allow clients
-      to determine if the FIPS provider is being used when Tomcat Native is
-      compiled against OpenSSL 3.x. (markt)
-    </add>
-  </changelog>
-</section>
-<section name="Changes in 1.2.33">
-  <changelog>
-    <fix>
-      <bug>66035</bug>: Fix crash when attempting to read TLS session ID after a
-      handshake failure. (schultz/markt)
-    </fix>
-    <fix>
-      Enable <code>download_deps.sh</code> to be called from any directory. Pull
-      request <pr>12</pr> provided by Dimitrios Soumis. (markt)
-    </fix>
-    <update>
-      Update recommended OpenSSL version to 1.1.1o or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.32">
-  <changelog>
-    <update>
-      Update recommended OpenSSL version to 1.1.1n or later. (markt)
-    </update>
-    <fix>
-      Fix release script so it works with the current git layout. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.31">
-  <changelog>
-    <fix>
-      <bug>65441</bug>: Correct previous fix that enabled building to continue
-      with OpenSSL 3.x. Patch provided by lzsiga. (markt)
-    </fix>
-    <fix>
-      <bug>65659</bug>: Remove remaining reference to <code>pkg-config</code>
-      which is no longer included in the Tomcat Native distribution. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.30">
-  <changelog>
-    <add>
-      <bug>65181</bug>: Additional changes required to provided support for
-      using OpenSSL Engines that use proprietary key formats. Based on a patch
-      provided by Edin Hodzic. (markt)
-    </add>
-    <fix>
-      <bug>65329</bug>: Correct handling of <code>WINVER</code> in make file to
-      use correct constant for Windows 7. Add constants for Windows 8,
-      Windows 8.1 and Windows 10. Rename <code>WINNT</code> to
-      <code>WIN2k</code> as it is used for Windows 2000 upwards, not Windows NT
-      upwards. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.29 (not released)">
-  <changelog>
-    <fix>
-      Add a patch for APR that fixes an issue where some Windows systems in some
-      configurations would only listen on IPv6 addresses on dual stack systems
-      even though configured to listen on both IPv6 and IPv4 addresses.
-      (michaelo)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.28">
-  <changelog>
-    <fix>
-      Correct a regression in the fix for <bug>65181</bug> that prevented an
-      error message from being displayed if an invalid key file was provided
-      and no OpenSSL Engine was configured. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.27">
-  <changelog>
-    <add>
-      <bug>65181</bug>: Improve support for using OpenSSL Engines that use
-      proprietary key formats. Patch provided by Edin Hodzic. (markt)
-    </add>
-    <update>
-      Update recommended OpenSSL version to 1.1.1k or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.26">
-  <changelog>
-    <fix>
-      Enable building to continue against OpenSSL 3.x and 1.1.1. (markt)
-    </fix>
-    <add>
-      <bug>64942</bug>: Expose support for Unix Domain Sockets in APR v1.6 and up. (minfrin)
-    </add>
-    <update>
-      Update recommended OpenSSL version to 1.1.1i or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.25">
-  <changelog>
-    <fix>
-      Incomplete name mangling fix for C++ compilers in tcn_api.h. (michaelo)
-    </fix>
-    <update>
-      Improve OS-specific header include for native thread id. (michaelo)
-    </update>
-    <fix>
-      Disable keylog callback support for LibreSSL. (michaelo)
-    </fix>
-    <add>
-      Add support for <code>SSLContext.addChainCertificateRaw()</code> with
-      LibreSSL 2.9.1 and up. (michaelo)
-    </add>
-    <add>
-      Add support for HP-UX's _lwp_self() in our
-      ssl_thread_id(void). (michaelo)
-    </add>
-    <remove>
-      Remove default option passed for rpath to linker on HP-UX. (michaelo)
-    </remove>
-    <add>
-      Add an option to allow the OCSP responder check to be bypassed. Note that
-      if OCSP is enabled, a missing responder is now treated as an error.
-      (jfclere)
-    </add>
-    <fix>
-      <bug>64429</bug>: Fix compilation with LibreSSL. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.24">
-  <changelog>
-    <fix>
-      <bug>63671</bug>: libtcnative does not compile with OpenSSL &lt; 1.1.0
-      and APR w/o threading support. (michaelo)
-    </fix>
-    <fix>
-      Correct configure message for OpenSSL libdir. (michaelo)
-    </fix>
-    <update>
-      <bug>64260</bug>: Clean up install target. (michaelo)
-    </update>
-    <fix>
-      <bug>64315</bug>: configure output for OpenSSL wrong/incomplete sometimes.
-      (michaelo)
-    </fix>
-    <update>
-      Drop obsolete build time workarounds for HP-UX. (michaelo)
-    </update>
-    <add>
-      Add support for FreeBSD's pthread_getthreadid_np() in our
-      ssl_thread_id(void). (michaelo)
-    </add>
-    <update>
-      <bug>63701</bug>: Use new OpenSSL initialisation process when building with
-      OpenSSL 1.1.0 onwards. (mturk)
-    </update>
-    <add>
-      <bug>64316</bug>: Introduce tcn_get_thread_id(void) to reduce code
-	  duplication. (michaelo)
-    </add>
-    <fix>
-      Fix linking against OpenSSL in non-standard locations on FreeBSD.
-      (michaelo)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.23">
-  <changelog>
-    <fix>
-      Make file fixes to enable building with APR 1.7.x. (markt)
-    </fix>
-    <fix>
-      Switch to Windows 7 as the default target. (markt)
-    </fix>
-    <update>
-      Update minimum OpenSSL version to 1.0.2r. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.22">
-  <changelog>
-    <fix>
-      <bug>63159</bug>: Unable to complete build when build directory is
-      outside of the source tree. Patch provided by Bob Huemmer. (markt)
-    </fix>
-    <fix>
-      <bug>63356</bug>: Fix client certificate authentication when a certificate
-      contains an AIA extension without an OCSP URI. Patch provided by Milind
-      Takawale. (markt)
-    </fix>
-    <fix>
-      <bug>63500</bug>: Fix JVM crash on Connector start when a certificate
-      revocation file or path is specified for OpenSSL. (markt)
-    </fix>
-    <add>
-      Add support for TLS key logging when using OpenSSL 1.1.1 or later. If the
-      environment variable SSLKEYLOGFILE is set then the TLS keys will be logged
-      to that file. Patch provided by John Kelly. (markt)
-    </add>
-    <fix>
-      Update build script after migration of soucre repository from Subversion
-      to Git. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.21">
-  <changelog>
-    <fix>
-      Correct a possible JVM crash during shutdown caused by a bug in the fix
-      for the per connection memory leak included in 1.2.20. (rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.20">
-  <changelog>
-    <fix>
-      Update includedir name to tomcat-native instead of apr. (csutherl)
-    </fix>
-    <fix>
-      Fix a minor memory leak. It occurred every time a TLS connector was
-      started so the impact was very unlikely to be noticed. (markt)
-    </fix>
-    <fix>
-      Fix some minor memory leaks that could occur after error conditions during
-      TLS connector initialisation. (markt)
-    </fix>
-    <fix>
-      Fix a per connection memory leak when using OpenSSL BIO. This is typically
-      used when OpenSSL is providing the TLS support for NIO or NIO2. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.19">
-  <changelog>
-    <fix>
-      <bug>62892</bug>: Fix memory leaks in OCSP handling. (jfclere)
-    </fix>
-    <fix>
-      <bug>62944</bug>: Fix copy/paste error that prevented TLS 1.0 and TLS 1.1
-      from being used if TLS 1.3 was available. Patch provided by Dean Rasheed.
-      (markt)
-    </fix>
-    <fix>
-      Include OpenSSL licensing information in the Tomcat Native binaries for
-      Windows that are built with OpenSSL. (markt)
-    </fix>
-    <update>
-      Update recommended OpenSSL version to 1.0.2q or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.18">
-  <changelog>
-    <fix>
-      <bug>62641</bug>: libtool invocations should use --tag=CC. (michaelo)
-    </fix>
-    <scode>
-      Remove support for Netware as there has not been a supported Netware
-      platform for a number of years. (markt)
-    </scode>
-    <add>
-      <bug>62748</bug>: Add support for TLS 1.3 when built with OpenSSL 1.1.1 or
-      equivalent. (schultz/markt)
-    </add>
-    <add>
-      Expose the API necessary for CLIENT-CERT authentication to be correctly
-      supported when using Tomcat's JSSE implementation backed by OpenSSL.
-      (markt)
-    </add>
-  </changelog>
-</section>
-<section name="Changes in 1.2.17">
-  <changelog>
-    <fix>
-      <bug>62094</bug>: Certificate verification using CRL with
-      Tomcat APR connector does not work. (jfclere)
-    </fix>
-    <fix>
-      <bug>62122</bug>: undefined symbol: SSL_COMP_free_compression_methods. (jfclere)
-    </fix>
-    <fix>
-      <bug>62221</bug>: OCSP response processing uses always the first
-      entry in the response. (jfclere)
-    </fix>
-    <fix>
-      Further clean-up in the OCSP extension logic. (jfclere)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.16">
-  <changelog>
-    <fix>
-      Further clean-up in the parsing of the OCSP extension. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.15">
-  <changelog>
-    <update>
-      Update recommended OpenSSL version to 1.0.2m. (markt)
-    </update>
-    <fix>
-      Correctly calculate field lengths when parsing the OCSP extension so
-      that longer values are read correctly. (markt)
-    </fix>
-    <update>
-      Update the recommended APR version to 1.6.3 or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.14">
-  <changelog>
-    <fix>
-      Fix a small memory leak during certificate initialization. (rjung)
-    </fix>
-    <fix>
-      Replace use of deprecated <code>ASN1_STRING_data</code> with
-      <code>ASN1_STRING_get0_data</code> when building against
-      OpenSSL 1.1.0 and newer. (rjung)
-    </fix>
-    <fix>
-      Fix a thread local key leak. Only relevant when doing
-      SSL.initialize() and Library.terminate() a lot of times. (rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.13">
-  <changelog>
-    <fix>
-      Add missing source files to Visual Studio project files. (wrowe)
-    </fix>
-    <add>
-      Add support for the OpenSSL SSL_CONF API. (rjung)
-    </add>
-    <add>
-      Add SSLContext.getCiphers(). (rjung)
-    </add>
-    <add>
-      Add method to add a single CA certificate to the list of CA certificates
-      which are accepted as issuers of client certificates. (rjung)
-    </add>
-    <fix>
-      Fix an error not announcing the correct CA list for client certificates
-      during TLS handshake. (rjung)
-    </fix>
-    <fix>
-      Fix renegotiation to obtain a client certificate from a user agent.
-      (markt)
-    </fix>
-    <fix>
-      <bug>58434</bug>: Allow Tomcat Native to be compiled with LibreSSL. Note
-      that some features may not be available when using LibreSSL. (markt)
-    </fix>
-    <fix>
-      <bug>60290</bug>: When building Tomcat Native, don't ignore the value of
-      <code>CC</code> if explicitly set. Patch provided by Michael Osipov.
-      (markt)
-    </fix>
-    <fix>
-      <bug>60301</bug>: When building Tomcat Native, allow the user to override
-      the libtool specified by APR by setting the <code>LIBTOOL</code>
-      environment variable. (markt)
-    </fix>
-    <update>
-      Update build to use APR 1.6.x, with 1.6.2 recommended. (markt)
-    </update>
-    <update>
-      Update recommended OpenSSL version to 1.0.2l. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.12">
-  <changelog>
-    <fix>
-      Correct a regression in the fix for <bug>59797</bug> that triggered a JVM
-      crash on shutdown in some Tomcat unit tests when using the APR/native
-      connector. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.11">
-  <changelog>
-    <fix>
-      <bug>52627</bug>: Prevent a crash in <code>File.infoGet()</code> caused by
-      the use of uninitialised variables. Based on patch by Ilya Maykov. (markt)
-    </fix>
-    <fix>
-      <bug>55113</bug>: Document the process for creating a static tc-native
-      library with a FIPS-enabled OpenSSL and update the nmake make file to
-      support the process. (markt)
-    </fix>
-    <fix>
-      <bug>55114</bug>: Clean up building instructions for the native component
-      and expand the instructions for building for Windows platforms. (markt)
-    </fix>
-    <fix>
-      <bug>55938</bug>: Resolve remaining clang-analyzer warnings. Note that the
-      use of <code>-1</code> to indicate the full array in
-      <code>File.(read|write)[Full]</code> has been removed since it was only
-      partially implemented and the implementation was faulty. (markt)
-    </fix>
-    <fix>
-      <bug>58082</bug>: Update unit tests to use JUnit 4. Refactor unit tests
-      into separate tests and use an external to reference them in the same way
-      an external is used to reference the main code. (markt)
-    </fix>
-    <fix>
-      <bug>59797</bug>: Ensure that the per thread error hash maintained by
-      OpenSSL is cleaned up as individual threads exit to ensure it does not
-      grow too large. Patch provided by Nate Clark. (markt)
-    </fix>
-    <fix>
-      <bug>59996</bug>: Correctly handle building tc-native on a 64-bit system
-      when using an OpenSSL distribution that is not in <code>/usr</code>.
-      (csutherl)
-    </fix>
-    <fix>
-      <bug>60388</bug>: The --disable-maintainer-mode option of the configure
-      script no longer enables the maintainer mode. (ebourg)
-    </fix>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2k. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.10">
-  <changelog>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2j. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.9">
-  <changelog>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2i. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.8">
-  <changelog>
-    <fix>
-      <bug>59616</bug>: Correct the Windows build files so that OCSP is
-      correctly enabled and disabled in the respective Windows binaries. (markt)
-    </fix>
-    <fix>
-      Correctly handle OS level EAGAIN return codes during non-blocking TLS I/O.
-      (markt)
-    </fix>
-    <fix>
-      Correct a potential performance problem identified by Nate Clark due to
-      Tomcat Native providing OpenSSL with thread identifiers poorly suited to
-      the hash function used by OpenSSL when selecting a bucket for the hash
-      that holds the per thread error data. Tomcat Native on Windows and on
-      Solaris were not affected. A fix has been applied for OSX and Linux. Other
-      platforms may still be affected. (markt/rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.7">
-  <changelog>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2h. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.6">
-  <changelog>
-    <update>
-      Change the OpenSSL version check in <code>configure</code>
-      to be fatal. (rjung)
-    </update>
-    <update>
-      Use new OpenSSL 1.1.0 protocol version max and min API
-      when creating a new SSL context. (rjung)
-    </update>
-    <update>
-      Improve renegotiation code and make it compatible with
-      OpenSSL 1.1.0. (rjung)
-    </update>
-    <scode>
-      OpenSSL 1.1.0 compatibility updates. (rjung)
-    </scode>
-    <fix>
-      Fix some compiler warnings in native ssl code. (rjung)
-    </fix>
-    <add>
-      Add support for using Java keystores for certificate chains. (markt)
-    </add>
-    <update>
-      Remove the explicit CRL check when verifying certificates.
-      The checks were already part of the internal certification
-      verification since OpenSSL 0.9.7. Backport from mod_ssl.
-      (rjung)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.5">
-  <changelog>
-    <update>
-      Enable OpenSSL version check in <code>configure</code> by
-      default. It can be turned off using
-      <code>--disable-openssl-version-check</code>. (rjung)
-    </update>
-    <fix>
-      <bug>59024</bug>: Native function <code>versionString()</code> and
-      for OpenSSL 1.1.0 also <code>version()</code> (both in in ssl.c) now
-      return the OpenSSL run time version, not the compile time version.
-      (rjung)
-    </fix>
-    <scode>
-      Track changes in the OpenSSL master branch so it is possible to build
-      Tomcat Native with that branch. (billbarker)
-    </scode>
-  </changelog>
-</section>
-<section name="Changes in 1.2.4">
-  <changelog>
-    <fix>
-      SSL.getHandshakeCount(), which was unused, now returns the handshake
-      completed count rather than the handshake started count. (remm)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.3">
-  <changelog>
-    <fix>
-      Remove Java classes that do not have C implementation code
-      for their native methods in the current library. They were
-      used for NPN support which is superseded by ALPN support
-      in the current code. (kkolinko)
-    </fix>
-    <fix>
-      Fix typo in declaration of a stub method used when the library is
-      compiled without OpenSSL support. (kkolinko)
-    </fix>
-    <fix>
-      Fix the signature of the implementation of the native SSL method
-      newSSL() in the case when OPENSSL is not available. (rjung)
-    </fix>
-    <fix>
-      Fix the signature of the implementation of the native SSLSocket
-      method getInfoB() to return jbyteArray instead of jobject.
-      This is consistent with what it actually returns and how
-      the native Java method is declared. (rjung)
-    </fix>
-    <add>
-      Add support for using Java keystores for certificates and keys. (jfclere)
-    </add>
-    <scode>
-      Remove code that performs a read after a renegotiation that appears to be
-      unnecessary with OpenSSL 1.0.2. (billbarker)
-    </scode>
-    <add>
-      Expose <code>SSL_renegotiate</code> to the Java API. (remm)
-    </add>
-  </changelog>
-</section>
-<section name="Changes in 1.2.2">
-  <changelog>
-    <fix>
-      Fix broken debug and maintainer mode build. (rjung)
-    </fix>
-    <fix>
-      Forward port additional fixes to the OpenSSL I/O to align it with
-      non-OpenSSL I/O. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.1">
-  <changelog>
-    <fix>
-      <bug>58566</bug>: Enable Tomcat Native 1.2.x to work with Tomcat releases
-      that do not have the necessary Java code to support SNI. (markt)
-    </fix>
-    <update>
-      Minor rework of "buildconf" script. (rjung)
-    </update>
-    <fix>
-      Fix APR dependency version expression in RPM spec file. (rjung)
-    </fix>
-    <fix>
-      Fix major library version number in Windows build files, RPM spec file
-      and build description. (rjung)
-    </fix>
-    <fix>
-      Remove files "KEYS" and "download_deps.sh" from Windows (zip)
-      source distribution. (rjung)
-    </fix>
-    <fix>
-      Fix "unused variable" compiler warning. (rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.0">
-  <changelog>
-    <add>
-      Add support for TLS extension ALPN. (markt)
-    </add>
-    <add>
-      Add support for TLS extension SNI (Server Name Indication).
-      (markt)
-    </add>
-    <add>
-      Add support for OpenSSL BIO. (jfclere)
-    </add>
-    <add>
-      Support wakeable pollsets and add Poll.interrupt() API.
-      (mturk)
-    </add>
-    <add>
-      Add Pool.unmanaged() API. (mturk)
-    </add>
-    <update>
-      APIs SSL.generateRSATempKey() and SSL.loadDSATempKey()
-      have been removed. (rjung)
-    </update>
-    <update>
-      The minimum required APR version is 1.4.3.
-    </update>
-    <update>
-      The minimum required OpenSSL version is 1.0.2.
-    </update>
-  </changelog>
+<section name="Changes in 1.2.x">
+<p>Please see the <a href="../../native-1.2-doc/miscellaneous/changelog.html">1.2.x
+   changelog</a>.</p>
 </section>
 <section name="Changes in 1.1.x">
 <p>Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">1.1.x
diff --git a/xdocs/news/2008.xml b/xdocs/news/2008.xml
deleted file mode 100644
index 20e2d466a..000000000
--- a/xdocs/news/2008.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2008.html">
-
-  &project;
-
-  <properties>
-    <title>2008 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2008 News &amp; Status">
-<subsection anchor="20081118.1" name="18 November - TC-Native-1.1.16 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.16. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20080911.1" name="11 September - TC-Native-1.1.15 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.15. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20080704.1" name="4 July - TC-Native-1.1.14 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.14. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20080115.1" name="15 February - TC-Native-1.1.13 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.13. This is a stable release adding few new features
-and some bug fixes.
-</p><p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2009.xml b/xdocs/news/2009.xml
deleted file mode 100644
index 7bd0592aa..000000000
--- a/xdocs/news/2009.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2009.html">
-
-  &project;
-
-  <properties>
-    <title>2009 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2009 News &amp; Status">
-<subsection anchor="20091123.1" name="23 November - TC-Native-1.1.18 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.18. This is a stable release adding some bug fixes.
-</p><p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2010.xml b/xdocs/news/2010.xml
deleted file mode 100644
index e407bd78c..000000000
--- a/xdocs/news/2010.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2010.html">
-
-  &project;
-
-  <properties>
-    <title>2010 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2010 News &amp; Status">
-<subsection anchor="20100217.1" name="17 February - TC-Native-1.1.20 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.20. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20100108.1" name="8 January - TC-Native-1.1.19 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.19. This is a stable release adding some bug fixes.
-</p><p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2012.xml b/xdocs/news/2012.xml
deleted file mode 100644
index 902d48f04..000000000
--- a/xdocs/news/2012.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2012.html">
-
-  &project;
-
-  <properties>
-    <title>2012 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2012 News &amp; Status">
-<subsection anchor="20120613.1" name="13 June - TC-Native-1.1.24 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.24. This is a feature-add release adding support for
-per-socket Poller timeouts.
-</p>
-<p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-<subsection anchor="20120302.1" name="02 March - TC-Native-1.1.23 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.23. This is a stable release adding some bug fixes and
-experimental support for OCSP and PKCS12 certificates.
-</p>
-<p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2013.xml b/xdocs/news/2013.xml
deleted file mode 100644
index 55230ba6b..000000000
--- a/xdocs/news/2013.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2013.html">
-
-  &project;
-
-  <properties>
-    <title>2013 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2013 News &amp; Status">
-<subsection anchor="20131015.1" name="15 October - TC-Native-1.1.29 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.29. This is a bug fixing release.
-</p>
-</subsection>
-<subsection anchor="20130916.1" name="16 September - TC-Native-1.1.28 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.28. This is a bug fixing release.
-</p>
-<p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-<subsection anchor="20130212.1" name="12 February - TC-Native-1.1.27 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.27. This is a bug fixing release.
-</p>
-<p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2014.xml b/xdocs/news/2014.xml
deleted file mode 100644
index 76e6a76b8..000000000
--- a/xdocs/news/2014.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2014.html">
-
-  &project;
-
-  <properties>
-    <title>2014 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2014 News &amp; Status">
- <subsection anchor="20141023.1" name="23 October 2014 - TC-Native-1.1.32 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.32. This release add support for TLSv1.1 and TLSv1.2 and
-  includes Windows binaries built with OpenSSL 1.0.1j and APR 1.5.1.
-  </p>
- </subsection>    
- <subsection anchor="20140707.1" name="7 July 2014 - TC-Native-1.1.31 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.31. This is a bug fixing release and includes Windows
-  binaries built with OpenSSL 1.0.1h.
-  </p>
- </subsection>    
- <subsection anchor="20140415.1" name="15 April - TC-Native-1.1.30 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.30. This is a bug fixing release with added support for
-  EC ciphers if supported by OpenSSL.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2015.xml b/xdocs/news/2015.xml
deleted file mode 100644
index c5c821161..000000000
--- a/xdocs/news/2015.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2015.html">
-
-  &project;
-
-  <properties>
-    <title>2015 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2015 News &amp; Status">
- <subsection anchor="20151215" name="12 Dec 2015 - TC-Native-1.2.3 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.3. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2e and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20151109" name="9 Nov 2015 - TC-Native-1.2.2 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.2. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2d and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20151028" name="28 Oct 2015 - TC-Native-1.2.0 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.0. This is the first release of the 1.2.x series that
-  provides ALPN, SNI and OpenSSl BIO support. It includes Windows binaries built
-  with OpenSSL 1.0.2d and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20150323.1" name="23 March 2015 - TC-Native-1.1.33 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.33. This is a bug fixing release and includes Windows
-  binaries built with OpenSSL 1.0.1m and APR 1.5.1.
-  </p>
- </subsection>    
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2016.xml b/xdocs/news/2016.xml
deleted file mode 100644
index 4a5fd66cb..000000000
--- a/xdocs/news/2016.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2016.html">
-
-  &project;
-
-  <properties>
-    <title>2016 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2016 News &amp; Status">
- <subsection anchor="20161005" name="5 October 2016 - TC-Native-1.2.10 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.10. This is a release to update dependencies for the
-  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2j and
-  APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160702" name="2 July 2016 - TC-Native-1.2.8 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.8. This is a bug fix release release and includes Windows
-  binaries built with OpenSSL 1.0.2h and APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160508" name="8 May 2016 - TC-Native-1.2.7 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.7. This is a release to update dependencies for the
-  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2h and
-  APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160426" name="26 Apr 2016 - TC-Native-1.2.6 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.6. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2g and APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160307" name="7 Mar 2016 - TC-Native-1.2.5 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.5. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2g and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20160111" name="11 Jan 2016 - TC-Native-1.2.4 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.4. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2e and APR 1.5.1.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2017.xml b/xdocs/news/2017.xml
deleted file mode 100644
index 405b06ed3..000000000
--- a/xdocs/news/2017.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2017.html">
-
-  &project;
-
-  <properties>
-    <title>2017 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2017 News &amp; Status">
- <subsection anchor="20171120" name="20 Nov 2017 - TC-Native-1.2.16 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.16. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built with
-  OpenSSL 1.0.2m and APR 1.6.3.
-  </p>
- </subsection>
- <subsection anchor="20170904" name="4 Sep 2017 - TC-Native-1.2.14 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.14. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built with
-  OpenSSL 1.0.2l and APR 1.6.2.
-  </p>
- </subsection>
- <subsection anchor="20170221" name="21 Feb 2017 - TC-Native-1.2.12 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.12. This is a release to update dependencies for the
-  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2k and
-  APR 1.5.2.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2018.xml b/xdocs/news/2018.xml
deleted file mode 100644
index 2da1fdd7f..000000000
--- a/xdocs/news/2018.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2018.html">
-
-  &project;
-
-  <properties>
-    <title>2018 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2018 News &amp; Status">
- <subsection anchor="20181204" name="4 Dec 2018 - TC-Native-1.2.19 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.19. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built
-  with OpenSSL 1.0.2q/APR 1.6.5 and 1.1.1a/APR 1.6.5.
-  </p>
- </subsection>
- <subsection anchor="20181020" name="20 Oct 2018 - TC-Native-1.2.18 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.18. This is a feature and bugfix release that adds TLSv1.3
-  support when built with OpenSSL 1.1.1. It also includes Windows binaries built
-  with OpenSSL 1.0.2p/APR 1.6.5 and 1.1.1/APR 1.6.5.
-  </p>
- </subsection>
- <subsection anchor="20180613" name="13 Jun 2018 - TC-Native-1.2.17 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.17. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built with
-  OpenSSL 1.0.2o and APR 1.6.3.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2019.xml b/xdocs/news/2019.xml
deleted file mode 100644
index 7c8fa5819..000000000
--- a/xdocs/news/2019.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2019.html">
-
-  &project;
-
-  <properties>
-    <title>2019 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2019 News &amp; Status">
- <subsection anchor="20190702" name="07 Jul 2019 - TC-Native-1.2.23 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.23. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20190131" name="31 Jan 2019 - TC-Native-1.2.21 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.21. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2020.xml b/xdocs/news/2020.xml
deleted file mode 100644
index 3f96ff0c7..000000000
--- a/xdocs/news/2020.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2020.html">
-
-  &project;
-
-  <properties>
-    <title>2020 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2020 News &amp; Status">
- <subsection anchor="20201221" name="21 Dec 2020 - TC-Native-1.2.26 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.26. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20200903" name="3 Sep 2020 - TC-Native-1.2.25 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.25. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20200429" name="29 Apr 2020 - TC-Native-1.2.24 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.24. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2021.xml b/xdocs/news/2021.xml
deleted file mode 100644
index 91263b1fe..000000000
--- a/xdocs/news/2021.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2021.html">
-
-  &project;
-
-  <properties>
-    <title>2021 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2021 News &amp; Status">
- <subsection anchor="20210901" name="1 Sep 2021 - TC-Native-1.2.31 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.31. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20210604" name="4 Jun 2021 - TC-Native-1.2.30 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.30. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20210406" name="6 Apr 2021 - TC-Native-1.2.28 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.28. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20210329" name="29 Mar 2021 - TC-Native-1.2.27 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.27. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2022.xml b/xdocs/news/2022.xml
deleted file mode 100644
index c3ef6eac8..000000000
--- a/xdocs/news/2022.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2022.html">
-
-  &project;
-
-  <properties>
-    <title>2022 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2022 News &amp; Status">
- <subsection anchor="20220712" name="12 July 2022 - TC-Native-1.2.35 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.35. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20220614" name="14 June 2022 - TC-Native-1.2.34 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.34. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20220509" name="5 May 2022 - TC-Native-1.2.33 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.33. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20220322" name="22 Mar 2022 - TC-Native-1.2.32 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.32. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2023.xml b/xdocs/news/2023.xml
deleted file mode 100644
index 052410b37..000000000
--- a/xdocs/news/2023.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2023.html">
-
-  &project;
-
-  <properties>
-    <title>2023 News and Status</title>
-  </properties>
-
-  <body>
-
-    <section name="2023 News &amp; Status">
-    
-      <subsection anchor="20231003" name="3 October 2023 - TC-Native-1.2.39 released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.39.</p>
-      </subsection>
-      
-      <subsection anchor="20230807" name="7 August 2023 - TC-Native-1.2.38 released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.38.</p>
-      </subsection>
-      
-      <subsection anchor="20230602" name="2 June 2023 - TC-Native-1.2.37 released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.37.</p>
-      </subsection>
-      
-      <subsection anchor="20230213" name="13 February 2023 - TC-Native-1.2.36 released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.36.</p>
-      </subsection>
-      
-    </section>
-    
-  </body>
-
-</document>
\ No newline at end of file
diff --git a/xdocs/news/2011.xml b/xdocs/news/2024.xml
similarity index 64%
rename from xdocs/news/2011.xml
rename to xdocs/news/2024.xml
index e24720167..26fd9aba2 100644
--- a/xdocs/news/2011.xml
+++ b/xdocs/news/2024.xml
@@ -18,25 +18,25 @@
 <!DOCTYPE document [
   <!ENTITY project SYSTEM "project.xml">
 ]>
-<document url="2011.html">
+<document url="2024.html">
 
   &project;
 
   <properties>
-    <title>2011 News and Status</title>
+    <title>2024 News and Status</title>
   </properties>
 
-<body>
+  <body>
 
-<section name="2011 News &amp; Status">
-<subsection anchor="20110808.1" name="08 August - TC-Native-1.1.22 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.22. This is a stable release adding some bug fixes.
-</p>
-<p>
- Please see the <a href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
+    <section name="2024 News &amp; Status">
+    
+      <subsection anchor="20240208" name="8 February 2024 - TC-Native-1.3.0 released">
+        <p>The Apache Tomcat team is proud to announce the immediate
+        availability of Tomcat Native 1.3.0.</p>
+      </subsection>
+      
+    </section>
+    
+  </body>
+
+</document>
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 05/09: Consistent formatting. Correct entries for 1.3. Add version to title.

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit e6f775502e1d0dcfc8c32d89c0d37b852b85abad
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 08:27:04 2024 +0000

    Consistent formatting. Correct entries for 1.3. Add version to title.
---
 xdocs/miscellaneous/project.xml | 36 +++++++++++-------------------------
 xdocs/news/project.xml          | 27 ++++++---------------------
 xdocs/project.xml               | 23 +++++------------------
 3 files changed, 22 insertions(+), 64 deletions(-)

diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml
index 1153ee1ea..601499db1 100644
--- a/xdocs/miscellaneous/project.xml
+++ b/xdocs/miscellaneous/project.xml
@@ -16,41 +16,27 @@
   limitations under the License.
 -->
 <project name="Apache Tomcat Native Documentation - Miscellaneous Documentation"
-        href="http://tomcat.apache.org/">
+    href="http://tomcat.apache.org/">
 
-    <title>The Apache Tomcat Native - Miscellaneous Documentation</title>
+  <title>The Apache Tomcat Native Library 1.3 - Miscellaneous Documentation</title>
 
-    <logo href="/images/tomcat.gif">
-      The Apache Tomcat Native - Miscellaneous Documentation
-    </logo>
-<body>
+  <logo href="/images/tomcat.gif">
+    The Apache Tomcat Native Library - Miscellaneous Documentation
+  </logo>
 
+  <body>
     <menu name="Links">
-        <item name="Docs Home"                  href="../index.html"/>
+      <item name="Docs Home" href="../index.html"/>
     </menu>
 
     <menu name="Miscellaneous Documentation">
-        <item name="Changelog"                  href="../miscellaneous/changelog.html"/>
-        <item name="TLS renegotiation"          href="../miscellaneous/tls-renegotiation.html"/>
+      <item name="Changelog"         href="../miscellaneous/changelog.html"/>
+      <item name="TLS renegotiation" href="../miscellaneous/tls-renegotiation.html"/>
     </menu>
 
     <menu name="News">
-        <item name="2022"                       href="../news/2022.html"/>
-        <item name="2021"                       href="../news/2021.html"/>
-        <item name="2020"                       href="../news/2020.html"/>
-        <item name="2019"                       href="../news/2019.html"/>
-        <item name="2018"                       href="../news/2018.html"/>
-        <item name="2017"                       href="../news/2017.html"/>
-        <item name="2016"                       href="../news/2016.html"/>
-        <item name="2015"                       href="../news/2015.html"/>
-        <item name="2014"                       href="../news/2014.html"/>
-        <item name="2013"                       href="../news/2013.html"/>
-        <item name="2012"                       href="../news/2012.html"/>
-        <item name="2011"                       href="../news/2011.html"/>
-        <item name="2010"                       href="../news/2010.html"/>
-        <item name="2009"                       href="../news/2009.html"/>
-        <item name="2008"                       href="../news/2008.html"/>
+      <item name="2024" href="../news/2024.html"/>
     </menu>
 
-</body>
+  </body>
 </project>
diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml
index 115d900f0..c164c0e7c 100644
--- a/xdocs/news/project.xml
+++ b/xdocs/news/project.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <project name="Apache Tomcat Native Documentation - News"
-  href="http://tomcat.apache.org/">
+    href="http://tomcat.apache.org/">
 
-  <title>The Apache Tomcat Native - News</title>
+  <title>The Apache Tomcat Native Library 1.3 - News</title>
 
   <logo href="/images/tomcat.gif">
-    The Apache Tomcat Native - News
+    The Apache Tomcat Native Library - News
   </logo>
 
   <body>
@@ -30,27 +30,12 @@
     </menu>
 
     <menu name="Miscellaneous Documentation">
-      <item name="Changelog"           href="../miscellaneous/changelog.html"/>
-        <item name="TLS renegotiation" href="../miscellaneous/tls-renegotiation.html"/>
+      <item name="Changelog"         href="../miscellaneous/changelog.html"/>
+      <item name="TLS renegotiation" href="../miscellaneous/tls-renegotiation.html"/>
     </menu>
 
     <menu name="News">
-      <item name="2023" href="../news/2023.html"/>
-      <item name="2022" href="../news/2022.html"/>
-      <item name="2021" href="../news/2021.html"/>
-      <item name="2020" href="../news/2020.html"/>
-      <item name="2019" href="../news/2019.html"/>
-      <item name="2018" href="../news/2018.html"/>
-      <item name="2017" href="../news/2017.html"/>
-      <item name="2016" href="../news/2016.html"/>
-      <item name="2015" href="../news/2015.html"/>
-      <item name="2014" href="../news/2014.html"/>
-      <item name="2013" href="../news/2013.html"/>
-      <item name="2012" href="../news/2012.html"/>
-      <item name="2011" href="../news/2011.html"/>
-      <item name="2010" href="../news/2010.html"/>
-      <item name="2009" href="../news/2009.html"/>
-      <item name="2008" href="../news/2008.html"/>
+      <item name="2024" href="../news/2023.html"/>
     </menu>
 
   </body>
diff --git a/xdocs/project.xml b/xdocs/project.xml
index 9184f9688..7e135ed5e 100644
--- a/xdocs/project.xml
+++ b/xdocs/project.xml
@@ -16,12 +16,12 @@
   limitations under the License.
 -->
 <project name="Apache Tomcat Native Documentation"
-  href="http://tomcat.apache.org/">
+    href="http://tomcat.apache.org/">
 
-  <title>Apache Tomcat Native Library</title>
+  <title>The Apache Tomcat Native Library 1.3</title>
 
   <logo href="/images/tomcat.gif">
-    Apache Tomcat Native Library
+    The Apache Tomcat Native Library
   </logo>
 
   <body>
@@ -35,21 +35,8 @@
     </menu>
 
     <menu name="News">
-      <item name="2022" href="news/2022.html"/>
-      <item name="2021" href="news/2021.html"/>
-      <item name="2020" href="news/2020.html"/>
-      <item name="2019" href="news/2019.html"/>
-      <item name="2018" href="news/2018.html"/>
-      <item name="2017" href="news/2017.html"/>
-      <item name="2016" href="news/2016.html"/>
-      <item name="2015" href="news/2015.html"/>
-      <item name="2014" href="news/2014.html"/>
-      <item name="2013" href="news/2013.html"/>
-      <item name="2012" href="news/2012.html"/>
-      <item name="2011" href="news/2011.html"/>
-      <item name="2010" href="news/2010.html"/>
-      <item name="2009" href="news/2009.html"/>
-      <item name="2008" href="news/2008.html"/>
+      <item name="2024" href="news/2024.html"/>
     </menu>
+
   </body>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: (tomcat-native) branch 1.3.x created (now de94af367)

Posted by Mark Thomas <ma...@apache.org>.
On 05/02/2024 14:17, Mark Thomas wrote:
> On 05/02/2024 14:12, markt@apache.org wrote:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a change to branch 1.3.x
> 
> The 1.3.x might not be perfect but it builds with OpenSSL 1.1.1w and 
> 3.0.13 on Linux and all 9.0.x tests then all pass with Java 22 EA.
> 
> I've obviously messed something up as the jnirelease.sh script isn't 
> working yet. I want to get that working and test the Windows build 
> before I tag 1.3.0.

No issue with the script. Just needed to wait for gitbox to fully sync 
with GitHub.

I've run the 9.0.x tests on Windows as well for 1.3.x with OpenSSL 
3.0.13 and all is good. I'm going to tag 1.3.0 shortly.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: (tomcat-native) branch 1.3.x created (now de94af367)

Posted by Mark Thomas <ma...@apache.org>.
On 05/02/2024 14:12, markt@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a change to branch 1.3.x

The 1.3.x might not be perfect but it builds with OpenSSL 1.1.1w and 
3.0.13 on Linux and all 9.0.x tests then all pass with Java 22 EA.

I've obviously messed something up as the jnirelease.sh script isn't 
working yet. I want to get that working and test the Windows build 
before I tag 1.3.0.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 01/09: Update ignores

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 35606620d24f2de513032359fdbc0221dbe0555b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 07:56:25 2024 +0000

    Update ignores
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0081ec7c5..85ad0373d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 /native/configure~
 /native/libtcnative-1.la
 /native/libtcnative-2.la
+/native/libtool
 /native/tcnative.pc
 /native/tcnative.spec
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 04/09: Update ASF logo

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 07e76d7496e5079bee1da18fe10974db62a7d93b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 08:32:03 2024 +0000

    Update ASF logo
---
 xdocs/images/asf-feather.png | Bin 40042 -> 0 bytes
 xdocs/images/asf-logo.svg    | 226 +++++++++++++++++++++++++++++++++++++++++++
 xdocs/style.xsl              |   2 +-
 3 files changed, 227 insertions(+), 1 deletion(-)

diff --git a/xdocs/images/asf-feather.png b/xdocs/images/asf-feather.png
deleted file mode 100644
index 7b596e668..000000000
Binary files a/xdocs/images/asf-feather.png and /dev/null differ
diff --git a/xdocs/images/asf-logo.svg b/xdocs/images/asf-logo.svg
new file mode 100644
index 000000000..e24cbe529
--- /dev/null
+++ b/xdocs/images/asf-logo.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 7127.6 2890" enable-background="new 0 0 7127.6 2890" xml:space="preserve">
+<path fill="#6D6E71" d="M7104.7,847.8c15.3,15.3,22.9,33.7,22.9,55.2c0,21.5-7.6,39.9-22.9,55.4c-15.3,15.4-33.8,23.1-55.6,23.1
+	c-21.8,0-40.2-7.6-55.4-22.9c-15.1-15.3-22.7-33.7-22.7-55.2c0-21.5,7.6-39.9,22.9-55.4c15.3-15.4,33.7-23.1,55.4-23.1
+	C7070.9,824.9,7089.4,832.5,7104.7,847.8z M7098.1,951.9c13.3-13.6,20-29.8,20-48.7s-6.6-35-19.8-48.5
+	c-13.2-13.4-29.4-20.1-48.6-20.1c-19.2,0-35.4,6.7-48.7,20.2c-13.3,13.5-19.9,29.7-19.9,48.7c0,19,6.6,35.2,19.7,48.6
+	c13.1,13.4,29.3,20.1,48.5,20.1S7084.7,965.4,7098.1,951.9z M7087.1,888.1c0,14-6.1,22.8-18.4,26.4l22.5,30.5h-18.2l-20.3-28.3
+	h-18.6v28.3h-14.7v-84.6h31.8c12.8,0,22,2.2,27.6,6.6C7084.4,871.4,7087.1,878.4,7087.1,888.1z M7068.2,900c3-2.4,4.4-6.5,4.4-12
+	c0-5.5-1.5-9.4-4.5-11.6c-3-2.2-8.4-3.2-16-3.2h-18v30.5h17.5C7059.7,903.6,7065.3,902.4,7068.2,900z"/>
+<path fill="#6D6E71" d="M1803.6,499.8v155.4h-20V499.8h-56.8v-19.2h133.9v19.2H1803.6z"/>
+<path fill="#6D6E71" d="M2082.2,655.2v-76.9h-105.2v76.9h-20V480.5h20v78.9h105.2v-78.9h20v174.7H2082.2z"/>
+<path fill="#6D6E71" d="M2241.4,499.8v57.4h88.1v19.2h-88.1v59.8h101.8v19h-121.8V480.5H2340v19.2H2241.4z"/>
+<path fill="#D22128" d="M1574.5,1852.4l417.3-997.6h80.1l417.3,997.6h-105.4l-129.3-311.9h-448.2l-127.9,311.9H1574.5z M2032.6,970
+	l-205.1,493.2h404.7L2032.6,970z"/>
+<path fill="#D22128" d="M2596.9,1852.4V854.8H3010c171.4,0,295.1,158.8,295.1,313.3c0,163-115.2,316.1-286.6,316.1h-324.6v368.1
+	H2596.9z M2693.9,1397.1h318.9c118,0,193.9-108.2,193.9-229c0-125.1-92.7-226.2-202.3-226.2h-310.5V1397.1z"/>
+<path fill="#D22128" d="M3250.5,1852.4l417.3-997.6h80.1l417.3,997.6h-105.4l-129.3-311.9h-448.2l-127.9,311.9H3250.5z M3708.6,970
+	l-205.1,493.2h404.7L3708.6,970z"/>
+<path fill="#D22128" d="M4637.3,849.1c177,0,306.3,89.9,368.1,217.8l-78.7,47.8c-63.2-132.1-186.9-177-295.1-177
+	c-238.9,0-369.5,213.6-369.5,414.5c0,220.6,161.6,420.1,373.7,420.1c112.4,0,244.5-56.2,307.7-185.5l81.5,42.1
+	c-64.6,148.9-241.7,231.8-394.8,231.8c-274,0-466.5-261.3-466.5-514.2C4163.8,1106.3,4336.6,849.1,4637.3,849.1z"/>
+<path fill="#D22128" d="M5949.1,854.8v997.6h-98.4v-466.5h-591.5v466.5h-96.9V854.8h96.9v444h591.5v-444H5949.1z"/>
+<path fill="#D22128" d="M6844.6,1765.2v87.1h-670.2V854.8H6832v87.1h-560.6v359.7h489v82.9h-489v380.8H6844.6z"/>
+<path fill="#6D6E71" d="M1667.6,2063.6c11.8,3.5,22.2,8.3,31,14.2l-10.3,22.6c-9-6-18.6-10.4-28.9-13.4c-10.2-2.9-20-4.4-29.2-4.4
+	c-13.6,0-24.5,2.4-32.6,7.3c-8.1,4.9-12.2,11.8-12.2,20.7c0,7.6,2.3,14,6.8,19c4.5,5,10.2,8.9,17,11.7c6.8,2.8,16.1,6,28,9.6
+	c14.4,4.6,26,8.9,34.7,12.9c8.8,4,16.3,9.9,22.5,17.8c6.2,7.8,9.3,18.2,9.3,31c0,11.7-3.2,21.8-9.5,30.6
+	c-6.3,8.7-15.3,15.5-26.8,20.3c-11.6,4.8-24.9,7.2-40,7.2c-15.1,0-29.7-2.9-43.9-8.7c-14.2-5.8-26.4-13.6-36.6-23.4l10.7-21.6
+	c9.6,9.4,20.7,16.7,33.3,21.9c12.6,5.2,24.8,7.8,36.8,7.8c15.3,0,27.3-3,36.1-8.9c8.8-5.9,13.2-13.9,13.2-23.9
+	c0-7.8-2.3-14.3-6.9-19.4c-4.6-5.1-10.3-9-17.1-11.9c-6.8-2.8-16.1-6-28-9.6c-14.2-4.2-25.7-8.3-34.6-12.2
+	c-8.9-3.9-16.4-9.7-22.5-17.5c-6.1-7.7-9.2-17.9-9.2-30.6c0-10.9,3-20.4,9-28.6c6-8.2,14.6-14.6,25.6-19.1
+	c11.1-4.5,23.8-6.8,38.2-6.8C1643.8,2058.3,1655.7,2060.1,1667.6,2063.6z"/>
+<path fill="#6D6E71" d="M1980.1,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6
+	c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6
+	c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14
+	C1944.8,2058.6,1963.2,2063.3,1980.1,2072.8z M1881.9,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7
+	c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1
+	c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30
+	c-13-7.4-27.2-11.2-42.6-11.2C1909.4,2081.5,1895.1,2085.2,1881.9,2092.7z"/>
+<path fill="#6D6E71" d="M2186.5,2082.4v74h98.4v23.2h-98.4v90.2h-24.1v-210.6h133.8v23.2H2186.5z"/>
+<path fill="#6D6E71" d="M2491.6,2082.4v187.4h-24.1v-187.4h-68.4v-23.2h161.4v23.2H2491.6z"/>
+<path fill="#6D6E71" d="M2871.8,2269.8l-56.8-177.4l-57.6,177.4h-24.5l-70.5-210.6h25.9l57.9,182.7l57.1-182.4l24.1-0.3l57.7,182.7
+	l57.1-182.7h25l-70.6,210.6H2871.8z"/>
+<path fill="#6D6E71" d="M3087.3,2216.6l-23.5,53.2h-25.6l94.4-210.6h25l94.1,210.6h-26.1l-23.5-53.2H3087.3z M3144.5,2086.6
+	l-46.9,106.8h94.4L3144.5,2086.6z"/>
+<path fill="#6D6E71" d="M3461.1,2202.7c-6,0.4-10.7,0.6-14.1,0.6h-56v66.5H3367v-210.6h80c26.2,0,46.6,6.2,61.2,18.5
+	c14.5,12.3,21.8,29.8,21.8,52.3c0,17.2-4.1,31.7-12.2,43.3c-8.1,11.6-19.8,20-35,25l49.2,71.5h-27.3L3461.1,2202.7z M3491.3,2167.6
+	c10.3-8.4,15.5-20.8,15.5-37c0-15.9-5.2-27.9-15.5-36c-10.3-8.1-25.1-12.2-44.3-12.2h-56v97.8h56
+	C3466.2,2180.2,3481,2176,3491.3,2167.6z"/>
+<path fill="#6D6E71" d="M3688.3,2082.4v69.2h106.2v23.2h-106.2v72.1h122.8v22.9h-146.9v-210.6h142.9v23.2H3688.3z"/>
+<path fill="#6D6E71" d="M4147,2082.4v74h98.4v23.2H4147v90.2h-24.1v-210.6h133.8v23.2H4147z"/>
+<path fill="#6D6E71" d="M4523.3,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6
+	c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6
+	c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14
+	C4488.1,2058.6,4506.5,2063.3,4523.3,2072.8z M4425.2,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7
+	c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1
+	c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30
+	c-13-7.4-27.2-11.2-42.6-11.2C4452.6,2081.5,4438.3,2085.2,4425.2,2092.7z"/>
+<path fill="#6D6E71" d="M4854.7,2247.7c-15.7,15.5-37.3,23.3-64.8,23.3c-27.7,0-49.4-7.8-65.1-23.3c-15.7-15.5-23.6-37-23.6-64.6
+	v-124h24.1v124c0,20.3,5.8,36.1,17.3,47.5c11.6,11.4,27.3,17.1,47.3,17.1c20.1,0,35.8-5.7,47.1-17c11.4-11.3,17-27.2,17-47.7v-124
+	h24.1v124C4878.2,2210.7,4870.4,2232.2,4854.7,2247.7z"/>
+<path fill="#6D6E71" d="M5169.5,2269.8l-126.3-169.1v169.1h-24.1v-210.6h25l126.3,169.3v-169.3h23.8v210.6H5169.5z"/>
+<path fill="#6D6E71" d="M5478.4,2073.1c16.4,9.3,29.4,21.9,38.9,37.9c9.6,16,14.3,33.9,14.3,53.5s-4.8,37.6-14.3,53.6
+	c-9.5,16.1-22.6,28.7-39.3,37.9c-16.6,9.2-35.2,13.8-55.5,13.8h-84.3v-210.6h85.2C5443.7,2059.2,5462,2063.8,5478.4,2073.1z
+	 M5362.3,2246.9h61.4c15.5,0,29.6-3.5,42.3-10.6c12.7-7.1,22.8-16.9,30.2-29.5c7.4-12.5,11.1-26.5,11.1-42
+	c0-15.5-3.8-29.4-11.3-41.9c-7.5-12.5-17.7-22.3-30.6-29.6c-12.8-7.2-27-10.9-42.6-10.9h-60.5V2246.9z"/>
+<path fill="#6D6E71" d="M5668.6,2216.6l-23.5,53.2h-25.6l94.4-210.6h25l94.1,210.6H5807l-23.5-53.2H5668.6z M5725.8,2086.6
+	l-46.9,106.8h94.4L5725.8,2086.6z"/>
+<path fill="#6D6E71" d="M5991,2082.4v187.4H5967v-187.4h-68.4v-23.2h161.4v23.2H5991z"/>
+<path fill="#6D6E71" d="M6175.9,2269.8v-210.6h24.1v210.6H6175.9z"/>
+<path fill="#6D6E71" d="M6493.7,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6
+	c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6
+	c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14
+	C6458.5,2058.6,6476.9,2063.3,6493.7,2072.8z M6395.6,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7
+	c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1
+	c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30
+	c-13-7.4-27.2-11.2-42.6-11.2C6423,2081.5,6408.8,2085.2,6395.6,2092.7z"/>
+<path fill="#6D6E71" d="M6826.5,2269.8l-126.3-169.1v169.1h-24.1v-210.6h25l126.3,169.3v-169.3h23.8v210.6H6826.5z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-4516.6152" y1="-2338.7222" x2="-4108.4111" y2="-1861.3982" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0" style="stop-color:#F69923"/>
+	<stop  offset="0.3123" style="stop-color:#F79A23"/>
+	<stop  offset="0.8383" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M1230.1,13.7c-45.3,26.8-120.6,102.5-210.5,212.3l82.6,155.9c58-82.9,116.9-157.5,176.3-221.2
+	c4.6-5.1,7-7.5,7-7.5c-2.3,2.5-4.6,5-7,7.5c-19.2,21.2-77.5,89.2-165.5,224.4c84.7-4.2,214.9-21.6,321.1-39.7
+	c31.6-177-31-258-31-258S1323.4-41.4,1230.1,13.7z"/>
+<path fill="none" d="M1090.2,903.1c0.6-0.1,1.2-0.2,1.8-0.3l-11.9,1.3c-0.7,0.3-1.4,0.7-2.1,1
+	C1082.1,904.4,1086.2,903.7,1090.2,903.1z"/>
+<path fill="none" d="M1005.9,1182.3c-6.7,1.5-13.7,2.7-20.7,3.7C992.3,1185,999.2,1183.8,1005.9,1182.3z"/>
+<path fill="none" d="M432.9,1808.8c0.9-2.3,1.8-4.7,2.6-7c18.2-48,36.2-94.7,54-140.1c20-51,39.8-100.4,59.3-148.3
+	c20.6-50.4,40.9-99.2,60.9-146.3c21-49.4,41.7-97,62-142.8c16.5-37.3,32.8-73.4,48.9-108.3c5.4-11.7,10.7-23.2,16-34.6
+	c10.5-22.7,21-44.8,31.3-66.5c9.5-20,19-39.6,28.3-58.8c3.1-6.4,6.2-12.8,9.3-19.1c0.5-1,1-2,1.5-3.1l-10.2,1.1l-8-15.9
+	c-0.8,1.6-1.6,3.1-2.4,4.6c-14.5,28.8-28.9,57.9-43.1,87.2c-8.2,16.9-16.4,34-24.6,51c-22.6,47.4-44.8,95.2-66.6,143.3
+	c-22.1,48.6-43.7,97.5-64.9,146.5c-20.8,48.1-41.3,96.2-61.2,144.2c-20,48-39.5,95.7-58.5,143.2c-19.9,49.5-39.2,98.7-58,147.2
+	c-4.2,10.9-8.5,21.9-12.7,32.8c-15,39.2-29.7,77.8-44,116l12.7,25.1l11.4-1.2c0.4-1.1,0.8-2.3,1.3-3.4
+	C396.7,1905.4,414.9,1856.4,432.9,1808.8z"/>
+<path fill="none" d="M980,1186.8L980,1186.8c0.1,0,0.1,0,0.1-0.1C980.1,1186.8,980.1,1186.8,980,1186.8z"/>
+<path fill="#BE202E" d="M952.6,1323c-10.6,1.9-21.4,3.8-32.5,5.7c-0.1,0-0.1,0.1-0.2,0.1c5.6-0.8,11.2-1.7,16.6-2.6
+	C942,1325.2,947.3,1324.1,952.6,1323z"/>
+<path opacity="0.35" fill="#BE202E" d="M952.6,1323c-10.6,1.9-21.4,3.8-32.5,5.7c-0.1,0-0.1,0.1-0.2,0.1c5.6-0.8,11.2-1.7,16.6-2.6
+	C942,1325.2,947.3,1324.1,952.6,1323z"/>
+<path fill="#BE202E" d="M980.3,1186.7C980.2,1186.7,980.2,1186.7,980.3,1186.7c-0.1,0.1-0.2,0.1-0.2,0.1c1.8-0.2,3.5-0.5,5.2-0.8
+	c7-1,13.9-2.2,20.7-3.7C997.5,1183.8,989,1185.2,980.3,1186.7L980.3,1186.7L980.3,1186.7z"/>
+<path opacity="0.35" fill="#BE202E" d="M980.3,1186.7C980.2,1186.7,980.2,1186.7,980.3,1186.7c-0.1,0.1-0.2,0.1-0.2,0.1
+	c1.8-0.2,3.5-0.5,5.2-0.8c7-1,13.9-2.2,20.7-3.7C997.5,1183.8,989,1185.2,980.3,1186.7L980.3,1186.7L980.3,1186.7z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-7537.7339" y1="-2391.4075" x2="-4625.4141" y2="-2391.4075" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0.3233" style="stop-color:#9E2064"/>
+	<stop  offset="0.6302" style="stop-color:#C92037"/>
+	<stop  offset="0.7514" style="stop-color:#CD2335"/>
+	<stop  offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M858.6,784.7c25.1-46.9,50.5-92.8,76.2-137.4c26.7-46.4,53.7-91.3,80.9-134.7
+	c1.6-2.6,3.2-5.2,4.8-7.7c27-42.7,54.2-83.7,81.6-122.9L1019.5,226c-6.2,7.6-12.5,15.3-18.8,23.2c-23.8,29.7-48.6,61.6-73.9,95.5
+	c-28.6,38.2-58,78.9-87.8,121.7c-27.6,39.5-55.5,80.9-83.5,123.7c-23.8,36.5-47.7,74-71.4,112.5c-0.9,1.4-1.8,2.9-2.6,4.3
+	l107.5,212.3C811.8,873.6,835.1,828.7,858.6,784.7z"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-7186.1777" y1="-2099.3059" x2="-5450.7183" y2="-2099.3059" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0" style="stop-color:#282662"/>
+	<stop  offset="9.548390e-02" style="stop-color:#662E8D"/>
+	<stop  offset="0.7882" style="stop-color:#9F2064"/>
+	<stop  offset="0.9487" style="stop-color:#CD2032"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M369,1981c-14.2,39.1-28.5,78.9-42.9,119.6c-0.2,0.6-0.4,1.2-0.6,1.8c-2,5.7-4.1,11.5-6.1,17.2
+	c-9.7,27.4-18,52.1-37.3,108.2c31.7,14.5,57.1,52.5,81.1,95.6c-2.6-44.7-21-86.6-56.2-119.1c156.1,7,290.6-32.4,360.1-146.6
+	c6.2-10.2,11.9-20.9,17-32.2c-31.6,40.1-70.8,57.1-144.5,53c-0.2,0.1-0.3,0.1-0.5,0.2c0.2-0.1,0.3-0.1,0.5-0.2
+	c108.6-48.6,163.1-95.3,211.2-172.6c11.4-18.3,22.5-38.4,33.8-60.6c-94.9,97.5-205,125.3-320.9,104.2l-86.9,9.5
+	C374.4,1966.3,371.7,1973.6,369,1981z"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2418.5454" x2="-4461.8428" y2="-2418.5454" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0.3233" style="stop-color:#9E2064"/>
+	<stop  offset="0.6302" style="stop-color:#C92037"/>
+	<stop  offset="0.7514" style="stop-color:#CD2335"/>
+	<stop  offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_4_)" d="M409.6,1786.3c18.8-48.5,38.1-97.7,58-147.2c19-47.4,38.5-95.2,58.5-143.2
+	c20-48,40.4-96.1,61.2-144.2c21.2-49,42.9-97.8,64.9-146.5c21.8-48.1,44-95.9,66.6-143.3c8.1-17.1,16.3-34.1,24.6-51
+	c14.2-29.3,28.6-58.4,43.1-87.2c0.8-1.6,1.6-3.1,2.4-4.6L681.4,706.8c-1.8,2.9-3.5,5.8-5.3,8.6c-25.1,40.9-50,82.7-74.4,125.4
+	c-24.7,43.1-49,87.1-72.7,131.7c-20,37.6-39.6,75.6-58.6,113.9c-3.8,7.8-7.6,15.5-11.3,23.2c-23.4,48.2-44.6,94.8-63.7,139.5
+	c-21.7,50.7-40.7,99.2-57.5,145.1c-11,30.2-21,59.4-30.1,87.4c-7.5,24-14.7,47.9-21.5,71.8c-16,56.3-29.9,112.4-41.2,168.3
+	L353,1935.1c14.3-38.1,28.9-76.8,44-116C401.1,1808.2,405.4,1797.3,409.6,1786.3z"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-7161.7642" y1="-2379.1431" x2="-5631.2524" y2="-2379.1431" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0" style="stop-color:#282662"/>
+	<stop  offset="9.548390e-02" style="stop-color:#662E8D"/>
+	<stop  offset="0.7882" style="stop-color:#9F2064"/>
+	<stop  offset="0.9487" style="stop-color:#CD2032"/>
+</linearGradient>
+<path fill="url(#SVGID_5_)" d="M243.5,1729.4c-13.6,68.2-23.2,136.2-28,203.8c-0.2,2.4-0.4,4.7-0.5,7.1
+	c-33.7-54-124-106.8-123.8-106.2c64.6,93.7,113.7,186.7,120.9,278c-34.6,7.1-82-3.2-136.8-23.3c57.1,52.5,100,67,116.7,70.9
+	c-52.5,3.3-107.1,39.3-162.1,80.8c80.5-32.8,145.5-45.8,192.1-35.3C148.1,2414.2,74.1,2645,0,2890c22.7-6.7,36.2-21.9,43.9-42.6
+	c13.2-44.4,100.8-335.6,238-718.2c3.9-10.9,7.8-21.8,11.8-32.9c1.1-3,2.2-6.1,3.3-9.2c14.5-40.1,29.5-81.1,45.1-122.9
+	c3.5-9.5,7.1-19,10.7-28.6c0.1-0.2,0.1-0.4,0.2-0.6l-107.9-213.2C244.6,1724.4,244,1726.9,243.5,1729.4z"/>
+<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2117.1309" x2="-4461.8428" y2="-2117.1309" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0.3233" style="stop-color:#9E2064"/>
+	<stop  offset="0.6302" style="stop-color:#C92037"/>
+	<stop  offset="0.7514" style="stop-color:#CD2335"/>
+	<stop  offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_6_)" d="M805.6,937c-3.1,6.3-6.2,12.7-9.3,19.1c-9.3,19.2-18.8,38.8-28.3,58.8
+	c-10.3,21.7-20.7,43.9-31.3,66.5c-5.3,11.4-10.6,22.9-16,34.6c-16.1,35-32.4,71.1-48.9,108.3c-20.3,45.8-41,93.4-62,142.8
+	c-20,47.1-40.3,95.9-60.9,146.3c-19.5,47.9-39.3,97.3-59.3,148.3c-17.8,45.4-35.9,92.1-54,140.1c-0.9,2.3-1.8,4.7-2.6,7
+	c-18,47.6-36.2,96.6-54.6,146.8c-0.4,1.1-0.8,2.3-1.3,3.4l86.9-9.5c-1.7-0.3-3.5-0.5-5.2-0.9c103.9-13,242.1-90.6,331.4-186.5
+	c41.1-44.2,78.5-96.3,113-157.3c25.7-45.4,49.8-95.8,72.8-151.5c20.1-48.7,39.4-101.4,58-158.6c-23.9,12.6-51.2,21.8-81.4,28.2
+	c-5.3,1.1-10.7,2.2-16.1,3.1c-5.5,1-11,1.8-16.6,2.6l0,0l0,0c0.1,0,0.1-0.1,0.2-0.1c96.9-37.3,158-109.2,202.4-197.4
+	c-25.5,17.4-66.9,40.1-116.6,51.1c-6.7,1.5-13.7,2.7-20.7,3.7c-1.7,0.3-3.5,0.6-5.2,0.8l0,0l0,0c0.1,0,0.1,0,0.1-0.1
+	c0,0,0.1,0,0.1,0l0,0c33.6-14.1,62-29.8,86.6-48.4c5.3-4,10.4-8.1,15.3-12.3c7.5-6.5,14.7-13.3,21.5-20.5c4.4-4.6,8.6-9.3,12.7-14.2
+	c9.6-11.5,18.7-23.9,27.1-37.3c2.6-4.1,5.1-8.3,7.6-12.6c3.2-6.2,6.3-12.3,9.3-18.3c13.5-27.2,24.4-51.5,33-72.8
+	c4.3-10.6,8.1-20.5,11.3-29.7c1.3-3.7,2.5-7.2,3.7-10.6c3.4-10.2,6.2-19.3,8.4-27.3c3.3-12,5.3-21.5,6.4-28.4l0,0l0,0
+	c-3.3,2.6-7.1,5.2-11.3,7.7c-29.3,17.5-79.5,33.4-119.9,40.8l79.8-8.8l-79.8,8.8c-0.6,0.1-1.2,0.2-1.8,0.3c-4,0.7-8.1,1.3-12.2,2
+	c0.7-0.3,1.4-0.7,2.1-1l-273,29.9C806.6,935,806.1,936,805.6,937z"/>
+<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-7554.8232" y1="-2132.0981" x2="-4642.5034" y2="-2132.0981" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0.3233" style="stop-color:#9E2064"/>
+	<stop  offset="0.6302" style="stop-color:#C92037"/>
+	<stop  offset="0.7514" style="stop-color:#CD2335"/>
+	<stop  offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_7_)" d="M1112.9,385.1c-24.3,37.3-50.8,79.6-79.4,127.5c-1.5,2.5-3,5.1-4.5,7.6
+	c-24.6,41.5-50.8,87.1-78.3,137c-23.8,43.1-48.5,89.3-74.3,139c-22.4,43.3-45.6,89.2-69.4,137.8l273-29.9
+	c79.5-36.6,115.1-69.7,149.6-117.6c9.2-13.2,18.4-27,27.5-41.3c28-43.8,55.6-92,80.1-139.9c23.7-46.3,44.7-92.2,60.7-133.5
+	c10.2-26.3,18.4-50.8,24.1-72.3c5-19,8.9-36.9,11.9-54.1C1327.9,363.5,1197.6,380.9,1112.9,385.1z"/>
+<path fill="#BE202E" d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"/>
+<path opacity="0.35" fill="#BE202E" d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"/>
+<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2027.484" x2="-4461.8433" y2="-2027.484" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0.3233" style="stop-color:#9E2064"/>
+	<stop  offset="0.6302" style="stop-color:#C92037"/>
+	<stop  offset="0.7514" style="stop-color:#CD2335"/>
+	<stop  offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_8_)" d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"/>
+<path fill="#BE202E" d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"/>
+<path opacity="0.35" fill="#BE202E" d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"/>
+<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="-7374.1626" y1="-2037.7417" x2="-4461.8433" y2="-2037.7417" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0.3233" style="stop-color:#9E2064"/>
+	<stop  offset="0.6302" style="stop-color:#C92037"/>
+	<stop  offset="0.7514" style="stop-color:#CD2335"/>
+	<stop  offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_9_)" d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"/>
+<path fill="#BE202E" d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7L980.2,1186.7
+	C980.2,1186.7,980.2,1186.7,980.2,1186.7z"/>
+<path opacity="0.35" fill="#BE202E" d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7
+	L980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7z"/>
+<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="-5738.0635" y1="-2039.799" x2="-5094.3457" y2="-2039.799" gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 -2859.9343)">
+	<stop  offset="0.3233" style="stop-color:#9E2064"/>
+	<stop  offset="0.6302" style="stop-color:#C92037"/>
+	<stop  offset="0.7514" style="stop-color:#CD2335"/>
+	<stop  offset="1" style="stop-color:#E97826"/>
+</linearGradient>
+<path fill="url(#SVGID_10_)" d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7L980.2,1186.7
+	C980.2,1186.7,980.2,1186.7,980.2,1186.7z"/>
+</svg>
diff --git a/xdocs/style.xsl b/xdocs/style.xsl
index e7b1cb566..3def0fe66 100644
--- a/xdocs/style.xsl
+++ b/xdocs/style.xsl
@@ -34,7 +34,7 @@
   <xsl:param    name="home-href"        select="'http://tomcat.apache.org/'"/>
   <xsl:param    name="home-logo"        select="'/images/tomcat.png'"/>
   <xsl:param    name="home-stylesheet"  select="'/images/docs-stylesheet.css'"/>
-  <xsl:param    name="apache-logo"      select="'/images/asf-feather.png'"/>
+  <xsl:param    name="apache-logo"      select="'/images/asf-logo.svg'"/>
   <xsl:param    name="relative-path"    select="'.'"/>
   <xsl:param    name="buglink"          select="'https://bz.apache.org/bugzilla/show_bug.cgi?id='"/>
   <xsl:param    name="prlink"           select="'https://github.com/apache/tomcat-native/pull/'"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 07/09: First pass at reviewing use of OPENSSL_VERSION_NUMBER

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit fdd91723488cb47de3319dbee40ca31ee036dcc3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 09:42:50 2024 +0000

    First pass at reviewing use of OPENSSL_VERSION_NUMBER
---
 native/build/tcnative.m4     |   6 +-
 native/include/ssl_private.h |  10 ++--
 native/src/ssl.c             |  37 +++++-------
 native/src/sslcontext.c      | 138 ++++++-------------------------------------
 native/src/sslinfo.c         |   2 +-
 native/src/sslutils.c        |   7 ---
 6 files changed, 41 insertions(+), 159 deletions(-)

diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index 9681586ae..eee9710dc 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -240,16 +240,16 @@ AC_ARG_ENABLE(openssl-version-check,
         [disable the OpenSSL version check])])
 case "$enable_openssl_version_check" in
 yes|'')
-        AC_MSG_CHECKING(OpenSSL library version >= 1.0.2)
+        AC_MSG_CHECKING(OpenSSL library version >= 1.1.1)
         AC_TRY_RUN([
 #include <stdio.h>
 #include <openssl/opensslv.h>
 int main() {
-        if (OPENSSL_VERSION_NUMBER >= 0x1000200fL)
+        if (OPENSSL_VERSION_NUMBER >= 0x1010100fL)
             return (0);
     printf("\n\nFound   OPENSSL_VERSION_NUMBER %#010x (" OPENSSL_VERSION_TEXT ")\n",
         OPENSSL_VERSION_NUMBER);
-    printf("Require OPENSSL_VERSION_NUMBER 0x1000200f or greater (1.0.2)\n\n");
+    printf("Require OPENSSL_VERSION_NUMBER 0x1010100f or greater (1.1.1)\n\n");
         return (1);
 }
         ],
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index d90bc1f4b..286a50a04 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -217,8 +217,8 @@ extern ENGINE *tcn_ssl_engine;
 
 #endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */
 
-/* OpenSSL 1.0.2 compatibility */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+/* LibreSSL compatibility */
+#if defined(LIBRESSL_VERSION_NUMBER)
 #define OpenSSL_version                  SSLeay_version
 #define OpenSSL_version_num              SSLeay
 #define OPENSSL_VERSION                  SSLEAY_VERSION
@@ -243,9 +243,9 @@ extern ENGINE *tcn_ssl_engine;
 #define TLS_method                       SSLv23_method
 #define TLS_client_method                SSLv23_client_method
 #define TLS_server_method                SSLv23_server_method
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+#endif /* defined(LIBRESSL_VERSION_NUMBER) */
 
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
 #define HAVE_KEYLOG_CALLBACK
 #endif
 
@@ -401,7 +401,7 @@ int         SSL_callback_alpn_select_proto(SSL *, const unsigned char **, unsign
 void        SSL_callback_add_keylog(SSL_CTX *);
 #endif
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) && ! (defined(WIN32) || defined(WIN64))
+#if defined(LIBRESSL_VERSION_NUMBER) && ! (defined(WIN32) || defined(WIN64))
 unsigned long SSL_ERR_get(void);
 void SSL_ERR_clear(void);
 #else
diff --git a/native/src/ssl.c b/native/src/ssl.c
index ff716091f..a5bdaf43c 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -46,7 +46,7 @@ static void ssl_keylog_callback(const SSL *ssl, const char *line)
 static jclass byteArrayClass;
 static jclass stringClass;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
 /* Global reference to the pool used by the dynamic mutexes */
 static apr_pool_t *dynlockpool = NULL;
 
@@ -210,8 +210,8 @@ static const jint supported_ssl_opts = 0
 #endif
      | 0;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-/* OpenSSL Pre-1.1.0 compatibility */
+#if defined(LIBRESSL_VERSION_NUMBER)
+/* LibreSSL compatibility */
 /* Taken from OpenSSL 1.1.0 snapshot 20160410 */
 int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
 {
@@ -321,7 +321,7 @@ DH *SSL_get_dh_params(unsigned keylen)
     return NULL; /* impossible to reach. */
 }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
 static void init_bio_methods(void);
 static void free_bio_methods(void);
 #endif
@@ -349,7 +349,7 @@ static apr_status_t ssl_init_cleanup(void *data)
         return APR_SUCCESS;
     ssl_initialized = 0;
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) && ! (defined(WIN32) || defined(WIN64))
+#if defined(LIBRESSL_VERSION_NUMBER) && ! (defined(WIN32) || defined(WIN64))
     if (threadkey_initialized) {
         threadkey_initialized = 0;
         apr_threadkey_private_delete(thread_exit_key);
@@ -362,7 +362,7 @@ static apr_status_t ssl_init_cleanup(void *data)
                          tcn_password_callback.cb.obj);
     }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
     free_bio_methods();
 #endif
     free_dh_params();
@@ -375,7 +375,7 @@ static apr_status_t ssl_init_cleanup(void *data)
     }
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
     /* Openssl v1.1+ handles all termination automatically. Do
      * nothing in this case.
      */
@@ -397,7 +397,7 @@ static apr_status_t ssl_init_cleanup(void *data)
     SSL_COMP_free_compression_methods();
 #endif
     CRYPTO_cleanup_all_ex_data();
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
     ERR_remove_thread_state(NULL);
 #endif
 #endif
@@ -441,7 +441,7 @@ static ENGINE *ssl_try_load_engine(const char *engine)
  * To ensure thread-safetyness in OpenSSL
  */
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
 static apr_thread_mutex_t **ssl_lock_cs;
 static int                  ssl_lock_num_locks;
 
@@ -466,7 +466,7 @@ static unsigned long ssl_thread_id(void)
     return (unsigned long)tcn_get_thread_id();
 }
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
 #if ! (defined(WIN32) || defined(WIN64))
 void SSL_thread_exit(void) {
     ERR_remove_thread_state(NULL);
@@ -753,7 +753,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
 {
     jclass clazz;
     jclass sClazz;
-#if !defined(OPENSSL_NO_ENGINE) || OPENSSL_VERSION_NUMBER < 0x10100000L
+#if !defined(OPENSSL_NO_ENGINE)
     apr_status_t err = APR_SUCCESS;
 #endif
 
@@ -770,7 +770,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
         TCN_FREE_CSTRING(engine);
         return (jint)APR_SUCCESS;
     }
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
     /* Openssl v1.1+ handles all initialisation automatically, apart
      * from hints as to how we want to use the library.
      *
@@ -844,7 +844,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
     SSL_init_app_data_idx();
 
     init_dh_params();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
     init_bio_methods();
 #endif
 
@@ -1046,13 +1046,6 @@ static int jbs_new(BIO *bi)
     j->refcount  = 1;
     BIO_set_shutdown(bi, 1);
     BIO_set_init(bi, 0);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    /* No setter method for OpenSSL 1.1.0 available,
-     * but I can't find any functional use of the
-     * "num" field there either.
-     */
-    bi->num      = -1;
-#endif
     BIO_set_data(bi, (void *)j);
 
     return 1;
@@ -1182,7 +1175,7 @@ static long jbs_ctrl(BIO *b, int cmd, long num, void *ptr)
     return ret;
 }
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
 static BIO_METHOD jbs_methods = {
     BIO_TYPE_FILE,
     "Java Callback",
@@ -1218,7 +1211,7 @@ static void free_bio_methods(void)
 
 static BIO_METHOD *BIO_jbs()
 {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
     return(&jbs_methods);
 #else
     return jbs_methods;
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index 36cf11ed0..a2ddf8fce 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -132,7 +132,7 @@ int ssl_callback_ServerNameIndication(SSL *ssl, int *al, tcn_ssl_ctxt_t *c)
     return SSL_TLSEXT_ERR_OK;
 }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
 /*
  * This callback function is called when the ClientHello is received.
  */
@@ -236,7 +236,7 @@ give_up:
 
     return SSL_CLIENT_HELLO_SUCCESS;
 }
-#endif /* OPENSSL_VERSION_NUMBER < 0x10101000L */
+#endif
 
 /* Initialize server context */
 TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
@@ -247,9 +247,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
     SSL_CTX *ctx = NULL;
     jclass clazz;
     jclass sClazz;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
     jint prot;
-#endif
 
     UNREFERENCED(o);
     if (protocol == SSL_PROTOCOL_NONE) {
@@ -257,73 +255,13 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
         goto init_failed;
     }
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    if (protocol == SSL_PROTOCOL_TLSV1_3) {
-#ifdef HAVE_TLSV1_3
-        if (mode == SSL_MODE_CLIENT)
-            ctx = SSL_CTX_new(TLSv1_3_client_method());
-        else if (mode == SSL_MODE_SERVER)
-            ctx = SSL_CTX_new(TLSv1_3_server_method());
-        else
-            ctx = SSL_CTX_new(TLSv1_3_method());
-#endif
-    } else if (protocol == SSL_PROTOCOL_TLSV1_2) {
-#ifdef HAVE_TLSV1_2
-        if (mode == SSL_MODE_CLIENT)
-            ctx = SSL_CTX_new(TLSv1_2_client_method());
-        else if (mode == SSL_MODE_SERVER)
-            ctx = SSL_CTX_new(TLSv1_2_server_method());
-        else
-            ctx = SSL_CTX_new(TLSv1_2_method());
-#endif
-    } else if (protocol == SSL_PROTOCOL_TLSV1_1) {
-#ifdef HAVE_TLSV1_1
-        if (mode == SSL_MODE_CLIENT)
-            ctx = SSL_CTX_new(TLSv1_1_client_method());
-        else if (mode == SSL_MODE_SERVER)
-            ctx = SSL_CTX_new(TLSv1_1_server_method());
-        else
-            ctx = SSL_CTX_new(TLSv1_1_method());
-#endif
-    } else if (protocol == SSL_PROTOCOL_TLSV1) {
-        if (mode == SSL_MODE_CLIENT)
-            ctx = SSL_CTX_new(TLSv1_client_method());
-        else if (mode == SSL_MODE_SERVER)
-            ctx = SSL_CTX_new(TLSv1_server_method());
-        else
-            ctx = SSL_CTX_new(TLSv1_method());
-    } else if (protocol == SSL_PROTOCOL_SSLV3) {
-        if (mode == SSL_MODE_CLIENT)
-            ctx = SSL_CTX_new(SSLv3_client_method());
-        else if (mode == SSL_MODE_SERVER)
-            ctx = SSL_CTX_new(SSLv3_server_method());
-        else
-            ctx = SSL_CTX_new(SSLv3_method());
-    } else if (protocol == SSL_PROTOCOL_SSLV2) {
-        /* requested but not supported */
-#ifndef HAVE_TLSV1_3
-    } else if (protocol & SSL_PROTOCOL_TLSV1_3) {
-        /* requested but not supported */
-#endif
-#ifndef HAVE_TLSV1_2
-    } else if (protocol & SSL_PROTOCOL_TLSV1_2) {
-        /* requested but not supported */
-#endif
-#ifndef HAVE_TLSV1_1
-    } else if (protocol & SSL_PROTOCOL_TLSV1_1) {
-        /* requested but not supported */
-#endif
+    if (mode == SSL_MODE_CLIENT) {
+        ctx = SSL_CTX_new(TLS_client_method());
+    } else if (mode == SSL_MODE_SERVER) {
+        ctx = SSL_CTX_new(TLS_server_method());
     } else {
-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */
-        if (mode == SSL_MODE_CLIENT)
-                ctx = SSL_CTX_new(TLS_client_method());
-        else if (mode == SSL_MODE_SERVER)
-                ctx = SSL_CTX_new(TLS_server_method());
-        else
-                ctx = SSL_CTX_new(TLS_method());
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+        ctx = SSL_CTX_new(TLS_method());
     }
-#endif
 
     if (!ctx) {
         char err[256];
@@ -349,7 +287,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
         BIO_set_fp(c->bio_os, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
     SSL_CTX_set_options(c->ctx, SSL_OP_ALL);
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
     /* always disable SSLv2, as per RFC 6176 */
     SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
     if (!(protocol & SSL_PROTOCOL_SSLV3))
@@ -369,7 +307,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
         SSL_CTX_set_options(c->ctx, SSL_OP_NO_TLSv1_3);
 #endif
 
-#else /* if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
+#else /* if defined(LIBRESSL_VERSION_NUMBER) */
     /* We first determine the maximum protocol version we should provide */
 #ifdef HAVE_TLSV1_3
     if (protocol & SSL_PROTOCOL_TLSV1_3) {
@@ -409,7 +347,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
         prot = SSL3_VERSION;
     }
     SSL_CTX_set_min_proto_version(ctx, prot);
-#endif /* if OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif
 
     /*
      * Configure additional context ingredients
@@ -476,7 +414,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
     SSL_CTX_set_tlsext_servername_callback(c->ctx, ssl_callback_ServerNameIndication);
     SSL_CTX_set_tlsext_servername_arg(c->ctx, c);
 
-#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
     /*
      * The ClientHello callback also allows to retrieve the SNI, but since it
      * runs at the earliest possible connection stage we can even set the TLS
@@ -653,7 +591,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext, getCiphers)(TCN_STDARGS, jlong ctx)
     const char *name;
     int i;
     jstring c_name;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
     SSL *ssl;
 #endif
 
@@ -666,7 +604,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext, getCiphers)(TCN_STDARGS, jlong ctx)
 
     /* Before OpenSSL 1.1.0, get_ciphers() was only available
      * on an SSL, not for an SSL_CTX. */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
     ssl = SSL_new(c->ctx);
     if (ssl == NULL) {
         tcn_ThrowException(e, "could not create temporary ssl from ssl context");
@@ -680,7 +618,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext, getCiphers)(TCN_STDARGS, jlong ctx)
     len = sk_SSL_CIPHER_num(sk);
 
     if (len <= 0) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
         SSL_free(ssl);
 #endif
         return NULL;
@@ -695,7 +633,7 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext, getCiphers)(TCN_STDARGS, jlong ctx)
         c_name = (*e)->NewStringUTF(e, name);
         (*e)->SetObjectArrayElement(e, array, i, c_name);
     }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
     SSL_free(ssl);
 #endif
     return array;
@@ -1206,21 +1144,6 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, setCertificate)(TCN_STDARGS, jlong ctx,
         (eckey = EC_KEY_new_by_curve_name(nid))) {
         SSL_CTX_set_tmp_ecdh(c->ctx, eckey);
     }
-    /*
-     * ...otherwise, enable auto curve selection (OpenSSL 1.0.2)
-     * or configure NIST P-256 (required to enable ECDHE for earlier versions)
-     * ECDH is always enabled in 1.1.0 unless excluded from SSLCipherList
-     */
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-    else {
-#if defined(SSL_CTX_set_ecdh_auto)
-        SSL_CTX_set_ecdh_auto(c->ctx, 1);
-#else
-        eckey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-        SSL_CTX_set_tmp_ecdh(c->ctx, eckey);
-#endif
-    }
-#endif
     /* OpenSSL assures us that _free() is NULL-safe */
     EC_KEY_free(eckey);
     EC_GROUP_free(ecparams);
@@ -1333,15 +1256,6 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, setCertificateRaw)(TCN_STDARGS, jlong c
     /*
      * TODO try to read the ECDH curve name from somewhere...
      */
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-#if defined(SSL_CTX_set_ecdh_auto)
-    SSL_CTX_set_ecdh_auto(c->ctx, 1);
-#else
-    eckey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
-    SSL_CTX_set_tmp_ecdh(c->ctx, eckey);
-    EC_KEY_free(eckey);
-#endif
-#endif
 #endif
     SSL_CTX_set_tmp_dh_callback(c->ctx, SSL_callback_tmp_DH);
 cleanup:
@@ -1850,7 +1764,7 @@ TCN_IMPLEMENT_CALL(void, SSLContext, setSessionTicketKeys)(TCN_STDARGS, jlong ct
 }
 
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
 
 /*
  * Adapted from OpenSSL:
@@ -1950,7 +1864,7 @@ static const char* SSL_CIPHER_authentication_method(const SSL_CIPHER* cipher){
     if (cipher == NULL) {
         return "UNKNOWN";
     }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
     kx = cipher->algorithm_mkey;
     auth = cipher->algorithm_auth;
 #else
@@ -1962,12 +1876,6 @@ static const char* SSL_CIPHER_authentication_method(const SSL_CIPHER* cipher){
         {
     case TCN_SSL_kRSA:
         return SSL_TXT_RSA;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    case TCN_SSL_kDHr:
-        return SSL_TXT_DH "_" SSL_TXT_RSA;
-    case TCN_SSL_kDHd:
-        return SSL_TXT_DH "_" SSL_TXT_DSS;
-#endif
     case TCN_SSL_kDHE:
         switch (auth)
             {
@@ -1980,14 +1888,6 @@ static const char* SSL_CIPHER_authentication_method(const SSL_CIPHER* cipher){
         default:
             return "UNKNOWN";
             }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    case TCN_SSL_kKRB5:
-        return SSL_TXT_KRB5;
-    case TCN_SSL_kECDHr:
-        return SSL_TXT_ECDH "_" SSL_TXT_RSA;
-    case TCN_SSL_kECDHe:
-        return SSL_TXT_ECDH "_" SSL_TXT_ECDSA;
-#endif
     case TCN_SSL_kECDHE:
         switch (auth)
             {
@@ -2006,9 +1906,6 @@ static const char* SSL_CIPHER_authentication_method(const SSL_CIPHER* cipher){
 }
 
 static const char* SSL_authentication_method(const SSL* ssl) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   return SSL_CIPHER_authentication_method(ssl->s3->tmp.new_cipher);
-#else
     /* XXX ssl->s3->tmp.new_cipher is no longer available in OpenSSL 1.1.0 */
     /* https://github.com/netty/netty-tcnative/blob/1.1.33/openssl-dynamic/src/main/c/sslcontext.c
      * contains a different method, but I think this is not correct.
@@ -2017,7 +1914,6 @@ static const char* SSL_authentication_method(const SSL* ssl) {
     /* Not sure whether SSL_get_current_cipher(ssl) returns something useful
      * at the point in time we call it. */
    return SSL_CIPHER_authentication_method(SSL_get_current_cipher(ssl));
-#endif
 }
 /* Android end */
 
diff --git a/native/src/sslinfo.c b/native/src/sslinfo.c
index 68e402461..c212e9ede 100644
--- a/native/src/sslinfo.c
+++ b/native/src/sslinfo.c
@@ -182,7 +182,7 @@ static char *lookup_ssl_cert_dn(X509_NAME *xsname, int dnidx)
                     ASN1_STRING *adata = X509_NAME_ENTRY_get_data(xsne);
                     int len = ASN1_STRING_length(adata);
                     result = malloc(len + 1);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if defined(LIBRESSL_VERSION_NUMBER)
                     memcpy(result, ASN1_STRING_data(adata), len);
 #else
                     memcpy(result, ASN1_STRING_get0_data(adata), len);
diff --git a/native/src/sslutils.c b/native/src/sslutils.c
index 2c6810d5e..beefb31ed 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -542,15 +542,11 @@ static int ssl_verify_OCSP(X509_STORE_CTX *ctx)
          * may yield NULL. Return early, but leave the ctx error as is. */
         return OCSP_STATUS_UNKNOWN;
     }
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-    else if (cert->valid && X509_check_issued(cert,cert) == X509_V_OK) {
-#else
     /* No need to check cert->valid, because ssl_verify_OCSP() only
      * is called if OpenSSL already successfully verified the certificate
      * (parameter "ok" in SSL_callback_SSL_verify() must be true).
      */
     else if (X509_check_issued(cert,cert) == X509_V_OK) {
-#endif
         /* don't do OCSP checking for valid self-issued certs */
         X509_STORE_CTX_set_error(ctx, X509_V_OK);
         return OCSP_STATUS_UNKNOWN;
@@ -863,9 +859,6 @@ static OCSP_RESPONSE *parse_ocsp_resp(char *buf, int len)
 
     BIO_write(mem, buf, len);  /* write the buffer to the bio */
     if (BIO_gets(mem, tmpbuf, 512) <= 0) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-        OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
-#endif
         goto err;
     }
     /* Parse the HTTP response. This will look like this:


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 09/09: Align with 9.0.x

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit de94af36799ff0ca611330c2bc5a3194e06eab7a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 14:08:23 2024 +0000

    Align with 9.0.x
---
 java/org/apache/tomcat/jni/Library.java | 7 +++++--
 java/org/apache/tomcat/jni/SSL.java     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/jni/Library.java b/java/org/apache/tomcat/jni/Library.java
index aa350b17d..218a101b5 100644
--- a/java/org/apache/tomcat/jni/Library.java
+++ b/java/org/apache/tomcat/jni/Library.java
@@ -20,8 +20,11 @@ import java.io.File;
 
 public final class Library {
 
-    /* Default library names */
-    private static final String [] NAMES = {"tcnative-2", "libtcnative-2", "tcnative-1", "libtcnative-1"};
+    /*
+     * Default library names - use 1.x in preference to 2.x if both are available as only 1.x supports the APR/Native
+     * connector.
+     */
+    private static final String [] NAMES = {"tcnative-1", "libtcnative-1", "tcnative-2", "libtcnative-2"};
     /* System property used to define CATALINA_HOME */
     private static final String CATALINA_HOME_PROP = "catalina.home";
     /*
diff --git a/java/org/apache/tomcat/jni/SSL.java b/java/org/apache/tomcat/jni/SSL.java
index ac0ca9da5..91a8bc66f 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -254,7 +254,7 @@ public final class SSL {
     public static final int SSL_SELECTOR_FAILURE_NO_ADVERTISE = 0;
     public static final int SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL = 1;
 
-    /* Return OpenSSL version number (run time version) */
+    /* Return OpenSSL version number (compile time version, if version < 1.1.0) */
     public static native int version();
 
     /* Return OpenSSL version string (run time version) */


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 02/09: Add 1.3.x branch

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 9db68a6c5b646edfe77b3d9592c39a5fb7b9ddf3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 08:01:24 2024 +0000

    Add 1.3.x branch
---
 jnirelease.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jnirelease.sh b/jnirelease.sh
index d781c355d..f76cda464 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -85,7 +85,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
     echo ""
     echo "Unknown Git tag/branch"
     echo "Use:"
-    echo "  --ver=<tag>|1.1.x|1.2.x|main|."
+    echo "  --ver=<tag>|1.1.x|1.2.x|1.3.x|main|."
     echo ""
     exit 1
 fi
@@ -136,6 +136,9 @@ fi
 if [ "x$JKJNIEXT" = "xmain" ]; then
     JKJNIHASH=`git ls-remote $GITBASE refs/heads/main | awk '{print $1}'`
     JKJNIVER="$JKJNIEXT-$JKJNIHASH"
+elif [ "x$JKJNIEXT" = "x1.3.x" ]; then
+    JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.3.x | awk '{print $1}'`
+    JKJNIVER="$JKJNIEXT-$JKJNIHASH"
 elif [ "x$JKJNIEXT" = "x1.2.x" ]; then
     JKJNIHASH=`git ls-remote $GITBASE refs/heads/1.2.x | awk '{print $1}'`
     JKJNIVER="$JKJNIEXT-$JKJNIHASH"


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 06/09: Second pass at version update

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit f2a7699d37db56bfbcb5f3c3215854598953141e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 08:58:41 2024 +0000

    Second pass at version update
---
 HOWTO-RELEASE.txt              |  2 +-
 build.properties.default       |  4 ++--
 native/include/tcn_version.h   |  4 ++--
 native/os/win32/libtcnative.rc |  4 ++--
 native/srclib/VERSIONS         | 11 +++--------
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 4dc2d8c79..3542ee962 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -23,7 +23,7 @@ Requirements
 
 Java 8
 Apache Ant 1.9 or later
-Apache APR 1.4.3 or later source (1.7.4 or later recommended)
+Apache APR 1.6.3 or later source (1.7.4 or later recommended)
 
 
 Preparation
diff --git a/build.properties.default b/build.properties.default
index 37e678139..d4c677184 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -17,8 +17,8 @@
 
 # ----- Version Control Flags -----
 version.major=1
-version.minor=2
-version.build=40
+version.minor=3
+version.build=0
 version.patch=0
 version.suffix=-dev
 
diff --git a/native/include/tcn_version.h b/native/include/tcn_version.h
index d88bb4236..9454fb579 100644
--- a/native/include/tcn_version.h
+++ b/native/include/tcn_version.h
@@ -60,10 +60,10 @@ extern "C" {
  * Minor API changes that do not cause binary compatibility problems.
  * Should be reset to 0 when upgrading TCN_MAJOR_VERSION
  */
-#define TCN_MINOR_VERSION       2
+#define TCN_MINOR_VERSION       3
 
 /** patch level */
-#define TCN_PATCH_VERSION       40
+#define TCN_PATCH_VERSION       0
 
 /**
  *  This symbol is defined for internal, "development" copies of TCN. This
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index 55b45baa8..e4d443823 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -36,8 +36,8 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION 1,2,40,0
- PRODUCTVERSION 1,2,40,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,3,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index cef16403f..7eb22da70 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -1,21 +1,16 @@
 The current minimum versions are:
-- OpenSSL 1.0.2 
-- APR 1.4.3
+- OpenSSL 1.1.1 
+- APR 1.6.3
 
 The following version of the libraries are recommended:
 
 - APR 1.7.4 or later, http://apr.apache.org
-- OpenSSL 3.0.11 or later, http://www.openssl.org
+- OpenSSL 3.0.13 or later, http://www.openssl.org
 
 Older versions should also work but are not as thoroughly tested by the Tomcat
 Native team
 
 
-It is current anticipated that Tomcat Native releases will transition to 1.3.x
-at some point in the future when the minimum version will become OpenSSL 1.1.1 and
-APR 1.6.3.
-
-
 The minimum version of OpenSSL is driven by the version of OpenSSL used by
 downstream distributions.
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


(tomcat-native) 08/09: Update minimum LibreSSL version to 3.5.2. Remove NPN support.

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 29f0cc900310b1982b462b16fc308cbfeade79d4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 13:43:27 2024 +0000

    Update minimum LibreSSL version to 3.5.2. Remove NPN support.
    
    Additional updates after reviewing the 1.2.x/1.3.x/2.0.x diff
---
 native/BUILDING                   |  10 +-
 native/include/ssl_private.h      |  45 +-----
 native/os/win32/libtcnative.rc    |   4 +-
 native/src/jnilib.c               |   4 +-
 native/src/ssl.c                  | 326 +-------------------------------------
 native/src/sslcontext.c           | 147 +----------------
 native/src/sslutils.c             |  20 +--
 native/srclib/BUILDING            |   4 +-
 xdocs/miscellaneous/changelog.xml |   7 +
 9 files changed, 28 insertions(+), 539 deletions(-)

diff --git a/native/BUILDING b/native/BUILDING
index 51793e02a..eab66a699 100644
--- a/native/BUILDING
+++ b/native/BUILDING
@@ -20,8 +20,8 @@ Linux / Unix / OSX (dynamic linking)
 
 1. Prerequisites
 
-   Install OpenSSL version 1.0.2 or higher
-   Install APR version 1.4.3 or higher.
+   Install OpenSSL version 1.1.1 or higher
+   Install APR version 1.6.3 or higher.
    Download and expand the source package or use an git checkout
 
    > cd native
@@ -48,7 +48,7 @@ Linux / Unix / OSX (dynamic linking)
 Linux / Unix / OSX (static linking)
 ===================================
 
-1. Build static version of OpenSSL 1.0.2 or later
+1. Build static version of OpenSSL 1.1.1 or later
 
    > ./Configure --prefix=~/natives/openssl no-shared -fPIC
    > make
@@ -57,7 +57,7 @@ Linux / Unix / OSX (static linking)
    Note: For the Solaris platform you should use -KPIC instead -fPIC so that the
          library is compiled with position independent code.
 
-2. Build static version of APR 1.4.3 or later
+2. Build static version of APR 1.6.3 or later
 
    > ./configure --prefix=~/natives/apr
    > make
@@ -112,7 +112,7 @@ Windows
 4. Build OpenSSL
 
    Unpack the OpenSSL source distribution into native\srclib\openssl
-   Apply openssl-msvcrt.patch
+   Apply openssl-msvcrt-3.0.x.patch
    
    > c:\cmsc\setenv.bat x86
    > perl Configure VC-WIN32
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index 286a50a04..aab34cc9d 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -46,7 +46,7 @@
 #include <openssl/x509v3.h>
 #include <openssl/dh.h>
 #include <openssl/bn.h>
-#if (OPENSSL_VERSION_NUMBER > 0x2FFFFFFFL)
+#if OPENSSL_VERSION_NUMBER > 0x2FFFFFFFL && !defined(LIBRESSL_VERSION_NUMBER)
 #include <openssl/provider.h>
 #endif
 /* Avoid tripping over an engine build installed globally and detected
@@ -217,39 +217,7 @@ extern ENGINE *tcn_ssl_engine;
 
 #endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */
 
-/* LibreSSL compatibility */
-#if defined(LIBRESSL_VERSION_NUMBER)
-#define OpenSSL_version                  SSLeay_version
-#define OpenSSL_version_num              SSLeay
-#define OPENSSL_VERSION                  SSLEAY_VERSION
-#define OPENSSL_malloc_init              CRYPTO_malloc_init
-#define BN_get_rfc2409_prime_768         get_rfc2409_prime_768
-#define BN_get_rfc2409_prime_1024        get_rfc2409_prime_1024
-#define BN_get_rfc3526_prime_1536        get_rfc3526_prime_1536
-#define BN_get_rfc3526_prime_2048        get_rfc3526_prime_2048
-#define BN_get_rfc3526_prime_3072        get_rfc3526_prime_3072
-#define BN_get_rfc3526_prime_4096        get_rfc3526_prime_4096
-#define BN_get_rfc3526_prime_6144        get_rfc3526_prime_6144
-#define BN_get_rfc3526_prime_8192        get_rfc3526_prime_8192
-#define BIO_get_init(x)                  (x->init)
-#define BIO_set_init(x,v)                (x->init=v)
-#define BIO_get_data(x)                  (x->ptr)
-#define BIO_set_data(x,v)                (x->ptr=v)
-#define BIO_set_shutdown(x,v)            (x->shutdown=v)
-#define X509_REVOKED_get0_serialNumber(x) x->serialNumber
-#define X509_STORE_CTX_get0_untrusted(x) (x->untrusted)
-#define X509_OBJECT_free(x)              {X509_OBJECT_free_contents(obj);\
-                                          OPENSSL_free(obj);}
-#define TLS_method                       SSLv23_method
-#define TLS_client_method                SSLv23_client_method
-#define TLS_server_method                SSLv23_server_method
-#endif /* defined(LIBRESSL_VERSION_NUMBER) */
-
-#if !defined(LIBRESSL_VERSION_NUMBER)
-#define HAVE_KEYLOG_CALLBACK
-#endif
-
-#define MAX_ALPN_NPN_PROTO_SIZE 65535
+#define MAX_ALPN_PROTO_SIZE 65535
 #define SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL            1
 
 typedef struct {
@@ -394,19 +362,10 @@ void        SSL_callback_handshake(const SSL *, int, int);
 int         SSL_CTX_use_certificate_chain(SSL_CTX *, const char *, int);
 int         SSL_callback_SSL_verify(int, X509_STORE_CTX *);
 int         SSL_rand_seed(const char *file);
-int         SSL_callback_next_protos(SSL *, const unsigned char **, unsigned int *, void *);
-int         SSL_callback_select_next_proto(SSL *, unsigned char **, unsigned char *, const unsigned char *, unsigned int,void *);
 int         SSL_callback_alpn_select_proto(SSL *, const unsigned char **, unsigned char *, const unsigned char *, unsigned int, void *);
-#ifdef HAVE_KEYLOG_CALLBACK
 void        SSL_callback_add_keylog(SSL_CTX *);
-#endif
 
-#if defined(LIBRESSL_VERSION_NUMBER) && ! (defined(WIN32) || defined(WIN64))
-unsigned long SSL_ERR_get(void);
-void SSL_ERR_clear(void);
-#else
 #define SSL_ERR_get() ERR_get_error()
 #define SSL_ERR_clear() ERR_clear_error()
-#endif
 
 #endif /* SSL_PRIVATE_H */
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index e4d443823..55f623aa7 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -25,13 +25,13 @@ LANGUAGE 0x9,0x1
 
 1001 DIALOGEX 0, 0, 252, 51
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION
-CAPTION "Password prompt"
+CAPTION "Pass Phrase Prompt"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     ICON            1000,-1,8,6,21,20
     LTEXT           "Some of your private key files are encrypted for security reasons.\nIn order to read them you have to provide the pass phrases.",
                     -1,29,5,220,19
-    LTEXT           "Enter password:",-1,7,28,75,8
+    LTEXT           "Enter pass phrase:",-1,7,28,75,8
     EDITTEXT        1002,67,27,174,12,ES_PASSWORD | ES_AUTOHSCROLL
 END
 
diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index 300fe8caa..6f20dd94f 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -70,11 +70,11 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
     tcn_global_vm = vm;
     env           = (JNIEnv *)ppe;
     /* Before doing anything else check if we have a valid
-     * APR version. We need version 1.4.3 as minimum.
+     * APR version. We need version 1.6.3 as minimum.
      */
     apr_version(&apv);
     apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
-    if (apvn < 1403) {
+    if (apvn < 1603) {
         tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at least 1.4.3",
                   apr_version_string());
         return JNI_ERR;
diff --git a/native/src/ssl.c b/native/src/ssl.c
index a5bdaf43c..56304ee29 100644
--- a/native/src/ssl.c
+++ b/native/src/ssl.c
@@ -30,7 +30,6 @@ extern apr_pool_t *tcn_global_pool;
 ENGINE *tcn_ssl_engine = NULL;
 tcn_pass_cb_t tcn_password_callback;
 
-#ifdef HAVE_KEYLOG_CALLBACK
 static BIO *key_log_file = NULL;
 
 static void ssl_keylog_callback(const SSL *ssl, const char *line)
@@ -40,30 +39,11 @@ static void ssl_keylog_callback(const SSL *ssl, const char *line)
         BIO_puts(key_log_file, "\n");
     }
 }
-#endif
 
 /* From netty-tcnative */
 static jclass byteArrayClass;
 static jclass stringClass;
 
-#if defined(LIBRESSL_VERSION_NUMBER)
-/* Global reference to the pool used by the dynamic mutexes */
-static apr_pool_t *dynlockpool = NULL;
-
-/* Dynamic lock structure */
-struct CRYPTO_dynlock_value {
-    apr_pool_t *pool;
-    const char* file;
-    int line;
-    apr_thread_mutex_t *mutex;
-};
-
-#if ! (defined(WIN32) || defined(WIN64))
-apr_threadkey_t *thread_exit_key;
-static int threadkey_initialized = 0;
-#endif
-#endif
-
 /*
  * supported_ssl_opts is a bitmask that contains all supported SSL_OP_*
  * options at compile-time. This is used in hasOp to determine which
@@ -210,29 +190,6 @@ static const jint supported_ssl_opts = 0
 #endif
      | 0;
 
-#if defined(LIBRESSL_VERSION_NUMBER)
-/* LibreSSL compatibility */
-/* Taken from OpenSSL 1.1.0 snapshot 20160410 */
-int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
-{
-    /* q is optional */
-    if (p == NULL || g == NULL)
-        return 0;
-    BN_free(dh->p);
-    BN_free(dh->q);
-    BN_free(dh->g);
-    dh->p = p;
-    dh->q = q;
-    dh->g = g;
-
-    if (q != NULL) {
-        dh->length = BN_num_bits(q);
-    }
-
-    return 1;
-}
-#endif
-
 /*
  * Grab well-defined DH parameters from OpenSSL, see the BN_get_rfc*
  * functions in <openssl/bn.h> for all available primes.
@@ -294,14 +251,12 @@ static void free_dh_params(void)
     }
 }
 
-#ifdef HAVE_KEYLOG_CALLBACK
 void SSL_callback_add_keylog(SSL_CTX *ctx)
 {
     if (key_log_file) {
         SSL_CTX_set_keylog_callback(ctx, ssl_keylog_callback);
     }
 }
-#endif
 
 /* Hand out the same DH structure though once generated as we leak
  * memory otherwise and freeing the structure up after use would be
@@ -321,10 +276,8 @@ DH *SSL_get_dh_params(unsigned keylen)
     return NULL; /* impossible to reach. */
 }
 
-#if !defined(LIBRESSL_VERSION_NUMBER)
 static void init_bio_methods(void);
 static void free_bio_methods(void);
-#endif
 
 TCN_IMPLEMENT_CALL(jint, SSL, version)(TCN_STDARGS)
 {
@@ -349,12 +302,6 @@ static apr_status_t ssl_init_cleanup(void *data)
         return APR_SUCCESS;
     ssl_initialized = 0;
 
-#if defined(LIBRESSL_VERSION_NUMBER) && ! (defined(WIN32) || defined(WIN64))
-    if (threadkey_initialized) {
-        threadkey_initialized = 0;
-        apr_threadkey_private_delete(thread_exit_key);
-    }
-#endif
     if (tcn_password_callback.cb.obj) {
         JNIEnv *env;
         tcn_get_java_env(&env);
@@ -362,9 +309,7 @@ static apr_status_t ssl_init_cleanup(void *data)
                          tcn_password_callback.cb.obj);
     }
 
-#if !defined(LIBRESSL_VERSION_NUMBER)
     free_bio_methods();
-#endif
     free_dh_params();
 
 #ifndef OPENSSL_NO_ENGINE
@@ -375,39 +320,12 @@ static apr_status_t ssl_init_cleanup(void *data)
     }
 #endif
 
-#if !defined(LIBRESSL_VERSION_NUMBER)
-    /* Openssl v1.1+ handles all termination automatically. Do
-     * nothing in this case.
-     */
-#else
-    /*
-     * Try to kill the internals of the SSL library.
-     */
-#ifdef OPENSSL_FIPS
-    FIPS_mode_set(0);
-#endif
-    /* Corresponds to OPENSSL_load_builtin_modules() */
-    CONF_modules_free();
-    /* Corresponds to SSL_library_init: */
-    EVP_cleanup();
-#if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
-    ENGINE_cleanup();
-#endif
-#ifndef OPENSSL_NO_COMP
-    SSL_COMP_free_compression_methods();
-#endif
-    CRYPTO_cleanup_all_ex_data();
-#if defined(LIBRESSL_VERSION_NUMBER)
-    ERR_remove_thread_state(NULL);
-#endif
-#endif
+    /* Openssl v1.1+ handles all termination automatically. */
 
-#ifdef HAVE_KEYLOG_CALLBACK
     if (key_log_file) {
         BIO_free(key_log_file);
         key_log_file = NULL;
     }
-#endif
 
     /* Don't call ERR_free_strings here; ERR_load_*_strings only
      * actually load the error strings once per process due to static
@@ -438,182 +356,14 @@ static ENGINE *ssl_try_load_engine(const char *engine)
 #endif
 
 /*
- * To ensure thread-safetyness in OpenSSL
+ * To ensure thread-safetyness in LibreSSL
  */
 
-#if defined(LIBRESSL_VERSION_NUMBER)
-static apr_thread_mutex_t **ssl_lock_cs;
-static int                  ssl_lock_num_locks;
-
-static void ssl_thread_lock(int mode, int type,
-                            const char *file, int line)
-{
-    UNREFERENCED(file);
-    UNREFERENCED(line);
-    if (type < ssl_lock_num_locks) {
-        if (mode & CRYPTO_LOCK) {
-            apr_thread_mutex_lock(ssl_lock_cs[type]);
-        }
-        else {
-            apr_thread_mutex_unlock(ssl_lock_cs[type]);
-        }
-    }
-}
-#endif
-
 static unsigned long ssl_thread_id(void)
 {
     return (unsigned long)tcn_get_thread_id();
 }
 
-#if defined(LIBRESSL_VERSION_NUMBER)
-#if ! (defined(WIN32) || defined(WIN64))
-void SSL_thread_exit(void) {
-    ERR_remove_thread_state(NULL);
-    apr_threadkey_private_set(NULL, thread_exit_key);
-}
-
-unsigned long SSL_ERR_get() {
-    apr_threadkey_private_set(thread_exit_key, thread_exit_key);
-    return ERR_get_error();
-}
-
-void SSL_ERR_clear() {
-    apr_threadkey_private_set(thread_exit_key, thread_exit_key);
-    ERR_clear_error();
-}
-
-static void _ssl_thread_exit(void *data) {
-    UNREFERENCED(data);
-    SSL_thread_exit();
-}
-#endif
-
-static void ssl_set_thread_id(CRYPTO_THREADID *id)
-{
-    CRYPTO_THREADID_set_numeric(id, ssl_thread_id());
-}
-
-static apr_status_t ssl_thread_cleanup(void *data)
-{
-    UNREFERENCED(data);
-    CRYPTO_THREADID_set_callback(NULL);
-    CRYPTO_set_locking_callback(NULL);
-    CRYPTO_set_dynlock_create_callback(NULL);
-    CRYPTO_set_dynlock_lock_callback(NULL);
-    CRYPTO_set_dynlock_destroy_callback(NULL);
-
-    dynlockpool = NULL;
-
-    /* Let the registered mutex cleanups do their own thing
-     */
-    return APR_SUCCESS;
-}
-
-/*
- * Dynamic lock creation callback
- */
-static struct CRYPTO_dynlock_value *ssl_dyn_create_function(const char *file,
-                                                     int line)
-{
-    struct CRYPTO_dynlock_value *value;
-    apr_pool_t *p;
-    apr_status_t rv;
-
-    /*
-     * We need a pool to allocate our mutex.  Since we can't clear
-     * allocated memory from a pool, create a subpool that we can blow
-     * away in the destruction callback.
-     */
-    rv = apr_pool_create(&p, dynlockpool);
-    if (rv != APR_SUCCESS) {
-        /* TODO log that fprintf(stderr, "Failed to create subpool for dynamic lock"); */
-        return NULL;
-    }
-
-    value = (struct CRYPTO_dynlock_value *)apr_palloc(p,
-                                                      sizeof(struct CRYPTO_dynlock_value));
-    if (!value) {
-        /* TODO log that fprintf(stderr, "Failed to allocate dynamic lock structure"); */
-        return NULL;
-    }
-
-    value->pool = p;
-    /* Keep our own copy of the place from which we were created,
-       using our own pool. */
-    value->file = apr_pstrdup(p, file);
-    value->line = line;
-    rv = apr_thread_mutex_create(&(value->mutex), APR_THREAD_MUTEX_DEFAULT,
-                                p);
-    if (rv != APR_SUCCESS) {
-        /* TODO log that fprintf(stderr, "Failed to create thread mutex for dynamic lock"); */
-        apr_pool_destroy(p);
-        return NULL;
-    }
-    return value;
-}
-
-/*
- * Dynamic locking and unlocking function
- */
-
-static void ssl_dyn_lock_function(int mode, struct CRYPTO_dynlock_value *l,
-                           const char *file, int line)
-{
-
-
-    if (mode & CRYPTO_LOCK) {
-        apr_thread_mutex_lock(l->mutex);
-    }
-    else {
-        apr_thread_mutex_unlock(l->mutex);
-    }
-}
-
-/*
- * Dynamic lock destruction callback
- */
-static void ssl_dyn_destroy_function(struct CRYPTO_dynlock_value *l,
-                          const char *file, int line)
-{
-    apr_status_t rv;
-    rv = apr_thread_mutex_destroy(l->mutex);
-    if (rv != APR_SUCCESS) {
-        /* TODO log that fprintf(stderr, "Failed to destroy mutex for dynamic lock %s:%d", l->file, l->line); */
-    }
-    /* Trust that whomever owned the CRYPTO_dynlock_value we were
-     * passed has no future use for it...
-     */
-    apr_pool_destroy(l->pool);
-}
-
-static void ssl_thread_setup(apr_pool_t *p)
-{
-    int i;
-
-    CRYPTO_THREADID_set_callback(ssl_set_thread_id);
-    ssl_lock_num_locks = CRYPTO_num_locks();
-    ssl_lock_cs = apr_palloc(p, ssl_lock_num_locks * sizeof(*ssl_lock_cs));
-
-    for (i = 0; i < ssl_lock_num_locks; i++) {
-        apr_thread_mutex_create(&(ssl_lock_cs[i]),
-                                APR_THREAD_MUTEX_DEFAULT, p);
-    }
-
-    CRYPTO_set_locking_callback(ssl_thread_lock);
-    /* Set up dynamic locking scaffolding for OpenSSL to use at its
-     * convenience.
-     */
-    dynlockpool = p;
-    CRYPTO_set_dynlock_create_callback(ssl_dyn_create_function);
-    CRYPTO_set_dynlock_lock_callback(ssl_dyn_lock_function);
-    CRYPTO_set_dynlock_destroy_callback(ssl_dyn_destroy_function);
-
-    apr_pool_cleanup_register(p, NULL, ssl_thread_cleanup,
-                              apr_pool_cleanup_null);
-}
-#endif
-
 static int ssl_rand_choosenum(int l, int h)
 {
     int i;
@@ -770,40 +520,12 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
         TCN_FREE_CSTRING(engine);
         return (jint)APR_SUCCESS;
     }
-#if !defined(LIBRESSL_VERSION_NUMBER)
     /* Openssl v1.1+ handles all initialisation automatically, apart
      * from hints as to how we want to use the library.
      *
      * We tell openssl we want to include engine support.
      */
     OPENSSL_init_ssl(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
-#else
-    /* We must register the library in full, to ensure our configuration
-     * code can successfully test the SSL environment.
-     */
-    OPENSSL_malloc_init();
-    ERR_load_crypto_strings();
-    SSL_load_error_strings();
-    SSL_library_init();
-    OpenSSL_add_all_algorithms();
-#if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
-    ENGINE_load_builtin_engines();
-#endif
-    OPENSSL_load_builtin_modules();
-
-#if ! (defined(WIN32) || defined(WIN64))
-    err = apr_threadkey_private_create(&thread_exit_key, _ssl_thread_exit,
-                                       tcn_global_pool);
-    if (err != APR_SUCCESS) {
-        ssl_init_cleanup(NULL);
-        tcn_ThrowAPRException(e, err);
-        return (jint)err;
-    }
-    threadkey_initialized = 1;
-#endif
-    /* Initialize thread support */
-    ssl_thread_setup(tcn_global_pool);
-#endif
 
 #ifndef OPENSSL_NO_ENGINE
     if (J2S(engine)) {
@@ -844,9 +566,7 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
     SSL_init_app_data_idx();
 
     init_dh_params();
-#if !defined(LIBRESSL_VERSION_NUMBER)
     init_bio_methods();
-#endif
 
     /*
      * Let us cleanup the ssl library when the library is unloaded
@@ -864,7 +584,6 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
     sClazz = (*e)->FindClass(e, "java/lang/String");
     stringClass = (jclass) (*e)->NewGlobalRef(e, sClazz);
 
-#ifdef HAVE_KEYLOG_CALLBACK
     if (!key_log_file) {
         char *key_log_file_name = getenv("SSLKEYLOGFILE");
         if (key_log_file_name) {
@@ -878,7 +597,6 @@ TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
             }
         }
     }
-#endif
 
     return (jint)APR_SUCCESS;
 }
@@ -1175,20 +893,6 @@ static long jbs_ctrl(BIO *b, int cmd, long num, void *ptr)
     return ret;
 }
 
-#if defined(LIBRESSL_VERSION_NUMBER)
-static BIO_METHOD jbs_methods = {
-    BIO_TYPE_FILE,
-    "Java Callback",
-    jbs_write,
-    jbs_read,
-    jbs_puts,
-    jbs_gets,
-    jbs_ctrl,
-    jbs_new,
-    jbs_free,
-    NULL
-};
-#else
 static BIO_METHOD *jbs_methods = NULL;
 
 static void init_bio_methods(void)
@@ -1207,7 +911,6 @@ static void free_bio_methods(void)
 {
     BIO_meth_free(jbs_methods);
 }
-#endif
 
 static BIO_METHOD *BIO_jbs()
 {
@@ -1685,24 +1388,6 @@ TCN_IMPLEMENT_CALL(jint, SSL, getPostHandshakeAuthInProgress)(TCN_STDARGS,
 #endif
 }
 
-/* Read which protocol was negotiated for the given SSL *. */
-TCN_IMPLEMENT_CALL(jstring, SSL, getNextProtoNegotiated)(TCN_STDARGS,
-                                                         jlong ssl /* SSL * */) {
-    SSL *ssl_ = J2P(ssl, SSL *);
-    const unsigned char *proto;
-    unsigned int proto_len;
-
-    if (ssl_ == NULL) {
-        tcn_ThrowException(e, "ssl is null");
-        return NULL;
-    }
-
-    UNREFERENCED(o);
-
-    SSL_get0_next_proto_negotiated(ssl_, &proto, &proto_len);
-    return tcn_new_stringn(e, (const char *)proto, (size_t) proto_len);
-}
-
 /*** End Twitter API Additions ***/
 
 /*** Apple API Additions ***/
@@ -2336,13 +2021,6 @@ TCN_IMPLEMENT_CALL(jint, SSL, getPostHandshakeAuthInProgress)(TCN_STDARGS, jlong
   return 0;
 }
 
-TCN_IMPLEMENT_CALL(jstring, SSL, getNextProtoNegotiated)(TCN_STDARGS, jlong ssl) {
-  UNREFERENCED(o);
-  UNREFERENCED(ssl);
-  tcn_ThrowException(e, "Not implemented");
-  return NULL;
-}
-
 /*** End Twitter 1:1 API addition ***/
 
 /*** Begin Apple 1:1 API addition ***/
diff --git a/native/src/sslcontext.c b/native/src/sslcontext.c
index a2ddf8fce..660aed768 100644
--- a/native/src/sslcontext.c
+++ b/native/src/sslcontext.c
@@ -274,9 +274,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
         goto init_failed;
     }
 
-#ifdef HAVE_KEYLOG_CALLBACK
     SSL_callback_add_keylog(ctx);
-#endif
 
     c->protocol = protocol;
     c->mode     = mode;
@@ -287,27 +285,6 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
         BIO_set_fp(c->bio_os, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
     SSL_CTX_set_options(c->ctx, SSL_OP_ALL);
 
-#if defined(LIBRESSL_VERSION_NUMBER)
-    /* always disable SSLv2, as per RFC 6176 */
-    SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
-    if (!(protocol & SSL_PROTOCOL_SSLV3))
-        SSL_CTX_set_options(c->ctx, SSL_OP_NO_SSLv3);
-    if (!(protocol & SSL_PROTOCOL_TLSV1))
-        SSL_CTX_set_options(c->ctx, SSL_OP_NO_TLSv1);
-#ifdef HAVE_TLSV1_1
-    if (!(protocol & SSL_PROTOCOL_TLSV1_1))
-        SSL_CTX_set_options(c->ctx, SSL_OP_NO_TLSv1_1);
-#endif
-#ifdef HAVE_TLSV1_2
-    if (!(protocol & SSL_PROTOCOL_TLSV1_2))
-        SSL_CTX_set_options(c->ctx, SSL_OP_NO_TLSv1_2);
-#endif
-#ifdef HAVE_TLSV1_3
-    if (!(protocol & SSL_PROTOCOL_TLSV1_3))
-        SSL_CTX_set_options(c->ctx, SSL_OP_NO_TLSv1_3);
-#endif
-
-#else /* if defined(LIBRESSL_VERSION_NUMBER) */
     /* We first determine the maximum protocol version we should provide */
 #ifdef HAVE_TLSV1_3
     if (protocol & SSL_PROTOCOL_TLSV1_3) {
@@ -347,7 +324,6 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
         prot = SSL3_VERSION;
     }
     SSL_CTX_set_min_proto_version(ctx, prot);
-#endif
 
     /*
      * Configure additional context ingredients
@@ -591,9 +567,6 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext, getCiphers)(TCN_STDARGS, jlong ctx)
     const char *name;
     int i;
     jstring c_name;
-#if defined(LIBRESSL_VERSION_NUMBER)
-    SSL *ssl;
-#endif
 
     UNREFERENCED_STDARGS;
 
@@ -602,25 +575,10 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext, getCiphers)(TCN_STDARGS, jlong ctx)
         return NULL;
     }
 
-    /* Before OpenSSL 1.1.0, get_ciphers() was only available
-     * on an SSL, not for an SSL_CTX. */
-#if defined(LIBRESSL_VERSION_NUMBER)
-    ssl = SSL_new(c->ctx);
-    if (ssl == NULL) {
-        tcn_ThrowException(e, "could not create temporary ssl from ssl context");
-        return NULL;
-    }
-
-    sk = SSL_get_ciphers(ssl);
-#else
     sk = SSL_CTX_get_ciphers(c->ctx);
-#endif
     len = sk_SSL_CIPHER_num(sk);
 
     if (len <= 0) {
-#if defined(LIBRESSL_VERSION_NUMBER)
-        SSL_free(ssl);
-#endif
         return NULL;
     }
 
@@ -633,9 +591,6 @@ TCN_IMPLEMENT_CALL(jobjectArray, SSLContext, getCiphers)(TCN_STDARGS, jlong ctx)
         c_name = (*e)->NewStringUTF(e, name);
         (*e)->SetObjectArrayElement(e, array, i, c_name);
     }
-#if defined(LIBRESSL_VERSION_NUMBER)
-    SSL_free(ssl);
-#endif
     return array;
 }
 
@@ -1292,14 +1247,9 @@ TCN_IMPLEMENT_CALL(jboolean, SSLContext, addChainCertificateRaw)(TCN_STDARGS, jl
         ERR_error_string(SSL_ERR_get(), err);
         tcn_Throw(e, "Error reading certificate (%s)", err);
         rv = JNI_FALSE;
-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20901000L
-    } else {
-        tcn_Throw(e, "Unable to use Java keystores with LibreSSL");
-#else
     } else if (SSL_CTX_add0_chain_cert(c->ctx, certs) <= 0) {
         ERR_error_string(SSL_ERR_get(), err);
         tcn_Throw(e, "Error adding certificate to chain (%s)", err);
-#endif
         rv = JNI_FALSE;
     }
 
@@ -1529,7 +1479,7 @@ static int initProtocols(JNIEnv *e, const tcn_ssl_ctxt_t *c, unsigned char **pro
          proto_chars = (*e)->GetStringUTFChars(e, proto_string, 0);
 
          proto_chars_len = strlen(proto_chars);
-         if (proto_chars_len > 0 && proto_chars_len <= MAX_ALPN_NPN_PROTO_SIZE) {
+         if (proto_chars_len > 0 && proto_chars_len <= MAX_ALPN_PROTO_SIZE) {
             // We need to add +1 as each protocol is prefixed by it's length (unsigned char).
             // For all except of the last one we already have the extra space as everything is
             // delimited by ','.
@@ -1572,26 +1522,6 @@ static int initProtocols(JNIEnv *e, const tcn_ssl_ctxt_t *c, unsigned char **pro
     }
 }
 
-TCN_IMPLEMENT_CALL(void, SSLContext, setNpnProtos)(TCN_STDARGS, jlong ctx, jobjectArray next_protos,
-        jint selectorFailureBehavior)
-{
-    tcn_ssl_ctxt_t *c = J2P(ctx, tcn_ssl_ctxt_t *);
-
-    TCN_ASSERT(ctx != 0);
-    UNREFERENCED(o);
-
-    if (initProtocols(e, c, &c->next_proto_data, &c->next_proto_len, next_protos) == 0) {
-        c->next_selector_failure_behavior = selectorFailureBehavior;
-
-        // depending on if it's client mode or not we need to call different functions.
-        if (c->mode == SSL_MODE_CLIENT)  {
-            SSL_CTX_set_next_proto_select_cb(c->ctx, SSL_callback_select_next_proto, (void *)c);
-        } else {
-            SSL_CTX_set_next_protos_advertised_cb(c->ctx, SSL_callback_next_protos, (void *)c);
-        }
-    }
-}
-
 TCN_IMPLEMENT_CALL(void, SSLContext, setAlpnProtos)(TCN_STDARGS, jlong ctx, jobjectArray alpn_protos,
         jint selectorFailureBehavior)
 {
@@ -1763,97 +1693,35 @@ TCN_IMPLEMENT_CALL(void, SSLContext, setSessionTicketKeys)(TCN_STDARGS, jlong ct
     (*e)->ReleaseByteArrayElements(e, keys, b, 0);
 }
 
-
 #if defined(LIBRESSL_VERSION_NUMBER)
 
 /*
  * Adapted from OpenSSL:
  * https://github.com/openssl/openssl/blob/OpenSSL_1_0_2-stable/ssl/ssl_locl.h#L318
  */
-/* Bits for algorithm_mkey (key exchange algorithm) */
-/* RSA key exchange */
-# define SSL_kRSA                0x00000001L
-/* DH cert, RSA CA cert */
-# define SSL_kDHr                0x00000002L
-/* DH cert, DSA CA cert */
-# define SSL_kDHd                0x00000004L
-/* tmp DH key no DH cert */
-# define SSL_kEDH                0x00000008L
-/* forward-compatible synonym */
-# define SSL_kDHE                SSL_kEDH
-/* Kerberos5 key exchange */
-# define SSL_kKRB5               0x00000010L
-/* ECDH cert, RSA CA cert */
-# define SSL_kECDHr              0x00000020L
-/* ECDH cert, ECDSA CA cert */
-# define SSL_kECDHe              0x00000040L
-/* ephemeral ECDH */
-# define SSL_kEECDH              0x00000080L
-/* forward-compatible synonym */
-# define SSL_kECDHE              SSL_kEECDH
-/* PSK */
-# define SSL_kPSK                0x00000100L
-/* GOST key exchange */
-# define SSL_kGOST               0x00000200L
-/* SRP */
-# define SSL_kSRP                0x00000400L
 
 /* Bits for algorithm_auth (server authentication) */
-/* RSA auth */
-# define SSL_aRSA                0x00000001L
 /* DSS auth */
 # define SSL_aDSS                0x00000002L
-/* no auth (i.e. use ADH or AECDH) */
-# define SSL_aNULL               0x00000004L
-/* Fixed DH auth (kDHd or kDHr) */
-# define SSL_aDH                 0x00000008L
-/* Fixed ECDH auth (kECDHe or kECDHr) */
-# define SSL_aECDH               0x00000010L
-/* KRB5 auth */
-# define SSL_aKRB5               0x00000020L
-/* ECDSA auth*/
-# define SSL_aECDSA              0x00000040L
-/* PSK auth */
-# define SSL_aPSK                0x00000080L
-/* GOST R 34.10-94 signature auth */
-# define SSL_aGOST94             0x00000100L
-/* GOST R 34.10-2001 signature auth */
-# define SSL_aGOST01             0x00000200L
-/* SRP auth */
-# define SSL_aSRP                0x00000400L
 
 /* OpenSSL end */
 
-#define TCN_SSL_kRSA                SSL_kRSA
-#define TCN_SSL_kDHr                SSL_kDHr
-#define TCN_SSL_kDHd                SSL_kDHd
-#define TCN_SSL_kDHE                SSL_kDHE
-#define TCN_SSL_kKRB5               SSL_kKRB5
-#define TCN_SSL_kECDHr              SSL_kECDHr
-#define TCN_SSL_kECDHe              SSL_kECDHe
-#define TCN_SSL_kECDHE              SSL_kECDHE
-
-#define TCN_SSL_aRSA                SSL_aRSA
 #define TCN_SSL_aDSS                SSL_aDSS
-#define TCN_SSL_aNULL               SSL_aNULL
-#define TCN_SSL_aDH                 SSL_aDH
-#define TCN_SSL_aECDH               SSL_aECDH
-#define TCN_SSL_aKRB5               SSL_aKRB5
-#define TCN_SSL_aECDSA              SSL_aECDSA
 
 #else
 
+#define TCN_SSL_aDSS                NID_auth_dss
+
+#endif
+
 #define TCN_SSL_kRSA                NID_kx_rsa
 #define TCN_SSL_kDHE                NID_kx_dhe
 #define TCN_SSL_kECDHE              NID_kx_ecdhe
 
 #define TCN_SSL_aRSA                NID_auth_rsa
-#define TCN_SSL_aDSS                NID_auth_dss
 #define TCN_SSL_aNULL               NID_auth_null
 #define TCN_SSL_aECDSA              NID_auth_ecdsa
 
-#endif
-
 /*
  * Adapted from Android:
  * https://android.googlesource.com/platform/external/openssl/+/master/patches/0003-jsse.patch
@@ -1864,13 +1732,8 @@ static const char* SSL_CIPHER_authentication_method(const SSL_CIPHER* cipher){
     if (cipher == NULL) {
         return "UNKNOWN";
     }
-#if defined(LIBRESSL_VERSION_NUMBER)
-    kx = cipher->algorithm_mkey;
-    auth = cipher->algorithm_auth;
-#else
     kx = SSL_CIPHER_get_kx_nid(cipher);
     auth = SSL_CIPHER_get_auth_nid(cipher);
-#endif
 
     switch (kx)
         {
diff --git a/native/src/sslutils.c b/native/src/sslutils.c
index beefb31ed..d03fb491f 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -446,17 +446,6 @@ void SSL_callback_handshake(const SSL *ssl, int where, int rc)
     }
 }
 
-int SSL_callback_next_protos(SSL *ssl, const unsigned char **data,
-                             unsigned int *len, void *arg)
-{
-    tcn_ssl_ctxt_t *ssl_ctxt = arg;
-
-    *data = ssl_ctxt->next_proto_data;
-    *len = ssl_ctxt->next_proto_len;
-
-    return SSL_TLSEXT_ERR_OK;
-}
-
 /* The code here is inspired by nghttp2
  *
  * See https://github.com/tatsuhiro-t/nghttp2/blob/ae0100a9abfcf3149b8d9e62aae216e946b517fb/src/shrpx_ssl.cc#L244 */
@@ -515,13 +504,6 @@ int select_next_proto(SSL *ssl, const unsigned char **out, unsigned char *outlen
     return SSL_TLSEXT_ERR_NOACK;
 }
 
-int SSL_callback_select_next_proto(SSL *ssl, unsigned char **out, unsigned char *outlen,
-                         const unsigned char *in, unsigned int inlen,
-                         void *arg) {
-    tcn_ssl_ctxt_t *ssl_ctxt = arg;
-    return select_next_proto(ssl, (const unsigned char **) out, outlen, in, inlen, ssl_ctxt->next_proto_data, ssl_ctxt->next_proto_len, ssl_ctxt->next_selector_failure_behavior);
-}
-
 int SSL_callback_alpn_select_proto(SSL* ssl, const unsigned char **out, unsigned char *outlen,
         const unsigned char *in, unsigned int inlen, void *arg) {
     tcn_ssl_ctxt_t *ssl_ctxt = arg;
@@ -984,7 +966,7 @@ static OCSP_RESPONSE *get_ocsp_response(apr_pool_t *p, X509 *cert, X509 *issuer,
     int ok = 0;
     apr_socket_t *apr_sock = NULL;
     apr_pool_t *mp;
-#if OPENSSL_VERSION_NUMBER < 0x30000000L
+#if OPENSSL_VERSION_NUMBER < 0x30000000L || defined(LIBRESSL_VERSION_NUMBER)
     if (OCSP_parse_url(url, &hostname, &c_port, &path, &use_ssl) == 0)
 #else
     if (OSSL_HTTP_parse_url(url, &use_ssl, NULL, &hostname, &c_port, NULL, &path, NULL, NULL) == 0)
diff --git a/native/srclib/BUILDING b/native/srclib/BUILDING
index c116a11f8..261b79743 100644
--- a/native/srclib/BUILDING
+++ b/native/srclib/BUILDING
@@ -15,10 +15,10 @@ environment before calling nmake so that correct
 compiler is setup for the target architecture.
 
 
-Building OpenSSL 1.1.1 and later
+Building OpenSSL 3.0.0 and later
 ----------------------------------
 
-Apply openssl-msvcrt-1.1.1.patch
+Apply openssl-msvcrt-3.0.x.patch
 
 This patch makes sure that static version of OpenSSL libraries
 is linked to msvcrt.dll instead statically linking msvcrt.
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index 68b1136e2..f58dd3e24 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -51,6 +51,13 @@
       longer set. Only the explicitly configured trust store, if any, will be
       used. (michaelo)
     </fix>
+    <update>
+      Update the minimum supported version of LibreSSL to 3.5.2. (markt)
+    </update>
+    <design>
+      Remove NPN support as NPN was never standardised and browser support was
+      removed in 2019. (markt)
+    </design>
   </changelog>
 </section>
 <section name="Changes in 1.2.x">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org