[Git][java-team/tomcat-native][master] 3 commits: New upstream version 1.2.19
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Dec 10 23:11:47 GMT 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tomcat-native
Commits:
d54f43f8 by Emmanuel Bourg at 2018-12-10T23:07:22Z
New upstream version 1.2.19
- - - - -
8e8eb670 by Emmanuel Bourg at 2018-12-10T23:07:23Z
Update upstream source from tag 'upstream/1.2.19'
Update to upstream version '1.2.19'
with Debian dir 1d2d3344e6b985915f55a4dbfe9941eb12fd4234
- - - - -
9b24c786 by Emmanuel Bourg at 2018-12-10T23:11:03Z
New upstream release (1.2.19)
- - - - -
18 changed files:
- CHANGELOG.txt
- build.properties.default
- debian/changelog
- docs/index.html
- docs/miscellaneous/changelog.html
- docs/news/2018.html
- + native/LICENSE.bin.win
- + native/NOTICE.bin.win
- native/include/tcn_version.h
- native/os/win32/libtcnative.rc
- native/src/sslconf.c
- native/src/sslcontext.c
- native/src/sslutils.c
- native/srclib/VERSIONS
- native/tcnative.spec
- xdocs/index.xml
- xdocs/miscellaneous/changelog.xml
- xdocs/news/2018.xml
Changes:
=====================================
CHANGELOG.txt
=====================================
@@ -2,6 +2,16 @@
This is the Changelog for Tomcat Native 1.2.
+ Changes in 1.2.19
+
+ * Fix: 62892: Fix memory leaks in OCSP handling. (jfclere)
+ * Fix: 62944: 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: Include OpenSSL licensing information in the Tomcat Native
+ binaries for Windows that are built with OpenSSL. (markt)
+ * Update: Update recommended OpenSSL version to 1.0.2q or later. (markt)
+
Changes in 1.2.18
* Fix: 62641: libtool invocations should use --tag=CC. (michaelo)
=====================================
build.properties.default
=====================================
@@ -18,7 +18,7 @@
# ----- Version Control Flags -----
version.major=1
version.minor=2
-version.build=18
+version.build=19
version.patch=0
version.suffix=
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+tomcat-native (1.2.19-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 11 Dec 2018 00:10:54 +0100
+
tomcat-native (1.2.18-1) unstable; urgency=medium
* Team upload.
=====================================
docs/index.html
=====================================
@@ -27,10 +27,10 @@
</div><h3 id="Headlines">Headlines</h3><div class="text">
<ul>
-<li><a href="news/2018.html#20180613">13 June 2018 - <b>TC-Native-1.2.17
+<li><a href="news/2018.html#20181020">10 Oct 2018 - <b>TC-Native-1.2.18
released</b></a>
<p>The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.17 Stable.</p>
+Tomcat Native 1.2.18 Stable.</p>
<p>
The sources and the binaries for selected platforms are available from the
<a href="../download-native.cgi">Download page</a>.
=====================================
docs/miscellaneous/changelog.html
=====================================
@@ -3,6 +3,24 @@
<p>
This is the Changelog for Tomcat Native 1.2.
</p>
+</div><h3 id="Changes_in_1.2.19">Changes in 1.2.19</h3><div class="text">
+ <ul class="changelog">
+ <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+ <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=62892">62892</a>: Fix memory leaks in OCSP handling. (jfclere)
+ </li>
+ <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+ <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=62944">62944</a>: 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)
+ </li>
+ <li><img alt="Fix: " class="icon" src="../images/fix.gif">
+ Include OpenSSL licensing information in the Tomcat Native binaries for
+ Windows that are built with OpenSSL. (markt)
+ </li>
+ <li><img alt="Update: " class="icon" src="../images/update.gif">
+ Update recommended OpenSSL version to 1.0.2q or later. (markt)
+ </li>
+ </ul>
</div><h3 id="Changes_in_1.2.18">Changes in 1.2.18</h3><div class="text">
<ul class="changelog">
<li><img alt="Fix: " class="icon" src="../images/fix.gif">
=====================================
docs/news/2018.html
=====================================
@@ -1,5 +1,12 @@
<!DOCTYPE html SYSTEM "about:legacy-compat">
<html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><link href="../images/docs-stylesheet.css" rel="stylesheet" type="text/css"><link href="../images/style.css" rel="stylesheet" type="text/css"><title>The Apache Tomcat Native - News - 2018 News and Status</title></head><body><div id="wrapper"><header><div id="header"><div><div><div class="logo noPrint"><a href="http://tomcat.apache.org/"><img alt="Tomcat Home" src="../images/tomcat.png"></a></div><div style="height: 1px;"></div><div class="asfLogo noPrint"><a href="http://www.apache.org/" target="_blank"><img src="../images/asf-feather.png" alt="The Apache Software Foundation" style="width: 266px; height: 83px;"></a></div><h1>The Apache Tomcat Native - News</h1><div style="height: 1px;"></div><div style="clear: left;"></div></div></div></div></header><div id="middle"><div><div id="mainLeft" class="noprint"><div><nav><div><h2><strong>Links</strong></h2><ul><li><a href="../index.html">Docs Home</a></li></ul></div><div><h2><strong>Miscellaneous Documentation</strong></h2><ul><li><a href="../miscellaneous/changelog.html">Changelog</a></li></ul></div><div><h2><strong>News</strong></h2><ul><li><a href="../news/2017.html">2017</a></li><li><a href="../news/2016.html">2016</a></li><li><a href="../news/2015.html">2015</a></li><li><a href="../news/2014.html">2014</a></li><li><a href="../news/2013.html">2013</a></li><li><a href="../news/2012.html">2012</a></li><li><a href="../news/2011.html">2011</a></li><li><a href="../news/2010.html">2010</a></li><li><a href="../news/2009.html">2009</a></li><li><a href="../news/2008.html">2008</a></li></ul></div></nav></div></div><div id="mainRight"><div id="content"><h2>2018 News and Status</h2><h3 id="2018_News_&_Status">2018 News & Status</h3><div class="text">
+ <div class="subsection"><h4 id="20181020">20 Oct 2018 - TC-Native-1.2.18 released</h4><div class="text">
+ <p>The Apache Tomcat team is proud to announce the immediate availability of
+ Tomcat Native 1.2.18. This is a festure 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>
+ </div></div>
<div class="subsection"><h4 id="20180613">13 Jun 2018 - TC-Native-1.2.17 released</h4><div class="text">
<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
=====================================
native/LICENSE.bin.win
=====================================
@@ -0,0 +1,328 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+For OpenSSL:
+
+ LICENSE ISSUES
+ ==============
+
+ The OpenSSL toolkit stays under a double license, i.e. both the conditions of
+ the OpenSSL License and the original SSLeay license apply to the toolkit.
+ See below for the actual license texts.
+
+ OpenSSL License
+ ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * openssl-core at openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ * nor may "OpenSSL" appear in their names without prior written
+ * permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the OpenSSL Project
+ * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay at cryptsoft.com). This product includes software written by Tim
+ * Hudson (tjh at cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay at cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay at cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to. The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code. The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh at cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * "This product includes cryptographic software written by
+ * Eric Young (eay at cryptsoft.com)"
+ * The word 'cryptographic' can be left out if the rouines from the library
+ * being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ * the apps directory (application code) you must include an acknowledgement:
+ * "This product includes software written by Tim Hudson (tjh at cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed. i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
=====================================
native/NOTICE.bin.win
=====================================
@@ -0,0 +1,20 @@
+Apache Tomcat Native Library
+Copyright 2002-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This software contains code derived from netty-native
+developed by the Netty project
+(http://netty.io, https://github.com/netty/netty-tcnative/)
+and from finagle-native developed at Twitter
+(https://github.com/twitter/finagle).
+
+This product includes software developed by the OpenSSL Project
+for use in the OpenSSL Toolkit. (http://www.openssl.org/)
+
+This product includes cryptographic software written by
+Eric Young (eay at cryptsoft.com)
+
+This product includes software written by
+Tim Hudson (tjh at cryptsoft.com)
\ No newline at end of file
=====================================
native/include/tcn_version.h
=====================================
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 18
+#define TCN_PATCH_VERSION 19
/**
* This symbol is defined for internal, "development" copies of TCN. This
=====================================
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.18"
+#define TCN_VERSION "1.2.19"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,18,0
- PRODUCTVERSION 1,2,18,0
+ FILEVERSION 1,2,19,0
+ PRODUCTVERSION 1,2,19,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
=====================================
native/src/sslconf.c
=====================================
@@ -220,8 +220,8 @@ TCN_IMPLEMENT_CALL(jint, SSLConf, apply)(TCN_STDARGS, jlong cctx,
unsigned long ec;
#ifndef HAVE_EXPORT_CIPHERS
size_t len;
- char *buf = NULL;
#endif
+ char *buf = NULL;
TCN_ALLOC_CSTRING(cmd);
TCN_ALLOC_CSTRING(value);
UNREFERENCED(o);
=====================================
native/src/sslcontext.c
=====================================
@@ -287,8 +287,7 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, make)(TCN_STDARGS, jlong pool,
#ifdef HAVE_TLSV1_3
if (prot == TLS1_3_VERSION && protocol & SSL_PROTOCOL_TLSV1_2) {
prot = TLS1_2_VERSION;
- } else
-/* NOTE the dangling else above: take care to preserve it */
+ }
#endif
if (prot == TLS1_2_VERSION && protocol & SSL_PROTOCOL_TLSV1_1) {
prot = TLS1_1_VERSION;
=====================================
native/src/sslutils.c
=====================================
@@ -34,7 +34,7 @@ extern int WIN32_SSL_password_prompt(tcn_pass_cb_t *data);
#define ASN1_SEQUENCE 0x30
#define ASN1_OID 0x06
#define ASN1_STRING 0x86
-static int ssl_verify_OCSP(int ok, X509_STORE_CTX *ctx);
+static int ssl_verify_OCSP(X509_STORE_CTX *ctx);
static int ssl_ocsp_request(X509 *cert, X509 *issuer, X509_STORE_CTX *ctx);
#endif
@@ -310,8 +310,9 @@ int SSL_callback_SSL_verify(int ok, X509_STORE_CTX *ctx)
#endif
if (verify == SSL_CVERIFY_UNSET ||
- verify == SSL_CVERIFY_NONE)
+ verify == SSL_CVERIFY_NONE) {
return 1;
+ }
if (SSL_VERIFY_ERROR_IS_OPTIONAL(errnum) &&
(verify == SSL_CVERIFY_OPTIONAL_NO_CA)) {
@@ -348,7 +349,7 @@ int SSL_callback_SSL_verify(int ok, X509_STORE_CTX *ctx)
ok = 0;
}
else {
- int ocsp_response = ssl_verify_OCSP(ok, ctx);
+ int ocsp_response = ssl_verify_OCSP(ctx);
if (ocsp_response == OCSP_STATUS_REVOKED) {
ok = 0 ;
errnum = X509_STORE_CTX_get_error(ctx);
@@ -507,7 +508,7 @@ int SSL_callback_alpn_select_proto(SSL* ssl, const unsigned char **out, unsigned
#ifdef HAVE_OCSP_STAPLING
/* Function that is used to do the OCSP verification */
-static int ssl_verify_OCSP(int ok, X509_STORE_CTX *ctx)
+static int ssl_verify_OCSP(X509_STORE_CTX *ctx)
{
X509 *cert, *issuer;
int r = OCSP_STATUS_UNKNOWN;
@@ -722,24 +723,22 @@ static char **decode_OCSP_url(ASN1_OCTET_STRING *os, apr_pool_t *p)
/* stolen from openssl ocsp command */
-static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
- STACK_OF(OCSP_CERTID) *ids)
+static int add_ocsp_cert(OCSP_REQUEST *req, X509 *cert, X509 *issuer)
{
OCSP_CERTID *id;
if (!issuer)
return 0;
- if (!*req)
- *req = OCSP_REQUEST_new();
- if (!*req)
- return 0;
id = OCSP_cert_to_id(NULL, cert, issuer);
- if (!id || !sk_OCSP_CERTID_push(ids, id))
+ if (!id)
return 0;
- if (!OCSP_request_add0_id(*req, id))
+ if (!OCSP_request_add0_id(req, id)) {
+ OCSP_CERTID_free(id);
return 0;
- else
+ } else {
+ /* id will be freed by OCSP_REQUEST_free() */
return 1;
+ }
}
@@ -801,7 +800,6 @@ static int ocsp_send_req(apr_socket_t *sock, BIO *req)
int len;
char buf[TCN_BUFFER_SZ];
apr_status_t rv;
- int ok = 1;
while ((len = BIO_read(req, buf, sizeof buf)) > 0) {
char *wbuf = buf;
@@ -815,12 +813,11 @@ static int ocsp_send_req(apr_socket_t *sock, BIO *req)
} while (rv == APR_SUCCESS && remain > 0);
if (rv != APR_SUCCESS) {
- apr_socket_close(sock);
- ok = 0;
+ return 0;
}
}
- return ok;
+ return 1;
}
@@ -909,7 +906,7 @@ err:
/* Reads the response from the APR socket to a buffer, and parses the buffer to
return the OCSP response */
#define ADDLEN 512
-static OCSP_RESPONSE *ocsp_get_resp(apr_socket_t *sock)
+static OCSP_RESPONSE *ocsp_get_resp(apr_pool_t *mp, apr_socket_t *sock)
{
int buflen;
apr_size_t totalread = 0;
@@ -919,7 +916,7 @@ static OCSP_RESPONSE *ocsp_get_resp(apr_socket_t *sock)
apr_pool_t *p;
OCSP_RESPONSE *resp;
- apr_pool_create(&p, NULL);
+ apr_pool_create(&p, mp);
buflen = ADDLEN;
buf = apr_palloc(p, buflen);
if (buf == NULL) {
@@ -959,34 +956,29 @@ static OCSP_RESPONSE *ocsp_get_resp(apr_socket_t *sock)
}
/* Creates and OCSP request and returns the OCSP_RESPONSE */
-static OCSP_RESPONSE *get_ocsp_response(X509 *cert, X509 *issuer, char *url)
+static OCSP_RESPONSE *get_ocsp_response(apr_pool_t *p, X509 *cert, X509 *issuer, char *url)
{
OCSP_RESPONSE *ocsp_resp = NULL;
OCSP_REQUEST *ocsp_req = NULL;
BIO *bio_req;
char *hostname, *path, *c_port;
int port, use_ssl;
- STACK_OF(OCSP_CERTID) *ids = NULL;
int ok = 0;
apr_socket_t *apr_sock = NULL;
apr_pool_t *mp;
- apr_pool_create(&mp, NULL);
- ids = sk_OCSP_CERTID_new_null();
-
- /* problem parsing the URL */
- if (OCSP_parse_url(url,&hostname, &c_port, &path, &use_ssl) == 0 ) {
- sk_OCSP_CERTID_free(ids);
- return NULL;
- }
+ if (OCSP_parse_url(url,&hostname, &c_port, &path, &use_ssl) == 0 )
+ goto end;
- /* Create the OCSP request */
if (sscanf(c_port, "%d", &port) != 1)
goto end;
+
+ /* Create the OCSP request */
ocsp_req = OCSP_REQUEST_new();
if (ocsp_req == NULL)
- return NULL;
- if (add_ocsp_cert(&ocsp_req,cert,issuer,ids) == 0 )
+ goto end;
+
+ if (add_ocsp_cert(ocsp_req,cert,issuer) == 0 )
goto free_req;
/* create the BIO with the request to send */
@@ -995,29 +987,30 @@ static OCSP_RESPONSE *get_ocsp_response(X509 *cert, X509 *issuer, char *url)
goto free_req;
}
+ apr_pool_create(&mp, p);
apr_sock = make_socket(hostname, port, mp);
if (apr_sock == NULL) {
- ocsp_resp = NULL;
goto free_bio;
}
ok = ocsp_send_req(apr_sock, bio_req);
- if (ok)
- ocsp_resp = ocsp_get_resp(apr_sock);
+ if (ok) {
+ ocsp_resp = ocsp_get_resp(mp, apr_sock);
+ }
+ apr_socket_close(apr_sock);
free_bio:
BIO_free(bio_req);
-
-free_req:
- if(apr_sock && ok) /* if ok == 0 we have already closed the socket */
- apr_socket_close(apr_sock);
-
apr_pool_destroy(mp);
- sk_OCSP_CERTID_free(ids);
+free_req:
OCSP_REQUEST_free(ocsp_req);
end:
+ OPENSSL_free(hostname);
+ OPENSSL_free(c_port);
+ OPENSSL_free(path);
+
return ocsp_resp;
}
@@ -1034,14 +1027,12 @@ static int process_ocsp_response(OCSP_RESPONSE *ocsp_resp, X509 *cert, X509 *iss
r = OCSP_response_status(ocsp_resp);
if (r != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
- OCSP_RESPONSE_free(ocsp_resp);
return OCSP_STATUS_UNKNOWN;
}
bs = OCSP_response_get1_basic(ocsp_resp);
certid = OCSP_cert_to_id(NULL, cert, issuer);
if (certid == NULL) {
- OCSP_RESPONSE_free(ocsp_resp);
return OCSP_STATUS_UNKNOWN;
}
ss = OCSP_resp_get0(bs, OCSP_resp_find(bs, certid, -1)); /* find by serial number and get the matching response */
@@ -1057,7 +1048,7 @@ static int process_ocsp_response(OCSP_RESPONSE *ocsp_resp, X509 *cert, X509 *iss
/* we clean up */
OCSP_CERTID_free(certid);
- OCSP_RESPONSE_free(ocsp_resp);
+ OCSP_BASICRESP_free(bs);
return o;
}
@@ -1087,7 +1078,7 @@ static int ssl_ocsp_request(X509 *cert, X509 *issuer, X509_STORE_CTX *ctx)
int rv = OCSP_STATUS_UNKNOWN;
/* for the time being just check for the fist response .. a better
approach is to iterate for all the possible ocsp urls */
- resp = get_ocsp_response(cert, issuer, ocsp_urls[0]);
+ resp = get_ocsp_response(p, cert, issuer, ocsp_urls[0]);
if (resp != NULL) {
rv = process_ocsp_response(resp, cert, issuer);
} else {
@@ -1096,6 +1087,7 @@ static int ssl_ocsp_request(X509 *cert, X509 *issuer, X509_STORE_CTX *ctx)
}
if (resp != NULL) {
+ OCSP_RESPONSE_free(resp);
apr_pool_destroy(p);
return rv;
}
=====================================
native/srclib/VERSIONS
=====================================
@@ -1,4 +1,4 @@
Use the following version of the libraries
- APR 1.6.5 or later, http://apr.apache.org
-- OpenSSL 1.0.2p or later, http://www.openssl.org
+- OpenSSL 1.0.2q or later, http://www.openssl.org
=====================================
native/tcnative.spec
=====================================
@@ -21,7 +21,7 @@
Summary: Tomcat Native Java library
Name: tcnative
-Version: 1.2.18
+Version: 1.2.19
Release: 1
License: Apache Software License
Group: System Environment/Libraries
=====================================
xdocs/index.xml
=====================================
@@ -59,10 +59,10 @@
<section name="Headlines">
<ul>
-<li><a href="news/2018.html#20180613">13 June 2018 - <b>TC-Native-1.2.17
+<li><a href="news/2018.html#20181020">10 Oct 2018 - <b>TC-Native-1.2.18
released</b></a>
<p>The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.17 Stable.</p>
+Tomcat Native 1.2.18 Stable.</p>
<p>
The sources and the binaries for selected platforms are available from the
<a href="../download-native.cgi">Download page</a>.
=====================================
xdocs/miscellaneous/changelog.xml
=====================================
@@ -34,6 +34,25 @@
This is the Changelog for Tomcat Native 1.2.
</p>
</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>
=====================================
xdocs/news/2018.xml
=====================================
@@ -29,6 +29,13 @@
<body>
<section name="2018 News & Status">
+ <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 festure 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
View it on GitLab: https://salsa.debian.org/java-team/tomcat-native/compare/c925477d1d4f6888d6581c046603d3ba84dbfc11...9b24c78643bb89f94afe8658c6656087e98a0cec
--
View it on GitLab: https://salsa.debian.org/java-team/tomcat-native/compare/c925477d1d4f6888d6581c046603d3ba84dbfc11...9b24c78643bb89f94afe8658c6656087e98a0cec
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181210/b10433ed/attachment.html>
More information about the pkg-java-commits
mailing list