From 96ec715a7e4522ac40af4afcda3ef0da5e214d61 Mon Sep 17 00:00:00 2001 From: Arul Thileeban Sagayam Date: Sun, 21 Jul 2024 13:48:25 -0400 Subject: [PATCH] tls: fix merge issues due to server_context refactoring Signed-off-by: Arul Thileeban Sagayam --- source/common/tls/server_context_config_impl.cc | 3 ++- source/common/tls/server_context_config_impl.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/common/tls/server_context_config_impl.cc b/source/common/tls/server_context_config_impl.cc index bfd611dbdb60..e40ebd9d15ce 100644 --- a/source/common/tls/server_context_config_impl.cc +++ b/source/common/tls/server_context_config_impl.cc @@ -123,7 +123,8 @@ ServerContextConfigImpl::ServerContextConfigImpl( disable_stateless_session_resumption_(getStatelessSessionResumptionDisabled(config)), disable_stateful_session_resumption_(config.disable_stateful_session_resumption()), full_scan_certs_on_sni_mismatch_( - PROTOBUF_GET_WRAPPED_OR_DEFAULT(config, full_scan_certs_on_sni_mismatch, false)) { + PROTOBUF_GET_WRAPPED_OR_DEFAULT(config, full_scan_certs_on_sni_mismatch, false)), + prefer_client_ciphers_(config.prefer_client_ciphers()) { SET_AND_RETURN_IF_NOT_OK(creation_status, creation_status); if (session_ticket_keys_provider_ != nullptr) { // Validate tls session ticket keys early to reject bad sds updates. diff --git a/source/common/tls/server_context_config_impl.h b/source/common/tls/server_context_config_impl.h index 5cacbbb0d438..b11ddba70802 100644 --- a/source/common/tls/server_context_config_impl.h +++ b/source/common/tls/server_context_config_impl.h @@ -40,6 +40,7 @@ class ServerContextConfigImpl : public ContextConfigImpl, public Envoy::Ssl::Ser } bool fullScanCertsOnSNIMismatch() const override { return full_scan_certs_on_sni_mismatch_; } + bool preferClientCiphers() const override { return prefer_client_ciphers_; } private: ServerContextConfigImpl( @@ -71,6 +72,7 @@ class ServerContextConfigImpl : public ContextConfigImpl, public Envoy::Ssl::Ser const bool disable_stateless_session_resumption_; const bool disable_stateful_session_resumption_; bool full_scan_certs_on_sni_mismatch_; + const bool prefer_client_ciphers_; }; } // namespace Tls