This is an automated email from the ASF dual-hosted git repository.
JosiahWI pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 80c01c262e Rename `OPENSSL_IS_X` -> `OPENSSL_IS_AT_LEAST_X` (#13469)
80c01c262e is described below
commit 80c01c262ee51736d8d43f8dc859446550496dc9
Author: JosiahWI <[email protected]>
AuthorDate: Fri Jul 31 17:35:16 2026 -0500
Rename `OPENSSL_IS_X` -> `OPENSSL_IS_AT_LEAST_X` (#13469)
This is for consistency since there is now OpenSSL 4, and we need
to add a macro definition for OpenSSL 4 as well.
---
CMakeLists.txt | 6 +++---
example/plugins/c-api/verify_cert/verify_cert.cc | 2 +-
include/cripts/Connections.hpp | 2 +-
.../access_control/unit_tests/test_utils.cc | 2 +-
plugins/experimental/sslheaders/sslheaders.cc | 2 +-
plugins/experimental/wasm/ats_context.cc | 14 ++++++-------
plugins/lua/ts_lua_client_request.cc | 24 +++++++++++-----------
src/iocore/net/CMakeLists.txt | 2 +-
src/iocore/net/P_SSLNetVConnection.h | 2 +-
src/iocore/net/P_SSLUtils.h | 6 +++---
src/iocore/net/SSLClientUtils.cc | 2 +-
src/iocore/net/SSLKeyUtils.cc | 8 ++++----
src/iocore/net/SSLKeyUtils.h | 4 ++--
src/iocore/net/SSLNetVConnection.cc | 4 ++--
src/iocore/net/SSLUtils.cc | 2 +-
src/tscore/CMakeLists.txt | 2 +-
16 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e926d8a899..8693d42a9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,8 +314,8 @@ if(NOT SSLLIB_IS_BORINGSSL
AND NOT SSLLIB_IS_AWSLC
AND OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0"
)
- set(SSLLIB_IS_OPENSSL3 TRUE)
- add_compile_definitions(OPENSSL_API_COMPAT=10002 OPENSSL_IS_OPENSSL3)
+ set(SSLLIB_IS_AT_LEAST_OPENSSL3 TRUE)
+ add_compile_definitions(OPENSSL_API_COMPAT=10002
OPENSSL_IS_AT_LEAST_OPENSSL3)
endif()
check_openssl_has_quic_tls_cbs(SSLLIB_HAS_QUIC_TLS_CBS
"${OPENSSL_INCLUDE_DIR}")
@@ -636,7 +636,7 @@ check_symbol_exists(ENGINE_get_default_RSA
"openssl/engine.h" HAVE_ENGINE_GET_DE
check_symbol_exists(ENGINE_load_private_key "openssl/engine.h"
HAVE_ENGINE_LOAD_PRIVATE_KEY)
check_symbol_exists(sysctlbyname "sys/sysctl.h" HAVE_SYSCTLBYNAME)
-if(SSLLIB_IS_OPENSSL3)
+if(SSLLIB_IS_AT_LEAST_OPENSSL3)
check_symbol_exists(SSL_CTX_set_tlsext_ticket_key_evp_cb "openssl/ssl.h"
TS_HAS_TLS_SESSION_TICKET)
else()
check_symbol_exists(SSL_CTX_set_tlsext_ticket_key_cb "openssl/ssl.h"
TS_HAS_TLS_SESSION_TICKET)
diff --git a/example/plugins/c-api/verify_cert/verify_cert.cc
b/example/plugins/c-api/verify_cert/verify_cert.cc
index f8746474bb..a3f553057f 100644
--- a/example/plugins/c-api/verify_cert/verify_cert.cc
+++ b/example/plugins/c-api/verify_cert/verify_cert.cc
@@ -66,7 +66,7 @@ CB_clientcert(TSCont /* contp */, TSEvent /* event */, void
*edata)
TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
TSSslConnection sslobj = TSVConnSslConnectionGet(ssl_vc);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
diff --git a/include/cripts/Connections.hpp b/include/cripts/Connections.hpp
index 5d7eccbd08..adee2a5296 100644
--- a/include/cripts/Connections.hpp
+++ b/include/cripts/Connections.hpp
@@ -365,7 +365,7 @@ class ConnBase
auto conn = Connection();
if (mTLS) {
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
return SSL_get1_peer_certificate(reinterpret_cast<::SSL *>(conn));
#else
return SSL_get_peer_certificate(reinterpret_cast<::SSL *>(conn));
diff --git a/plugins/experimental/access_control/unit_tests/test_utils.cc
b/plugins/experimental/access_control/unit_tests/test_utils.cc
index a74678425b..90695cd322 100644
--- a/plugins/experimental/access_control/unit_tests/test_utils.cc
+++ b/plugins/experimental/access_control/unit_tests/test_utils.cc
@@ -252,7 +252,7 @@ TEST_CASE("HMAC Digest: test various supported/unsupported
types", "[MAC][access
digests.push_back("ccf3230972bcf229fb3b16741495c74a72bbdd14");
#endif
-#ifdef OPENSSL_IS_OPENSSL3 // MD4, RIPEMD160 are deprecated in OpenSSL 3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3 // MD4, RIPEMD160 are deprecated in
OpenSSL 3
types.pop_front();
digests.pop_front();
types.pop_back();
diff --git a/plugins/experimental/sslheaders/sslheaders.cc
b/plugins/experimental/sslheaders/sslheaders.cc
index 6f33711286..b6613436c5 100644
--- a/plugins/experimental/sslheaders/sslheaders.cc
+++ b/plugins/experimental/sslheaders/sslheaders.cc
@@ -159,7 +159,7 @@ private:
void
_set()
{
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
_x509 = (IsClient ? SSL_get1_peer_certificate : SSL_get_certificate)(_ssl);
#else
_x509 = (IsClient ? SSL_get_peer_certificate : SSL_get_certificate)(_ssl);
diff --git a/plugins/experimental/wasm/ats_context.cc
b/plugins/experimental/wasm/ats_context.cc
index c7c2b636f3..5670ea1460 100644
--- a/plugins/experimental/wasm/ats_context.cc
+++ b/plugins/experimental/wasm/ats_context.cc
@@ -719,7 +719,7 @@ Context::getProperty(std::string_view path, std::string
*result)
TSVConn client_conn = TSHttpSsnClientVConnGet(ssnp);
TSSslConnection sslobj = TSVConnSslConnectionGet(client_conn);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -787,7 +787,7 @@ Context::getProperty(std::string_view path, std::string
*result)
TSVConn client_conn = TSHttpSsnClientVConnGet(ssnp);
TSSslConnection sslobj = TSVConnSslConnectionGet(client_conn);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -825,7 +825,7 @@ Context::getProperty(std::string_view path, std::string
*result)
TSVConn client_conn = TSHttpSsnClientVConnGet(ssnp);
TSSslConnection sslobj = TSVConnSslConnectionGet(client_conn);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -863,7 +863,7 @@ Context::getProperty(std::string_view path, std::string
*result)
TSVConn client_conn = TSHttpSsnClientVConnGet(ssnp);
TSSslConnection sslobj = TSVConnSslConnectionGet(client_conn);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -952,7 +952,7 @@ Context::getProperty(std::string_view path, std::string
*result)
TSVConn client_conn = TSHttpSsnServerVConnGet(ssnp);
TSSslConnection sslobj = TSVConnSslConnectionGet(client_conn);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -990,7 +990,7 @@ Context::getProperty(std::string_view path, std::string
*result)
TSVConn client_conn = TSHttpSsnServerVConnGet(ssnp);
TSSslConnection sslobj = TSVConnSslConnectionGet(client_conn);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1028,7 +1028,7 @@ Context::getProperty(std::string_view path, std::string
*result)
TSVConn client_conn = TSHttpSsnServerVConnGet(ssnp);
TSSslConnection sslobj = TSVConnSslConnectionGet(client_conn);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
diff --git a/plugins/lua/ts_lua_client_request.cc
b/plugins/lua/ts_lua_client_request.cc
index 4e675ffafa..1d6fb063b3 100644
--- a/plugins/lua/ts_lua_client_request.cc
+++ b/plugins/lua/ts_lua_client_request.cc
@@ -1299,7 +1299,7 @@ ts_lua_client_request_client_cert_get_pem(lua_State *L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1335,7 +1335,7 @@ ts_lua_client_request_client_cert_get_subject(lua_State
*L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1371,7 +1371,7 @@ ts_lua_client_request_client_cert_get_issuer(lua_State *L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1407,7 +1407,7 @@ ts_lua_client_request_client_cert_get_serial(lua_State *L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1443,7 +1443,7 @@ ts_lua_client_request_client_cert_get_signature(lua_State
*L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1479,7 +1479,7 @@
ts_lua_client_request_client_cert_get_not_before(lua_State *L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1515,7 +1515,7 @@ ts_lua_client_request_client_cert_get_not_after(lua_State
*L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1551,7 +1551,7 @@ ts_lua_client_request_client_cert_get_version(lua_State
*L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1585,7 +1585,7 @@ ts_lua_client_request_client_cert_get_san_dns(lua_State
*L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1626,7 +1626,7 @@ ts_lua_client_request_client_cert_get_san_ip(lua_State *L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1667,7 +1667,7 @@ ts_lua_client_request_client_cert_get_san_email(lua_State
*L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1708,7 +1708,7 @@ ts_lua_client_request_client_cert_get_san_uri(lua_State
*L)
TSSslConnection ssl_conn = TSVConnSslConnectionGet(client_conn);
if (ssl_conn) {
SSL *ssl = reinterpret_cast<SSL *>(ssl_conn);
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
diff --git a/src/iocore/net/CMakeLists.txt b/src/iocore/net/CMakeLists.txt
index 6ad1804a91..c76322b77c 100644
--- a/src/iocore/net/CMakeLists.txt
+++ b/src/iocore/net/CMakeLists.txt
@@ -147,7 +147,7 @@ if(BUILD_TESTING)
unit_tests/unit_test_main.cc
unit_tests/benchmark_TLSCertCompression.cc
)
- if(SSLLIB_IS_OPENSSL3)
+ if(SSLLIB_IS_AT_LEAST_OPENSSL3)
target_sources(test_net PRIVATE unit_tests/test_SSLDHParams.cc)
endif()
# Use link groups to solve circular dependency
diff --git a/src/iocore/net/P_SSLNetVConnection.h
b/src/iocore/net/P_SSLNetVConnection.h
index 28e0e99eb3..161748796d 100644
--- a/src/iocore/net/P_SSLNetVConnection.h
+++ b/src/iocore/net/P_SSLNetVConnection.h
@@ -258,7 +258,7 @@ public:
bool
peer_provided_cert() const override
{
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(this->ssl);
#else
X509 *cert = SSL_get_peer_certificate(this->ssl);
diff --git a/src/iocore/net/P_SSLUtils.h b/src/iocore/net/P_SSLUtils.h
index 4fb3a39363..b3e327fbef 100644
--- a/src/iocore/net/P_SSLUtils.h
+++ b/src/iocore/net/P_SSLUtils.h
@@ -25,7 +25,7 @@
#include "iocore/net/SSLTypes.h"
#include "tscore/Diags.h"
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
#include <openssl/decoder.h>
#include <openssl/evp.h>
#endif
@@ -122,7 +122,7 @@ namespace detail
}
};
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
struct PKEYCTXDeleter {
void
operator()(EVP_PKEY_CTX *pctx)
@@ -165,7 +165,7 @@ private:
using scoped_X509 = std::unique_ptr<X509, ssl::detail::X509Deleter>;
using scoped_BIO = std::unique_ptr<BIO, ssl::detail::BIODeleter>;
using scoped_PKEY = std::unique_ptr<EVP_PKEY, ssl::detail::PKEYDeleter>;
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
using scoped_PKEY_CTX = std::unique_ptr<EVP_PKEY_CTX,
ssl::detail::PKEYCTXDeleter>;
using scoped_Decoder_CTX = std::unique_ptr<OSSL_DECODER_CTX,
ssl::detail::DecoderCTXDeleter>;
#endif
diff --git a/src/iocore/net/SSLClientUtils.cc b/src/iocore/net/SSLClientUtils.cc
index 6497011e84..0f65c29f53 100644
--- a/src/iocore/net/SSLClientUtils.cc
+++ b/src/iocore/net/SSLClientUtils.cc
@@ -177,7 +177,7 @@ validate_server_certificate_hostname(NetVConnection *netvc,
std::string_view hos
char *matched_name = nullptr;
bool const enforce_mode = netvc->options.verifyServerPolicy ==
YamlSNIConfig::Policy::ENFORCED;
bool verified = false;
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
diff --git a/src/iocore/net/SSLKeyUtils.cc b/src/iocore/net/SSLKeyUtils.cc
index 4bf14c5f47..590353d2d8 100644
--- a/src/iocore/net/SSLKeyUtils.cc
+++ b/src/iocore/net/SSLKeyUtils.cc
@@ -23,13 +23,13 @@
#include "P_SSLUtils.h"
#include <tscore/Diags.h>
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
#include <tscore/ink_assert.h>
#else
#include <tscore/ink_config.h>
#endif
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
#include <openssl/evp.h>
#include <openssl/decoder.h>
#include <openssl/params.h>
@@ -41,7 +41,7 @@
#include <openssl/ssl.h>
#endif
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
EVP_PKEY *
gen_dh_2048_256_pkey()
@@ -187,4 +187,4 @@ set_ctx_dh(SSL_CTX *ctx, dh_key_t *pkey)
return result;
}
-#endif // OPENSSL_IS_OPENSSL3
+#endif // OPENSSL_IS_AT_LEAST_OPENSSL3
diff --git a/src/iocore/net/SSLKeyUtils.h b/src/iocore/net/SSLKeyUtils.h
index 64bea23e9e..aab9a35e43 100644
--- a/src/iocore/net/SSLKeyUtils.h
+++ b/src/iocore/net/SSLKeyUtils.h
@@ -21,14 +21,14 @@
#pragma once
-#if OPENSSL_IS_OPENSSL3
+#if OPENSSL_IS_AT_LEAST_OPENSSL3
#include <openssl/evp.h>
#else
#include <openssl/dh.h>
#endif
#include <openssl/ssl.h>
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
using dh_key_t = EVP_PKEY;
#else
using dh_key_t = DH;
diff --git a/src/iocore/net/SSLNetVConnection.cc
b/src/iocore/net/SSLNetVConnection.cc
index d8458c2df8..a1b5ea43bd 100644
--- a/src/iocore/net/SSLNetVConnection.cc
+++ b/src/iocore/net/SSLNetVConnection.cc
@@ -1431,7 +1431,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
switch (ssl_error) {
case SSL_ERROR_NONE:
if (dbg_ctl_ssl.on()) {
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
@@ -1613,7 +1613,7 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
switch (ssl_error) {
case SSL_ERROR_NONE:
if (dbg_ctl_ssl.on()) {
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
X509 *cert = SSL_get1_peer_certificate(ssl);
#else
X509 *cert = SSL_get_peer_certificate(ssl);
diff --git a/src/iocore/net/SSLUtils.cc b/src/iocore/net/SSLUtils.cc
index 6e766d6992..b78865526b 100644
--- a/src/iocore/net/SSLUtils.cc
+++ b/src/iocore/net/SSLUtils.cc
@@ -55,7 +55,7 @@
#include <openssl/asn1.h>
#include <openssl/bio.h>
#include <openssl/conf.h>
-#ifdef OPENSSL_IS_OPENSSL3
+#ifdef OPENSSL_IS_AT_LEAST_OPENSSL3
#include <openssl/evp.h>
#endif
#include <openssl/dh.h>
diff --git a/src/tscore/CMakeLists.txt b/src/tscore/CMakeLists.txt
index d3e70f7e5a..f951dec2bb 100644
--- a/src/tscore/CMakeLists.txt
+++ b/src/tscore/CMakeLists.txt
@@ -100,7 +100,7 @@ set_target_properties(tscore PROPERTIES
POSITION_INDEPENDENT_CODE TRUE)
if(SSLLIB_IS_BORINGSSL OR SSLLIB_IS_AWSLC)
target_sources(tscore PRIVATE HKDF_boringssl.cc)
-elseif(SSLLIB_IS_OPENSSL3)
+elseif(SSLLIB_IS_AT_LEAST_OPENSSL3)
target_sources(tscore PRIVATE HKDF_openssl3.cc)
else()
target_sources(tscore PRIVATE HKDF_openssl.cc)
