Author: rjung
Date: Thu Feb 18 07:22:21 2016
New Revision: 1731007
URL: http://svn.apache.org/viewvc?rev=1731007&view=rev
Log:
BZ 59024: Native function "versionString()"
and for OpenSSL 1.1.0 also "version()"
(both in in ssl.c) now return the OpenSSL
run time version, not the compile time version.
Backport of r1731004 and 1731006 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/ssl.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 18 07:22:21 2016
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651,1713237,1722542,1725247
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651,1713237,1722542,1725247,1731004,1731006
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=1731007&r1=1731006&r2=1731007&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Thu Feb 18 07:22:21 2016
@@ -263,13 +263,21 @@ DH *SSL_get_dh_params(unsigned keylen)
TCN_IMPLEMENT_CALL(jint, SSL, version)(TCN_STDARGS)
{
UNREFERENCED_STDARGS;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
return OPENSSL_VERSION_NUMBER;
+#else
+ return OpenSSL_version_num();
+#endif
}
TCN_IMPLEMENT_CALL(jstring, SSL, versionString)(TCN_STDARGS)
{
UNREFERENCED(o);
- return AJP_TO_JSTRING(OPENSSL_VERSION_TEXT);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ return AJP_TO_JSTRING(SSLeay_version(SSLEAY_VERSION));
+#else
+ return AJP_TO_JSTRING(OpenSSL_version(OPENSSL_VERSION));
+#endif
}
/*
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1731007&r1=1731006&r2=1731007&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Feb 18
07:22:21 2016
@@ -37,6 +37,16 @@
new documentation project for Tomcat Native was started.
</p>
</section>
+<section name="Changes between 1.1.34 and 1.1.35">
+ <changelog>
+ <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>
+ </changelog>
+</section>
<section name="Changes between 1.1.33 and 1.1.34">
<changelog>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
