This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit adb92a9721c5165ab1e680143c876809bb9dfc04 Author: Masaori Koshiba <[email protected]> AuthorDate: Mon Nov 18 08:26:05 2024 +0900 Fix setting TLS groups with BoringSSL (#11840) * Fix setting TLS groups with BoringSSL * Get rid of #ifdef for old openssl (cherry picked from commit a860656e9b3861171436d7cbc7420b56a89548a9) --- src/iocore/net/SSLUtils.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/iocore/net/SSLUtils.cc b/src/iocore/net/SSLUtils.cc index 82928f2e58..776aada918 100644 --- a/src/iocore/net/SSLUtils.cc +++ b/src/iocore/net/SSLUtils.cc @@ -1556,20 +1556,15 @@ SSLMultiCertConfigLoader::_set_cipher_suites([[maybe_unused]] SSL_CTX *ctx) } bool -SSLMultiCertConfigLoader::_set_curves([[maybe_unused]] SSL_CTX *ctx) +SSLMultiCertConfigLoader::_set_curves(SSL_CTX *ctx) { -#if defined(SSL_CTX_set1_groups_list) || defined(SSL_CTX_set1_curves_list) if (this->_params->server_groups_list != nullptr) { -#ifdef SSL_CTX_set1_groups_list if (!SSL_CTX_set1_groups_list(ctx, this->_params->server_groups_list)) { -#else - if (!SSL_CTX_set1_curves_list(ctx, this->_params->server_groups_list)) { -#endif SSLError("invalid groups list for server in %s", ts::filename::RECORDS); return false; } } -#endif + return true; }
