This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/master by this push:
new 3ee4a3f Enable building to continue against 1.1.1 and 3.x
3ee4a3f is described below
commit 3ee4a3fe34c9d5ceb0b1acf18c5b7963604868bd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 15 15:38:50 2020 +0100
Enable building to continue against 1.1.1 and 3.x
---
native/src/sslutils.c | 5 ++++-
xdocs/miscellaneous/changelog.xml | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/native/src/sslutils.c b/native/src/sslutils.c
index 0896429..b31a1b8 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -992,8 +992,11 @@ static OCSP_RESPONSE *get_ocsp_response(apr_pool_t *p,
X509 *cert, X509 *issuer,
int ok = 0;
apr_socket_t *apr_sock = NULL;
apr_pool_t *mp;
-
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
if (OCSP_parse_url(url,&hostname, &c_port, &path, &use_ssl) == 0 )
+#else
+ if (OCSP_parse_url(url,&hostname, &c_port, NULL, &path, &use_ssl) == 0 )
+#endif
goto end;
if (sscanf(c_port, "%d", &port) != 1)
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index af7fa20..f607e81 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -35,6 +35,11 @@
</p>
</section>
<section name="Changes in 1.2.26">
+ <changelog>
+ <fix>
+ Enable building to continue against OpenSSL 3.x and 1.1.1. (markt)
+ </fix>
+ </changelog>
</section>
<section name="Changes in 1.2.25">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
