From ddac9f27399902bb9bf3f5cd654c769a733e6dfe Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Tue, 29 Oct 2024 09:42:47 +0100 Subject: [PATCH] Reduce RSA key size for SSLStreamAdapter test and remove the testing of the nondefault key size from the "server" parameters to speed up tests BUG=webrtc:375552698 Change-Id: Ibc1bd491300964aa45826b98962ed3e56c6d4974 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/366941 Reviewed-by: Harald Alvestrand Reviewed-by: Christoffer Dewerin Commit-Queue: Philipp Hancke Cr-Commit-Position: refs/heads/main@{#43321} --- rtc_base/ssl_stream_adapter_unittest.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc index c937eed1d1..3534b1c9ae 100644 --- a/rtc_base/ssl_stream_adapter_unittest.cc +++ b/rtc_base/ssl_stream_adapter_unittest.cc @@ -1127,17 +1127,18 @@ TEST_P(SSLStreamAdapterTestDTLSHandshake, TestGetSslCipherSuite) { } // Test different key sizes with SHA-256, then different signature algorithms -// with ECDSA. +// with ECDSA. Two different RSA sizes are tested on the client side. +// TODO: bugs.webrtc.org/375552698 - these tests are slow in debug builds +// and have caused flakyness in the past with larger keysizes. INSTANTIATE_TEST_SUITE_P( SSLStreamAdapterTestDTLSHandshakeKeyParameters, SSLStreamAdapterTestDTLSHandshake, Combine(Values(rtc::KeyParams::RSA(rtc::kRsaDefaultModSize, rtc::kRsaDefaultExponent), - rtc::KeyParams::RSA(2 * 1152, rtc::kRsaDefaultExponent), + rtc::KeyParams::RSA(1152, rtc::kRsaDefaultExponent), rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)), Values(rtc::KeyParams::RSA(rtc::kRsaDefaultModSize, rtc::kRsaDefaultExponent), - rtc::KeyParams::RSA(2 * 1152, rtc::kRsaDefaultExponent), rtc::KeyParams::ECDSA(rtc::EC_NIST_P256)), Values(std::make_pair(rtc::DIGEST_SHA_256, SHA256_DIGEST_LENGTH)))); @@ -1478,4 +1479,3 @@ TEST_F(SSLStreamAdapterTestDTLS, TestGetSslVersionBytes) { ASSERT_TRUE(GetSslVersionBytes(false, &server_version)); EXPECT_EQ(server_version, kDtls1_2); } -