mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix OpenSSLStreamAdapter tests when openssl is boringssl

Browse source 
This is a follow-up to:
https://webrtc-review.googlesource.com/c/src/+/318640

The problem was that the scoped field trials in the tests only
applied to the construction of the streams, not the handshake.

Note, although the changes are in OpenSSLStreamAdapter, this CL
actually fixes the SSLStreamAdapterTestDTLSExtensionPermutation tests
in rtc_base/ssl_stream_adapter_unittest.cc.

Bug: webrtc:15467
Change-Id: I25cdd758aab1bc67fd7a6a61c956c6d52f82e3d1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/344762
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41976}
This commit is contained in:
Tommi 2024-03-29 20:15:47 +01:00 committed by WebRTC LUCI CQ
parent cc91e075ea
commit 018feb90c2
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rtc_base/openssl_stream_adapter.cc
View file

@ -290,6 +290,10 @@ OpenSSLStreamAdapter::OpenSSLStreamAdapter(
ssl_write_needs_read_(false),
ssl_(nullptr),
ssl_ctx_(nullptr),
#ifdef OPENSSL_IS_BORINGSSL
permute_extension_(
webrtc::field_trial::IsEnabled("WebRTC-PermuteTlsClientHello")),
#endif
ssl_mode_(SSL_MODE_TLS),
ssl_max_version_(SSL_PROTOCOL_TLS_12) {
stream_->SignalEvent.connect(this, &OpenSSLStreamAdapter::OnEvent);
@ -1069,8 +1073,7 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() {
}
#ifdef OPENSSL_IS_BORINGSSL
SSL_CTX_set_permute_extensions(
ctx, webrtc::field_trial::IsEnabled("WebRTC-PermuteTlsClientHello"));
SSL_CTX_set_permute_extensions(ctx, permute_extension_);
#endif
return ctx;

4
rtc_base/openssl_stream_adapter.h
View file

@ -223,6 +223,10 @@ class OpenSSLStreamAdapter final : public SSLStreamAdapter,
// Our key and certificate.
#ifdef OPENSSL_IS_BORINGSSL
std::unique_ptr<BoringSSLIdentity> identity_;
// We check and store the `WebRTC-PermuteTlsClientHello` field trial config in
// the constructor for convenience to allow tests to apply different
// configurations across instances.
const bool permute_extension_;
#else
std::unique_ptr<OpenSSLIdentity> identity_;
#endif