Provide RSA2048 as per RFC

webrtc/base/ssladapter_unittest.cc

 /*
  *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 113 matching lines @@
   const rtc::SSLMode ssl_mode_;
 
   rtc::scoped_ptr<rtc::SSLAdapter> ssl_adapter_;
 
   std::string data_;
 };
 
 class SSLAdapterTestDummyServer : public sigslot::has_slots<> {
  public:
   explicit SSLAdapterTestDummyServer(const rtc::SSLMode& ssl_mode,
-                                     const rtc::KeyType key_type)
+                                     const rtc::KeyTypeFull key_type)
       : ssl_mode_(ssl_mode) {
     // Generate a key pair and a certificate for this host.
     ssl_identity_.reset(rtc::SSLIdentity::Generate(GetHostname(), key_type));

[hbos, 2015/09/29 13:53:18]

DCHECK(ssl_identity_.get()) after this line?

 
     server_socket_.reset(CreateSocket(ssl_mode_));
 
     if (ssl_mode_ == rtc::SSL_MODE_TLS) {
       server_socket_->SignalReadEvent.connect(this,
           &SSLAdapterTestDummyServer::OnServerSocketReadEvent);
 
       server_socket_->Listen(1);
     }
 
@@ skipping 116 matching lines @@
 
   rtc::scoped_ptr<rtc::SSLIdentity> ssl_identity_;
 
   std::string data_;
 };
 
 class SSLAdapterTestBase : public testing::Test,
                            public sigslot::has_slots<> {
  public:
   explicit SSLAdapterTestBase(const rtc::SSLMode& ssl_mode,
-                              const rtc::KeyType key_type)
+                              const rtc::KeyTypeFull key_type)
       : ssl_mode_(ssl_mode),
         ss_scope_(new rtc::VirtualSocketServer(NULL)),
         server_(new SSLAdapterTestDummyServer(ssl_mode_, key_type)),
         client_(new SSLAdapterTestDummyClient(ssl_mode_)),
         handshake_wait_(kTimeout) {}
 
   void SetHandshakeWait(int wait) {
     handshake_wait_ = wait;
   }
 
@@ skipping 56 matching lines @@
 
   rtc::scoped_ptr<SSLAdapterTestDummyServer> server_;
   rtc::scoped_ptr<SSLAdapterTestDummyClient> client_;
 
   int handshake_wait_;
 };
 
 class SSLAdapterTestTLS_RSA : public SSLAdapterTestBase {
  public:
   SSLAdapterTestTLS_RSA()
-      : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KT_RSA) {}
+      : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KeyTypeFull::RSA()) {}
 };
 
 class SSLAdapterTestTLS_ECDSA : public SSLAdapterTestBase {
  public:
   SSLAdapterTestTLS_ECDSA()
-      : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KT_ECDSA) {}
+      : SSLAdapterTestBase(rtc::SSL_MODE_TLS, rtc::KeyTypeFull::ECDSA()) {}
 };
 
 class SSLAdapterTestDTLS_RSA : public SSLAdapterTestBase {
  public:
   SSLAdapterTestDTLS_RSA()
-      : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KT_RSA) {}
+      : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KeyTypeFull::RSA()) {}
 };
 
 class SSLAdapterTestDTLS_ECDSA : public SSLAdapterTestBase {
  public:
   SSLAdapterTestDTLS_ECDSA()
-      : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KT_ECDSA) {}
+      : SSLAdapterTestBase(rtc::SSL_MODE_DTLS, rtc::KeyTypeFull::ECDSA()) {}
 };
 
 #if SSL_USE_OPENSSL
 
 // Basic tests: TLS
 
 // Test that handshake works, using RSA
 TEST_F(SSLAdapterTestTLS_RSA, TestTLSConnect) {
   TestHandshake(true);
 }
@@ skipping 33 matching lines @@
   TestTransfer("Hello, world!");
 }
 
 // Test transfer between client and server, using ECDSA
 TEST_F(SSLAdapterTestDTLS_ECDSA, TestDTLSTransfer) {
   TestHandshake(true);
   TestTransfer("Hello, world!");
 }
 
 #endif  // SSL_USE_OPENSSL