Provide RSA2048 as per RFC

webrtc/base/sslstreamadapter_unittest.cc

Index: webrtc/base/sslstreamadapter_unittest.cc
diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc
index 68e1b64dbe91a38aac7d5ff076d045be0d1e3074..27d96f6f6ab58d19e1afe192f53f364200c5d579 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -161,11 +161,12 @@ static const int kFifoBufferSize = 4096;
 class SSLStreamAdapterTestBase : public testing::Test,
                                  public sigslot::has_slots<> {
  public:
-  SSLStreamAdapterTestBase(const std::string& client_cert_pem,
-                           const std::string& client_private_key_pem,
-                           bool dtls,
-                           rtc::KeyType client_key_type = rtc::KT_DEFAULT,
-                           rtc::KeyType server_key_type = rtc::KT_DEFAULT)
+  SSLStreamAdapterTestBase(
+      const std::string& client_cert_pem,
+      const std::string& client_private_key_pem,
+      bool dtls,
+      rtc::KeyTypeFull client_key_type = rtc::KeyTypeFull(),
+      rtc::KeyTypeFull server_key_type = rtc::KeyTypeFull())
       : client_buffer_(kFifoBufferSize),
         server_buffer_(kFifoBufferSize),
         client_stream_(
@@ -227,14 +228,14 @@ class SSLStreamAdapterTestBase : public testing::Test,
     client_params.common_name = "client";
     client_params.not_before = not_before;
     client_params.not_after = not_after;
-    client_params.key_type = rtc::KT_DEFAULT;
+    client_params.key_type = rtc::KeyTypeFull();
     client_identity_ = rtc::SSLIdentity::GenerateForTest(client_params);
 
     rtc::SSLIdentityParams server_params;
     server_params.common_name = "server";
     server_params.not_before = not_before;
     server_params.not_after = not_after;
-    server_params.key_type = rtc::KT_DEFAULT;
+    server_params.key_type = rtc::KeyTypeFull();
     server_identity_ = rtc::SSLIdentity::GenerateForTest(server_params);
 
     client_ssl_->SetIdentity(client_identity_);
@@ -462,7 +463,7 @@ class SSLStreamAdapterTestBase : public testing::Test,
 
 class SSLStreamAdapterTestTLS
     : public SSLStreamAdapterTestBase,
-      public WithParamInterface<tuple<rtc::KeyType, rtc::KeyType>> {
+      public WithParamInterface<tuple<rtc::KeyTypeFull, rtc::KeyTypeFull>> {
  public:
   SSLStreamAdapterTestTLS()
       : SSLStreamAdapterTestBase("",
@@ -570,7 +571,7 @@ class SSLStreamAdapterTestTLS
 
 class SSLStreamAdapterTestDTLS
     : public SSLStreamAdapterTestBase,
-      public WithParamInterface<tuple<rtc::KeyType, rtc::KeyType>> {
+      public WithParamInterface<tuple<rtc::KeyTypeFull, rtc::KeyTypeFull>> {
  public:
   SSLStreamAdapterTestDTLS()
       : SSLStreamAdapterTestBase("",
@@ -1035,11 +1036,24 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Server) {
             server_cipher);
 }
 
-INSTANTIATE_TEST_CASE_P(SSLStreamAdapterTestsTLS,
-                        SSLStreamAdapterTestTLS,
-                        Combine(Values(rtc::KT_RSA, rtc::KT_ECDSA),
-                                Values(rtc::KT_RSA, rtc::KT_ECDSA)));
-INSTANTIATE_TEST_CASE_P(SSLStreamAdapterTestsDTLS,
-                        SSLStreamAdapterTestDTLS,
-                        Combine(Values(rtc::KT_RSA, rtc::KT_ECDSA),
-                                Values(rtc::KT_RSA, rtc::KT_ECDSA)));
+// The RSA keysizes here might look strange, why not include the RFC's size
+// 2048?. The reason is test case slowness; testing two sizes to exercise
+// parametrization is sufficient.
+INSTANTIATE_TEST_CASE_P(
+    SSLStreamAdapterTestsTLS,
+    SSLStreamAdapterTestTLS,
+    Combine(Values(rtc::KeyTypeFull::RSA(1024, 65537),
+                   rtc::KeyTypeFull::RSA(1152, 65537),
+                   rtc::KeyTypeFull::ECDSA(rtc::EC_NIST_P256)),
+            Values(rtc::KeyTypeFull::RSA(1024, 65537),
+                   rtc::KeyTypeFull::RSA(1152, 65537),
+                   rtc::KeyTypeFull::ECDSA(rtc::EC_NIST_P256))));
+INSTANTIATE_TEST_CASE_P(
+    SSLStreamAdapterTestsDTLS,
+    SSLStreamAdapterTestDTLS,
+    Combine(Values(rtc::KeyTypeFull::RSA(1024, 65537),
+                   rtc::KeyTypeFull::RSA(1152, 65537),
+                   rtc::KeyTypeFull::ECDSA(rtc::EC_NIST_P256)),
+            Values(rtc::KeyTypeFull::RSA(1024, 65537),
+                   rtc::KeyTypeFull::RSA(1152, 65537),
+                   rtc::KeyTypeFull::ECDSA(rtc::EC_NIST_P256))));