[tomcat-native] branch main updated: Rename flag to better reflect usage

[markt]

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 0f0df3394 Rename flag to better reflect usage
0f0df3394 is described below

commit 0f0df33940b87c8f9d7a1acaf88dc96f8a31ef39
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 a79f6b99b..6d78fa7b4 100644
--- a/native/include/ssl_private.h
+++ b/native/include/ssl_private.h
@@ -207,7 +207,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 caa9d5a9a..cbe8b2f84 100644
--- a/native/src/sslutils.c
+++ b/native/src/sslutils.c
@@ -26,7 +26,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 */
@@ -355,7 +355,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) {
@@ -509,7 +509,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)
@@ -1095,4 +1095,4 @@ static int ssl_ocsp_request(X509 *cert, X509 *issuer, 
X509_STORE_CTX *ctx)
     return OCSP_STATUS_UNKNOWN;
 }
 
-#endif /* HAVE_OCSP_STAPLING */
+#endif /* HAVE_OCSP */


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org