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 755a9cb Correct fox for OpenSSL 3.x build
755a9cb is described below
commit 755a9cbd49fa4f1ad6e38b741957bf2cede42b63
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jul 8 11:50:53 2021 +0100
Correct fox for OpenSSL 3.x build
---
native/src/sslutils.c | 4 ++--
xdocs/miscellaneous/changelog.xml | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/native/src/sslutils.c b/native/src/sslutils.c
index 314bdad..46898be 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -993,9 +993,9 @@ static OCSP_RESPONSE *get_ocsp_response(apr_pool_t *p, X509
*cert, X509 *issuer,
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 )
+ if (OCSP_parse_url(url, &hostname, &c_port, &path, &use_ssl) == 0)
#else
- if (OCSP_HTTP_parse_url(url,&hostname, &c_port, NULL, &path, &use_ssl) ==
0 )
+ if (OSSL_HTTP_parse_url(url, &use_ssl, NULL, &hostname, &c_port, NULL,
&path, NULL, NULL) == 0)
#endif
goto end;
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 39737cc..f43f41e 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -36,6 +36,10 @@
</section>
<section name="Changes in 1.2.31">
<changelog>
+ <fix>
+ <bug>65441</bug>: Correct previous fix that enabled building to continue
+ with OpenSSL 3.x. Patch provided by lzsiga. (markt)
+ </fix>
</changelog>
</section>
<section name="Changes in 1.2.30">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
