Skip to content

Commit 4018cea

Browse files
committed
Fixed failure of cert_validator_integration_test
1 parent 08599b7 commit 4018cea

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

source/common/tls/cert_validator/default_validator.cc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,11 +579,16 @@ absl::Status DefaultCertValidator::addClientValidationContext(SSL_CTX* ctx,
579579
// Set the verify_depth
580580
if (config_->maxVerifyDepth().has_value()) {
581581
uint32_t max_verify_depth = std::min(config_->maxVerifyDepth().value(), uint32_t{INT_MAX});
582+
#if 0
583+
// RH - Commented because we have verified that, even with OpenSSL 3.0.x
584+
// (in both 1.32 and 1.34 merged upstream Envoy), this causes a failure.
585+
582586
// Older BoringSSLs behave like OpenSSL 1.0.x and exclude the leaf from the
583587
// depth but include the trust anchor. Newer BoringSSLs match OpenSSL 1.1.x
584588
// and later in excluding both the leaf and trust anchor. `maxVerifyDepth`
585589
// documents the older behavior, so adjust the value to match.
586590
max_verify_depth = max_verify_depth > 0 ? max_verify_depth - 1 : 0;
591+
#endif
587592
SSL_CTX_set_verify_depth(ctx, static_cast<int>(max_verify_depth));
588593
}
589594
return absl::OkStatus();

0 commit comments

Comments
 (0)