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
The following commit(s) were added to refs/heads/main by this push:
new d8edaeb9c Update OpenSSL 3.0.x patch for addition of INT64_MAx constant
d8edaeb9c is described below
commit d8edaeb9c7da5f2367396757539df0fe0fa260c8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Feb 4 19:24:47 2024 +0000
Update OpenSSL 3.0.x patch for addition of INT64_MAx constant
---
native/srclib/openssl/openssl-msvcrt-3.0.x.patch | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
b/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
index 7d181907e..c3d78ab21 100644
--- a/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
+++ b/native/srclib/openssl/openssl-msvcrt-3.0.x.patch
@@ -1,5 +1,5 @@
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index 66bc81dfb4..52345e4f33 100644
+index ff8af71463..6df28ea847 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1379,7 +1379,7 @@ my %targets = (
@@ -25,7 +25,7 @@ index 059afe47b9..cbece5fcb3 100644
#endif
diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c
-index ed611d64dd..09238bfb7d 100644
+index 7cf27cc9d4..759d15262e 100644
--- a/crypto/cmp/cmp_util.c
+++ b/crypto/cmp/cmp_util.c
@@ -9,6 +9,7 @@
@@ -37,7 +37,7 @@ index ed611d64dd..09238bfb7d 100644
#include <openssl/cmp_util.h>
#include "cmp_local.h" /* just for decls of internal functions defined here */
diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c
-index 91656e6b80..e0692e5618 100644
+index 91656e6b80..cf51ed08fe 100644
--- a/crypto/engine/eng_openssl.c
+++ b/crypto/engine/eng_openssl.c
@@ -18,6 +18,7 @@
@@ -48,6 +48,18 @@ index 91656e6b80..e0692e5618 100644
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
#include "crypto/engine.h"
+diff --git a/crypto/property/property_parse.c
b/crypto/property/property_parse.c
+index 19ea39a786..137c2a35b8 100644
+--- a/crypto/property/property_parse.c
++++ b/crypto/property/property_parse.c
+@@ -12,6 +12,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <openssl/err.h>
++#include "internal/numbers.h"
+ #include "internal/propertyerr.h"
+ #include "internal/property.h"
+ #include "crypto/ctype.h"
diff --git a/engines/e_capi.c b/engines/e_capi.c
index 6f223a6922..045d1368fd 100644
--- a/engines/e_capi.c
@@ -73,7 +85,7 @@ index 92f3de9300..e84301946e 100644
#include "output.h"
#include "tu_local.h"
diff --git a/test/testutil/provider.c b/test/testutil/provider.c
-index d073d732da..8a96f9a151 100644
+index 79ae13b42a..7aeda67e0d 100644
--- a/test/testutil/provider.c
+++ b/test/testutil/provider.c
@@ -7,6 +7,7 @@
@@ -84,4 +96,3 @@ index d073d732da..8a96f9a151 100644
#include "../testutil.h"
#include <ctype.h>
#include <openssl/provider.h>
-
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
