Author: markt
Date: Wed Oct 17 10:09:39 2018
New Revision: 1844079
URL: http://svn.apache.org/viewvc?rev=1844079&view=rev
Log:
Latest OpenSSL 1.0.2 needs additional patch to work with our build env
Modified:
tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
Modified: tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch?rev=1844079&r1=1844078&r2=1844079&view=diff
==============================================================================
--- tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch (original)
+++ tomcat/native/trunk/native/srclib/openssl/openssl-msvcrt.patch Wed Oct 17
10:09:39 2018
@@ -1,3 +1,17 @@
+--- crypto/o_time.c
++++ crypto/o_time.c
+@@ -109,10 +109,6 @@
+ if (gmtime_r(timer, result) == NULL)
+ return NULL;
+ ts = result;
+-#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
+- if (gmtime_s(result, timer))
+- return NULL;
+- ts = result;
+ #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
+ ts = gmtime(timer);
+ if (ts == NULL)
+
--- util/pl/VC-32.pl
+++ util/pl/VC-32.pl
@@ -45,7 +45,7 @@
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
