commit f4abc03ca248375f564fe39a70b00115d565f6b9
author Philipp Hancke <phancke@meta.com> Mon Nov 04 22:12:59 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Nov 07 18:45:56 2024
tree 44663d7cd78373606a5a8d2179f52fe7f85fc70e
parent 05e5c32f98b0917520dcd4e7ca47a39f5e43d671

Reduce DTLS RSA certificate tests

by going from cartesian product of combinations to an explicit
minimal list.

BUG=webrtc:375552698

Change-Id: I99b9afd7376f19abde54dafd8917954617d8c255
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/367504
Reviewed-by: Christoffer Dewerin <jansson@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43373}

rtc_base/ssl_stream_adapter_unittest.cc

diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc
index 01c3529..1029957 100644
--- a/rtc_base/ssl_stream_adapter_unittest.cc
+++ b/rtc_base/ssl_stream_adapter_unittest.cc
@@ -1128,20 +1128,21 @@
 }
 
 // Test different key sizes with SHA-256, then different signature algorithms
-// with ECDSA. Two different RSA sizes are tested on the client side.
+// with ECDSA. Two different RSA sizes are tested on the client and server.
 // TODO: bugs.webrtc.org/375552698 - these tests are slow in debug builds
-// and have caused flakyness in the past with larger keysizes.
+// and have caused flakyness in the past with a key size of 2048.
 INSTANTIATE_TEST_SUITE_P(
     SSLStreamAdapterTestDTLSHandshakeKeyParameters,
     SSLStreamAdapterTestDTLSHandshake,
-    Combine(Values(rtc::KeyParams::RSA(rtc::kRsaDefaultModSize,
-                                       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::ECDSA(rtc::EC_NIST_P256)),
-            Values(std::make_pair(rtc::DIGEST_SHA_256, SHA256_DIGEST_LENGTH))));
+    Values(std::make_tuple(rtc::KeyParams::ECDSA(rtc::EC_NIST_P256),
+                           rtc::KeyParams::RSA(rtc::kRsaDefaultModSize,
+                                               rtc::kRsaDefaultExponent),
+                           std::make_pair(rtc::DIGEST_SHA_256,
+                                          SHA256_DIGEST_LENGTH)),
+           std::make_tuple(rtc::KeyParams::RSA(1152, rtc::kRsaDefaultExponent),
+                           rtc::KeyParams::ECDSA(rtc::EC_NIST_P256),
+                           std::make_pair(rtc::DIGEST_SHA_256,
+                                          SHA256_DIGEST_LENGTH))));
 
 INSTANTIATE_TEST_SUITE_P(
     SSLStreamAdapterTestDTLSHandshakeSignatureAlgorithms,