Skip to content

Commit 01a8dd0

Browse files
committed
Correct some flaws in the build
Signed-off-by: Dario Cillerai <[email protected]>
1 parent 107d692 commit 01a8dd0

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

source/common/quic/BUILD

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,18 @@ envoy_cc_library(
9292
name = "quic_stat_names_lib",
9393
srcs = ["quic_stat_names.cc"],
9494
hdrs = ["quic_stat_names.h"],
95-
tags = ["nofips"],
96-
deps = [
97-
"//envoy/stats:stats_interface",
98-
"//source/common/stats:symbol_table_lib",
99-
"@com_github_google_quiche//:quic_core_error_codes_lib",
100-
"@com_github_google_quiche//:quic_core_types_lib",
101-
],
95+
deps = select({
96+
"//bazel:disable_http3": [
97+
"//envoy/stats:stats_interface",
98+
"//source/common/stats:symbol_table_lib",
99+
],
100+
"//conditions:default": [
101+
"//envoy/stats:stats_interface",
102+
"//source/common/stats:symbol_table_lib",
103+
"@com_github_google_quiche//:quic_core_error_codes_lib",
104+
"@com_github_google_quiche//:quic_core_types_lib",
105+
],
106+
}),
102107
)
103108

104109
envoy_cc_library(
@@ -585,13 +590,12 @@ envoy_cc_library(
585590

586591
envoy_cc_library(
587592
name = "send_buffer_monitor_lib",
588-
srcs = ["send_buffer_monitor.cc"],
589-
hdrs = ["send_buffer_monitor.h"],
590-
tags = ["nofips"],
591-
deps = [
593+
srcs = envoy_select_enable_http3(["send_buffer_monitor.cc"]),
594+
hdrs = envoy_select_enable_http3(["send_buffer_monitor.h"]),
595+
deps = envoy_select_enable_http3([
592596
"//source/common/common:assert_lib",
593597
"@com_github_google_quiche//:quic_core_session_lib",
594-
],
598+
]),
595599
)
596600

597601
envoy_cc_library(
@@ -687,13 +691,13 @@ envoy_cc_library(
687691

688692
envoy_cc_library(
689693
name = "cert_compression_lib",
690-
srcs = ["cert_compression.cc"],
691-
hdrs = ["cert_compression.h"],
694+
srcs = envoy_select_enable_http3(["cert_compression.cc"]),
695+
hdrs = envoy_select_enable_http3(["cert_compression.h"]),
692696
external_deps = ["ssl"],
693-
deps = [
697+
deps = envoy_select_enable_http3([
694698
"//bazel/foreign_cc:zlib",
695699
"//source/common/common:assert_lib",
696700
"//source/common/common:logger_lib",
697701
"//source/common/runtime:runtime_lib",
698-
],
702+
]),
699703
)

source/common/tls/cert_validator/default_validator.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ absl::StatusOr<int> DefaultCertValidator::initializeSslContexts(std::vector<SSL_
8888

8989
for (auto& ctx : contexts) {
9090
X509_STORE* store = SSL_CTX_get_cert_store(ctx);
91-
// RH - Restore reloadable feature check to avoid failure of RevokedIntermediateCertificate test
91+
// OpenSSL: restore reloadable feature check to avoid failure of RevokedIntermediateCertificate test
9292
if (Runtime::runtimeFeatureEnabled("envoy.reloadable_features.enable_intermediate_ca")) {
9393
X509_STORE_set_flags(store, X509_V_FLAG_PARTIAL_CHAIN);
9494
}
@@ -146,7 +146,7 @@ absl::StatusOr<int> DefaultCertValidator::initializeSslContexts(std::vector<SSL_
146146

147147
for (auto& ctx : contexts) {
148148
X509_STORE* store = SSL_CTX_get_cert_store(ctx);
149-
// RH - Restore reloadable feature check to avoid failure of RevokedIntermediateCertificate test
149+
// OpenSSL: restore reloadable feature check to avoid failure of RevokedIntermediateCertificate test
150150
if (Runtime::runtimeFeatureEnabled("envoy.reloadable_features.enable_intermediate_ca")) {
151151
X509_STORE_set_flags(store, X509_V_FLAG_PARTIAL_CHAIN);
152152
}

test/common/tls/tls_certificate_selector_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ TEST_P(TlsCertificateSelectorFactoryTest, Failed) {
354354
testUtil(Ssl::SelectionResult::SelectionStatus::Failed);
355355
}
356356

357-
// RH dcillera: disabled because it selects cert async
357+
// Disabled because it selects cert async (not yet supported with OpenSSL)
358358
TEST_P(TlsCertificateSelectorFactoryTest, DISABLED_Pending) {
359359
testUtil(Ssl::SelectionResult::SelectionStatus::Pending);
360360
}

0 commit comments

Comments
 (0)