This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 0bc92cc3dd5828f03588bfe240b0c01cbe0caeb4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 15 12:01:13 2022 +0100
Update OpenSSL patch for 3.0.x based on 3.0.3
---
...vcrt-1.1.1.patch => openssl-msvcrt-3.0.3.patch} | 77 +++++++++++-----------
1 file changed, 40 insertions(+), 37 deletions(-)
diff --git a/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
b/native/srclib/openssl/openssl-msvcrt-3.0.3.patch
similarity index 53%
rename from native/srclib/openssl/openssl-msvcrt-1.1.1.patch
rename to native/srclib/openssl/openssl-msvcrt-3.0.3.patch
index d0d896107..1e2ef4d48 100644
--- a/native/srclib/openssl/openssl-msvcrt-1.1.1.patch
+++ b/native/srclib/openssl/openssl-msvcrt-3.0.3.patch
@@ -1,6 +1,8 @@
---- Configurations/10-main.conf
-+++ Configurations/10-main.conf
-@@ -1268,7 +1268,7 @@
+diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
+index a7294d2ad1..24c887f8d3 100644
+--- a/Configurations/10-main.conf
++++ b/Configurations/10-main.conf
+@@ -1361,7 +1361,7 @@ my %targets = (
# prefer [non-debug] openssl.exe to be free from Micorosoft RTL
# redistributable.
bin_cflags => add(picker(debug => "/MDd",
@@ -9,32 +11,51 @@
)),
bin_lflags => add("/subsystem:console /opt:ref"),
ex_libs => add(sub {
---- crypto/engine/eng_openssl.c
-+++ crypto/engine/eng_openssl.c
-@@ -9,6 +9,7 @@
- */
+diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
+index 91656e6b80..cf51ed08fe 100644
+--- a/crypto/engine/eng_openssl.c
++++ b/crypto/engine/eng_openssl.c
+@@ -18,6 +18,7 @@
+ #include "internal/deprecated.h"
#include <stdio.h>
+#include "e_os.h"
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
- #include "internal/engine.h"
---- crypto/o_time.c
-+++ crypto/o_time.c
-@@ -41,10 +41,6 @@
+ #include "crypto/engine.h"
+diff --git a/crypto/o_time.c b/crypto/o_time.c
+index 23ffe16245..cd448e5483 100644
+--- a/crypto/o_time.c
++++ b/crypto/o_time.c
+@@ -41,10 +41,6 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm
*result)
if (gmtime_r(timer, result) == NULL)
return NULL;
ts = result;
--#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
+-#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
&& !defined(_WIN32_WCE)
- if (gmtime_s(result, timer))
- return NULL;
- ts = result;
#else
ts = gmtime(timer);
if (ts == NULL)
---- engines/e_capi.c
-+++ engines/e_capi.c
-@@ -15,6 +15,7 @@
+diff --git a/e_os.h b/e_os.h
+index 514de967a9..49b68d10a3 100644
+--- a/e_os.h
++++ b/e_os.h
+@@ -139,7 +139,7 @@ static __inline unsigned int _strlen31(const char *str)
+ # endif
+ # include <malloc.h>
+ # if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) &&
defined(stdin)
+-# if _MSC_VER>=1300 && _MSC_VER<1600
++# ifdef _WIN64
+ # undef stdin
+ # undef stdout
+ # undef stderr
+diff --git a/engines/e_capi.c b/engines/e_capi.c
+index 6f223a6922..045d1368fd 100644
+--- a/engines/e_capi.c
++++ b/engines/e_capi.c
+@@ -18,6 +18,7 @@
# include <wincrypt.h>
# include <stdio.h>
@@ -42,8 +63,10 @@
# include <string.h>
# include <stdlib.h>
# include <malloc.h>
---- test/testutil/basic_output.c
-+++ test/testutil/basic_output.c
+diff --git a/test/testutil/basic_output.c b/test/testutil/basic_output.c
+index 92f3de9300..47a4f19901 100644
+--- a/test/testutil/basic_output.c
++++ b/test/testutil/basic_output.c
@@ -10,6 +10,7 @@
#include "../testutil.h"
#include "output.h"
@@ -52,23 +75,3 @@
#include <openssl/crypto.h>
#include <openssl/bio.h>
---- e_os.h
-+++ e_os.h
-@@ -149,7 +149,7 @@
- # endif
- # include <malloc.h>
- # if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) &&
defined(stdin)
--# if _MSC_VER>=1300 && _MSC_VER<1600
-+# ifdef _WIN64
- # undef stdin
- # undef stdout
- # undef stderr
-@@ -157,7 +157,7 @@
- # define stdin (&__iob_func()[0])
- # define stdout (&__iob_func()[1])
- # define stderr (&__iob_func()[2])
--# elif _MSC_VER<1300 && defined(I_CAN_LIVE_WITH_LNK4049)
-+# else
- # undef stdin
- # undef stdout
- # undef stderr
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
