You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/06/21 13:44:58 UTC
[tomcat-native] branch 1.2.x updated: Rename flag to better reflect usage
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.2.x by this push:
new dfd3251a4 Rename flag to better reflect usage
dfd3251a4 is described below
commit dfd3251a42bbbb4b49b945b531955cc7536d3765
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 21 14:43:09 2022 +0100
Rename flag to better reflect usage
---
native/include/ssl_private.h | 2 +-
native/src/sslutils.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/native/include/ssl_private.h b/native/include/ssl_private.h
index f01fc2190..545022ba2 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -209,7 +209,7 @@ extern ENGINE *tcn_ssl_engine;
/* OCSP stapling */
#if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb)
-#define HAVE_OCSP_STAPLING
+#define HAVE_OCSP
#define OCSP_STATUS_OK 0
#define OCSP_STATUS_REVOKED 1
#define OCSP_STATUS_UNKNOWN 2
diff --git a/native/src/sslutils.c b/native/src/sslutils.c
index 46898be03..c3bd41a45 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -27,7 +27,7 @@
extern int WIN32_SSL_password_prompt(tcn_pass_cb_t *data);
#endif
-#ifdef HAVE_OCSP_STAPLING
+#ifdef HAVE_OCSP
#include <openssl/bio.h>
#include <openssl/ocsp.h>
/* defines with the values as seen by the asn1parse -dump openssl command */
@@ -356,7 +356,7 @@ int SSL_callback_SSL_verify(int ok, X509_STORE_CTX *ctx)
X509_STORE_CTX_set_error(ctx, -1);
}
-#ifdef HAVE_OCSP_STAPLING
+#ifdef HAVE_OCSP
/* First perform OCSP validation if possible */
if (ocsp_check_type == 0) {
if (ok) {
@@ -528,7 +528,7 @@ int SSL_callback_alpn_select_proto(SSL* ssl, const unsigned char **out, unsigned
tcn_ssl_ctxt_t *ssl_ctxt = arg;
return select_next_proto(ssl, out, outlen, in, inlen, ssl_ctxt->alpn_proto_data, ssl_ctxt->alpn_proto_len, ssl_ctxt->alpn_selector_failure_behavior);
}
-#ifdef HAVE_OCSP_STAPLING
+#ifdef HAVE_OCSP
/* Function that is used to do the OCSP verification */
static int ssl_verify_OCSP(X509_STORE_CTX *ctx)
@@ -1125,5 +1125,5 @@ static int ssl_ocsp_request(X509 *cert, X509 *issuer, X509_STORE_CTX *ctx)
return OCSP_STATUS_UNKNOWN;
}
-#endif /* HAVE_OCSP_STAPLING */
+#endif /* HAVE_OCSP */
#endif /* HAVE_OPENSSL */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org